OFBiz › OFBiz - Commits

svn commit: r1293999 [2/2] - in /ofbiz/trunk: ./ framework/base/config/ framework/birt/ framework/birt/config/ framework/birt/data/helpdata/ framework/birt/documents/ framework/birt/lib/ framework/birt/lib/platform/ framework/birt/src/org/ofbiz/birt/ f...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r1293999 [2/2] - in /ofbiz/trunk: ./ framework/base/config/ framework/birt/ framework/birt/config/ framework/birt/data/helpdata/ framework/birt/documents/ framework/birt/lib/ framework/birt/lib/platform/ framework/birt/src/org/ofbiz/birt/ f...

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java Mon Feb 27 02:37:16 2012
@@ -19,47 +19,25 @@
package org.ofbiz.birt.container;

import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
import java.util.logging.Level;

-import javolution.util.FastMap;
-
import org.eclipse.birt.core.exception.BirtException;
import org.eclipse.birt.core.framework.Platform;
-import org.eclipse.birt.core.framework.PlatformFileContext;
import org.eclipse.birt.report.engine.api.EngineConfig;
-import org.eclipse.birt.report.engine.api.EngineConstants;
import org.eclipse.birt.report.engine.api.IReportEngine;
import org.eclipse.birt.report.engine.api.IReportEngineFactory;
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerConfig;
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.FileUtil;
-import org.ofbiz.base.util.UtilGenerics;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.DelegatorFactory;
-import org.ofbiz.service.GenericDispatcher;
-import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.birt.BirtFactory;

public class BirtContainer implements Container {

public static final String module = BirtContainer.class.getName();
-
- public final static String CONFIG_FILE = "birt.properties";
-
- protected EngineConfig config;
+
protected String configFile;

- private static IReportEngine engine;
- private static String delegatorGroupHelperName;
- private static String delegatorName;
- private static String dispatcherName;
- private static Delegator delegator;
- private static LocalDispatcher dispatcher;
-
public void init(String[] args, String configFile)
throws ContainerException {
this.configFile = configFile;
@@ -69,7 +47,7 @@ public class BirtContainer implements Co
* start container
*/
public boolean start() throws ContainerException {
- Debug.logInfo("Start birt container", module);
+ Debug.logInfo("Start BIRT container", module);

// make sure the subclass sets the config name
if (this.getContainerConfigName() == null) {
@@ -81,67 +59,32 @@ public class BirtContainer implements Co
throw new ContainerException("No " + this.getContainerConfigName() + " configuration found in container config!");
}

- config = new EngineConfig();
-
- // set osgi config
- Map<String, String> osgiConfig = FastMap.newInstance();
- osgiConfig.put("osgi.configuration.area", new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tempfiles").getPath());
- config.setOSGiConfig(osgiConfig);
-
- HashMap<String, Object> context = UtilGenerics.cast(config.getAppContext());
-
- // set delegator, dispatcher and security objects to report
-
- delegatorGroupHelperName = ContainerConfig.getPropertyValue(cc, "delegator-group-helper-name", "org.ofbiz");
-
- // get the delegator
- delegatorName = ContainerConfig.getPropertyValue(cc, "delegator-name", "default");
- delegator = DelegatorFactory.getDelegator(delegatorName);
-
- // get the dispatcher
- dispatcherName = ContainerConfig.getPropertyValue(cc, "dispatcher-name", "birt-dispatcher");
- dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
-
- context.put("delegator", delegator);
- context.put("dispatcher", dispatcher);
-
- // set classloader for engine
- context.put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, BirtContainer.class.getClassLoader());
- context.put(EngineConstants.WEBAPP_CLASSPATH_KEY, BirtContainer.class.getClassLoader());
-
- // set log config to show all level in console
- config.setLogConfig(null, Level.ALL);
-
- // set engine home
- String reportEnginePath = FileUtil.getFile("component://birt/lib/platform").getPath();
- config.setEngineHome(reportEnginePath);
- config.setBIRTHome(reportEnginePath);
-
- // set OSGi arguments specific in properties
- String argumentsString = UtilProperties.getPropertyValue(BirtContainer.CONFIG_FILE, "birt.osgi.arguments");
- config.setOSGiArguments(argumentsString.split(","));
-
- // set platform file context
- config.setPlatformContext(new PlatformFileContext(config));
- config.setAppContext(context);
+ // create engine config
+ EngineConfig config = new EngineConfig();
+ String ofbizHome = System.getProperty("ofbiz.home");
+ config.setTempDir(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "tempfiles");
+ config.setLogConfig(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "logs", Level.ALL);

// startup platform
try {
- Debug.logInfo("Startup birt platform", module);
- Platform.startup( config );
- } catch ( BirtException e ) {
+ Debug.logInfo("Startup BIRT platform", module);
+ Platform.startup(config);
+ } catch (BirtException e) {
throw new ContainerException(e);
}

// create report engine
Debug.logInfo("Create factory object", module);
IReportEngineFactory factory = (IReportEngineFactory) Platform
- .createFactoryObject( IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY );
+ .createFactoryObject(IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY);
if (factory == null) {
throw new ContainerException("can not create birt engine factory");
}
Debug.logInfo("Create report engine", module);
- engine = factory.createReportEngine( config );
+ IReportEngine engine = factory.createReportEngine(config);
+ BirtFactory.setReportEngine(engine);
+
+ // print supported formats
String[] supportedFormats = engine.getSupportedFormats();
String formatList = null;
for (String supportedFormat : supportedFormats) {
@@ -161,28 +104,4 @@ public class BirtContainer implements Co
public String getContainerConfigName() {
return "birt-container";
}
-
- public static IReportEngine getReportEngine() {
- return engine;
- }
-
- public static String getDelegatorGroupHelperName() {
- return delegatorGroupHelperName;
- }
-
- public static String getDelegatorName() {
- return delegatorName;
- }
-
- public static String getDispatcherName() {
- return dispatcherName;
- }
-
- public static Delegator getDelegator() {
- return delegator;
- }
-
- public static LocalDispatcher getDispatcher() {
- return dispatcher;
- }
}

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java Mon Feb 27 02:37:16 2012
@@ -44,15 +44,14 @@ import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.collections.MapStack;
import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.birt.BirtFactory;
import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.common.email.NotificationServices;
import org.ofbiz.entity.Delegator;
import org.ofbiz.security.Security;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.birt.widget.BirtFactory;
import org.ofbiz.widget.html.HtmlScreenRenderer;
import org.ofbiz.widget.screen.ScreenRenderer;
import org.xml.sax.SAXException;
@@ -158,7 +157,7 @@ public class BirtEmailServices {
if (birtContentType == null) {
birtContentType = "application/pdf";
}
- IReportEngine engine = BirtContainer.getReportEngine();
+ IReportEngine engine = BirtFactory.getReportEngine();
HashMap<String, Object> appContext = UtilGenerics.cast(engine.getConfig().getAppContext());
appContext.put("delegator", delegator);
appContext.put("dispatcher", dispatcher);

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java Mon Feb 27 02:37:16 2012
@@ -39,8 +39,7 @@ public class BirtViewerAttributeBean ext
}

@Override
- protected void __init( HttpServletRequest request ) throws Exception
- {
+ protected void __init(HttpServletRequest request) throws Exception {
String reportParam = DataUtil.trimString( ParameterAccessor.getParameter( request, ParameterAccessor.PARAM_REPORT ));
if (reportParam.startsWith("component://")) {
ClassLoader loader = Thread.currentThread().getContextClassLoader();

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java Mon Feb 27 02:37:16 2012
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRes
import org.eclipse.birt.report.IBirtConstants;
import org.eclipse.birt.report.context.BirtContext;
import org.eclipse.birt.report.context.ViewerAttributeBean;
+import org.ofbiz.base.util.UtilValidate;

public class OFBizBirtContext extends BirtContext {

@@ -36,12 +37,10 @@ public class OFBizBirtContext extends Bi

@Override
protected void __init() {
- this.bean = (ViewerAttributeBean) request
- .getAttribute( IBirtConstants.ATTRIBUTE_BEAN );
- if ( bean == null )
- {
- bean = new BirtViewerAttributeBean( request );
+ this.bean = (ViewerAttributeBean) request.getAttribute(IBirtConstants.ATTRIBUTE_BEAN);
+ if (UtilValidate.isEmpty(bean)) {
+ bean = new BirtViewerAttributeBean(request);
}
- request.setAttribute( IBirtConstants.ATTRIBUTE_BEAN, bean );
+ request.setAttribute(IBirtConstants.ATTRIBUTE_BEAN, bean);
}
}

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Mon Feb 27 02:37:16 2012
@@ -18,20 +18,18 @@
*******************************************************************************/
package org.ofbiz.birt.report.servlet;

-import javax.servlet.ServletConfig;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.birt.core.exception.BirtException;
import org.eclipse.birt.report.context.IContext;
-import org.eclipse.birt.report.engine.api.IReportEngine;
-import org.eclipse.birt.report.presentation.aggregation.layout.EngineFragment;
-import org.eclipse.birt.report.presentation.aggregation.layout.RequesterFragment;
import org.eclipse.birt.report.service.BirtReportServiceFactory;
+import org.eclipse.birt.report.service.ReportEngineService;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.birt.report.context.OFBizBirtContext;
-import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;

@SuppressWarnings("serial")
public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet {
@@ -39,27 +37,13 @@ public class BirtEngineServlet extends o
public final static String module = BirtEngineServlet.class.getName();

@Override
- protected void __init( ServletConfig config )
- {
- BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config
- .getServletContext( ) ) );
-
- engine = new EngineFragment( );
-
- requester = new RequesterFragment( );
- requester.buildComposite( );
- requester.setJSPRootPath( "/webcontent/birt" );
- }
-
- @Override
- protected IContext __getContext( HttpServletRequest request,
- HttpServletResponse response ) throws BirtException
- {
- IReportEngine reportEngine = BirtContainer.getReportEngine();
- BirtWorker.setWebContextObjects(reportEngine, request, response);
+ protected IContext __getContext(HttpServletRequest request, HttpServletResponse response) throws BirtException {
+ BirtReportServiceFactory.getReportService().setContext(getServletContext( ), null);
+
+ // set app context
+ Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext());
+ BirtWorker.setWebContextObjects(appContext, request, response);

- BirtReportServiceFactory.getReportService( ).setContext(
- getServletContext( ), null );
return new OFBizBirtContext( request, response );
}
}

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Mon Feb 27 02:37:16 2012
@@ -18,21 +18,19 @@
*******************************************************************************/
package org.ofbiz.birt.report.servlet;

-import javax.servlet.ServletConfig;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.birt.core.exception.BirtException;
import org.eclipse.birt.report.context.IContext;
-import org.eclipse.birt.report.engine.api.IReportEngine;
-import org.eclipse.birt.report.presentation.aggregation.layout.FramesetFragment;
-import org.eclipse.birt.report.presentation.aggregation.layout.RunFragment;
import org.eclipse.birt.report.service.BirtReportServiceFactory;
+import org.eclipse.birt.report.service.ReportEngineService;
import org.eclipse.birt.report.servlet.ViewerServlet;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.birt.report.context.OFBizBirtContext;
-import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;

@SuppressWarnings("serial")
public class BirtViewerServlet extends ViewerServlet {
@@ -40,30 +38,13 @@ public class BirtViewerServlet extends V
public final static String module = BirtViewerServlet.class.getName();

@Override
- protected void __init(ServletConfig config) {
- BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config
- .getServletContext( ) ) );
-
- // handle 'frameset' pattern
- viewer = new FramesetFragment( );
- viewer.buildComposite( );
- viewer.setJSPRootPath( "/webcontent/birt" );
-
- // handle 'run' pattern
- run = new RunFragment( );
- run.buildComposite( );
- run.setJSPRootPath( "/webcontent/birt" );
- }
-
- @Override
- protected IContext __getContext( HttpServletRequest request,
- HttpServletResponse response ) throws BirtException
- {
- IReportEngine reportEngine = BirtContainer.getReportEngine();
- BirtWorker.setWebContextObjects(reportEngine, request, response);
+ protected IContext __getContext(HttpServletRequest request, HttpServletResponse response) throws BirtException {
+ BirtReportServiceFactory.getReportService().setContext(getServletContext( ), null);
+
+ // set app context
+ Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext());
+ BirtWorker.setWebContextObjects(appContext, request, response);

- BirtReportServiceFactory.getReportService( ).setContext(
- getServletContext( ), null );
return new OFBizBirtContext( request, response );
}
}

Modified: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java Mon Feb 27 02:37:16 2012
@@ -40,12 +40,11 @@ import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.birt.BirtFactory;
import org.ofbiz.birt.BirtWorker;
-import org.ofbiz.birt.container.BirtContainer;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.webapp.view.ViewHandler;
import org.ofbiz.webapp.view.ViewHandlerException;
-import org.ofbiz.birt.widget.BirtFactory;
import org.xml.sax.SAXException;

public class BirtViewHandler implements ViewHandler {
@@ -73,7 +72,7 @@ public class BirtViewHandler implements
HttpServletResponse response) throws ViewHandlerException {

try {
- IReportEngine engine = BirtContainer.getReportEngine();
+ IReportEngine engine = org.ofbiz.birt.BirtFactory.getReportEngine();
// open report design
IReportRunnable design = null;
if (page.startsWith("component://")) {
@@ -83,7 +82,8 @@ public class BirtViewHandler implements
design = engine.openReportDesign(servletContext.getRealPath(page));
}

- BirtWorker.setWebContextObjects(engine, request, response);
+ Map<String, Object> appContext = UtilGenerics.cast(engine.getConfig().getAppContext());
+ BirtWorker.setWebContextObjects(appContext, request, response);

Map<String, Object> context = FastMap.newInstance();
// set parameters from request
@@ -105,6 +105,12 @@ public class BirtViewHandler implements
response.setHeader("Content-Disposition", "attachment; filename=" + outputFileName);
}

+ // set override content type
+ String overrideContentType = (String) request.getAttribute(BirtWorker.BIRT_CONTENT_TYPE);
+ if (UtilValidate.isNotEmpty(overrideContentType)) {
+ contentType = overrideContentType;
+ }
+
context.put(BirtWorker.BIRT_LOCALE, locale);
String birtImageDirectory = UtilProperties.getPropertyValue("birt", "birt.html.image.directory");
context.put(BirtWorker.BIRT_IMAGE_DIRECTORY, birtImageDirectory);

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Mon Feb 27 02:37:16 2012
@@ -81,6 +81,10 @@
<value xml:lang="de">Verion des Content Knoten</value>
<value xml:lang="en">Version of the base content node</value>
</property>
+ <property key="ExampleBirtExamples">
+ <value xml:lang="en">BIRT Examples</value>
+ <value xml:lang="th">à¸à¸±à¸§à¸à¸¢à¹à¸²à¸ BIRT</value>
+ </property>
<property key="ExampleBirtChartReport">
<value xml:lang="en">HTML chart report</value>
<value xml:lang="fr">Graphiques HTML</value>

Modified: ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/birt/WEB-INF/controller.xml Mon Feb 27 02:37:16 2012
@@ -25,7 +25,7 @@ under the License.
elements found in the common-controller.xml file. -->
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>

- <description>Birt Component Site Configuration File</description>
+ <description>BIRT Component Site Configuration File</description>


<view-map name="ViewHandler" type="birt" page="component://example/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
<view-map name="chartViewHandler" type="birt" page="component://example/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/>

Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Mon Feb 27 02:37:16 2012
@@ -219,7 +219,7 @@ under the License.
<request-map uri="ExampleOsmGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet3"/></request-map>
<request-map uri="ExampleOsmGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet4"/></request-map>

- 
+ 
<request-map uri="BirtMain">
<security https="true" auth="true"/>
<response name="success" type="view" value="BirtMain"/>
@@ -362,7 +362,7 @@ under the License.
<view-map name="ExampleOsmGeoLocationPointSet3" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet3"/>
<view-map name="ExampleOsmGeoLocationPointSet4" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet4"/>

- 
+ 
<view-map name="BirtMain" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>


@@ -385,9 +385,13 @@ under the License.




Modified: ofbiz/trunk/framework/example/widget/example/BirtForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/BirtForms.xml?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/BirtForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/BirtForms.xml Mon Feb 27 02:37:16 2012
@@ -30,9 +30,13 @@ under the License.
<drop-down>
<option key="text/html" description="text/html"/>
<option key="application/pdf" description="application/pdf"/>
+ <option key="application/postscript" description="application/postscript"/>
<option key="application/vnd.ms-excel" description="application/vnd.ms-excel"/>
<option key="application/vnd.ms-word" description="application/vnd.ms-word"/>
<option key="application/vnd.ms-powerpoint" description="application/vnd.ms-powerpoint"/>
+ <option key="application/vnd.oasis.opendocument.text" description="application/vnd.oasis.opendocument.text"/>
+ <option key="application/vnd.oasis.opendocument.spreadsheet" description="application/vnd.oasis.opendocument.spreadsheet"/>
+ <option key="application/vnd.oasis.opendocument.presentation" description="application/vnd.oasis.opendocument.presentation"/>
</drop-down>
</field>
<field name="attachmentName"><text/></field>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml?rev=1293999&r1=1293998&r2=1293999&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml Mon Feb 27 02:37:16 2012
@@ -42,7 +42,7 @@ under the License.
<menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
<link target="ExampleGeoLocationPointSet1"/>
</menu-item>
- <menu-item name="Birt" title="${uiLabelMap.Birt}">
+ <menu-item name="Birt" title="${uiLabelMap.ExampleBirtExamples}">
<link target="BirtMain"/>
</menu-item>
<menu-item name="ExampleCharts" title="Chart examples">