OFBiz › OFBiz - Commits

svn commit: r890175 [2/2] - in /ofbiz/trunk: ./ applications/content/ applications/content/data/ framework/ framework/base/config/ framework/birt/ framework/birt/config/ framework/birt/data/ framework/birt/data/helpdata/ framework/birt/lib/ framework/b...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r890175 [2/2] - in /ofbiz/trunk: ./ applications/content/ applications/content/data/ framework/ framework/base/config/ framework/birt/ framework/birt/config/ framework/birt/data/ framework/birt/data/helpdata/ framework/birt/lib/ framework/b...

Propchange: ofbiz/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /ofbiz/branches/addbirt:831210-885099,885686-886087

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Dec 14 04:41:28 2009
@@ -2322,6 +2322,135 @@
The following libraries distributed with Apache OFBiz are licensed under the
Eclipse Public License - v 1.0:
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar
+ofbiz/trunk/framework/birt/lib/chartengineapi.jar
+ofbiz/trunk/framework/birt/lib/coreapi.jar
+ofbiz/trunk/framework/birt/lib/crosstabcoreapi.jar
+ofbiz/trunk/framework/birt/lib/dataadapterapi.jar
+ofbiz/trunk/framework/birt/lib/dataaggregationapi.jar
+ofbiz/trunk/framework/birt/lib/dataextraction.jar
+ofbiz/trunk/framework/birt/lib/dteapi.jar
+ofbiz/trunk/framework/birt/lib/emitterconfig.jar
+ofbiz/trunk/framework/birt/lib/engineapi.jar
+ofbiz/trunk/framework/birt/lib/jaxrpc.jar
+ofbiz/trunk/framework/birt/lib/modelapi.jar
+ofbiz/trunk/framework/birt/lib/modelodaapi.jar
+ofbiz/trunk/framework/birt/lib/odadesignapi.jar
+ofbiz/trunk/framework/birt/lib/saaj.jar
+ofbiz/trunk/framework/birt/lib/scriptapi.jar
+ofbiz/trunk/framework/birt/lib/viewservlets.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/com.ibm.icu_4.0.1.v20090415.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/javax.wsdl_1.5.1.v200806030408.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/javax.xml_1.3.4.v200902170245.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.bridge_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.css_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.ext.awt_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.extension_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.parser_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.pdf_1.6.0.v200806031500.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.svggen_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.swing_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.transcoder_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.util_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.util.gui_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.xml_1.6.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xerces_2.9.0.v200909240008.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.resolver_1.2.0.v200902170519.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.serializer_2.7.1.v200902170519.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.api_1.0.0.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.device.extension_2.5.0.v20090514.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.device.svg_2.5.0.v20090423.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.engine_2.5.0.v20090604.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.engine.extension_2.5.0.v20090527.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.reportitem_2.5.0.v20090514.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.core_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.core.script.function_2.5.0.v20090611.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.data_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.data.aggregation_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.adapter_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc.dbprofile_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.xml_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine_2.5.0.v20090616.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.dataextraction_2.5.0.v20090611.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.dataextraction.csv_2.5.0.v20090514.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.config_2.5.0.v20090608.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.html_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.pdf_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.postscript_2.5.0.v20090608.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.ppt_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.prototype.excel_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.wpml_2.5.0.v20090601.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.item.crosstab.core_2.5.0.v20090603.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.model_2.5.0.v20090605.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.model.adapter.oda_2.5.0.v20090531.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.contenttype_3.4.0.v20090429-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.expressions_3.4.100.v20090429-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.filesystem_1.2.0.v20090507.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.jobs_3.4.100.v20090429-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.resources_3.5.0.v20090512.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility_3.2.0.v20090413.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20090413.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity_1.1.2.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.apache.derby_1.0.100.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition_1.0.2.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.console.profile_1.0.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_1.0.1.v200906111145.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.db.generic_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda_3.2.0.v200905220445.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.consumer_3.2.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.design_3.2.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.flatfile_3.1.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.profile_3.2.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.sqm.core_1.1.0.v200906020553.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.hsqldb_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.hsqldb.dbdefinition_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.iseries_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition_1.0.3.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.luw_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_1.0.3.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.zseries_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition_1.0.3.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.informix_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.informix.dbdefinition_1.0.3.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.msft.sqlserver_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.mysql_1.0.2.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.mysql.dbdefinition_1.0.4.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oda.ws_1.2.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oda.xml_1.2.0.v200905231053.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oracle_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oracle.dbdefinition_1.0.100.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.postgresql_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.postgresql.dbdefinition_1.0.1.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.sap.maxdb_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.dbdefinition_1.0.1.v200906022249.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.derby_1.0.0.v200906020900.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.sql_1.0.2.v200906022249.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.common_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore.change_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore.xmi_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.app_1.2.0.v20090520-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.preferences_3.2.300.v20090520-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.registry_3.4.100.v20090520-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.osgi_3.5.0.v20090520.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.osgi.services_3.2.0.v20090520-1800.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.update.configurator_3.3.0.v20090312.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.css.sac_1.3.0.v200805290154.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.dom.smil_1.0.0.v200806040011.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.dom.svg_1.1.0.v200806040011.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/com.lowagie.itext_1.5.4.v20090608/lib/itext_1.5.4.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/com.lowagie.itext_1.5.4.v20090608/lib/itextasian-1.5.2.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20090429-1800/runtime_registry_compatibility.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090608/lib/js.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.sac_1.3.0.v20090608/lib/flute.jar
=========================================================================
Eclipse Public License - v 1.0

Added: ofbiz/trunk/applications/content/data/BirtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/BirtHelpData.xml?rev=890175&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/data/BirtHelpData.xml (added)
+++ ofbiz/trunk/applications/content/data/BirtHelpData.xml Mon Dec 14 04:41:28 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<entity-engine-xml>
+ <DataResource dataResourceId="HELP_BIRT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="framework/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+ dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL"
+ dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" mapKey="BIRT_main"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Mon Dec 14 04:41:28 2009
@@ -43,6 +43,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>

<entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>

Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Mon Dec 14 04:41:28 2009
@@ -256,6 +256,13 @@
<property name="ciphers" value=""/>
</property>
</container>
+
+ 
+ <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer">
+ <property name="delegator-name" value="default"/>
+ <property name="dispatcher-name" value="birt-dispatcher"/>
+ <property name="delegator-group-helper-name" value="org.ofbiz"/>
+ </container>


<container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer">

Propchange: ofbiz/trunk/framework/birt/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 14 04:41:28 2009
@@ -0,0 +1 @@
+build

Copied: ofbiz/trunk/framework/birt/config/BirtUiLabels.xml (from r885099, ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/config/BirtUiLabels.xml?p2=ofbiz/trunk/framework/birt/config/BirtUiLabels.xml&p1=ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/framework/birt/config/BirtUiLabels.xml Mon Dec 14 04:41:28 2009
@@ -35,9 +35,6 @@
<value xml:lang="en">Framework Eclipse BIRT</value>
<value xml:lang="th">Framework Eclipse BIRT</value>
</property>
- <property key="BirtViewer">
- <value xml:lang="en">HTML Paged</value>
- </property>
<property key="BirtReport">
<value xml:lang="en">HTML</value>
</property>

Copied: ofbiz/trunk/framework/birt/data/helpdata/HELP_BIRT.xml (from r885099, ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/data/helpdata/HELP_BIRT.xml?p2=ofbiz/trunk/framework/birt/data/helpdata/HELP_BIRT.xml&p1=ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/data/helpdata/HELP_BIRT.xml (original)
+++ ofbiz/trunk/framework/birt/data/helpdata/HELP_BIRT.xml Mon Dec 14 04:41:28 2009
@@ -33,20 +33,16 @@
This is a short document to help you get started using BIRT to make a report.
</para>
<section>
- <title>1. Viewer tab</title>
- <para>When you click on the Viewer tab. It will show the report in the viewer where the report can be paged.</para>
+ <title>1. HTML tab</title>
+ <para>When you click on this tab. It will show the complete report in an iframe.</para>
</section>
<section>
- <title>2. Report tab</title>
- <para>When you click on the Report tab. It will show the complete report in an iframe.</para>
+ <title>2. PDF tab</title>
+ <para>When you click on this tab. It will render the report in a pdf format</para>
</section>
<section>
- <title>3. Mail tab</title>
- <para>When you click on the Mail tab. It will show a form that can send the report per email.</para>
- </section>
- <section>
- <title>4. View Handler tab</title>
- <para>When you click on the View Handler tab. It will render the report in a pdf format</para>
+ <title>3. Send any format through Mail tab</title>
+ <para>When you click on this tab. It will show a form that can send the report per email.</para>
</section>
<section>
<title>Examine the Example Report</title>
@@ -66,8 +62,8 @@
<section>
<title>Important tag's attribute in ftl.</title>
<para>
- The BIRT Viewer uses some servlets and resource files such as image, js, css for rendering the report and viewer.
- When you use the viewer tag or report tag in a ftl file you must add a specific "baseURL" attribute to the birt webapp for these resources like baseURL="/birt".
+ The BIRT uses some servlets for rendering the report.
+ When you use the report tag in a ftl file you must add a specific "baseURL" attribute to the birt webapp for these resources like baseURL="/birt".
</para>
</section>
<section>

Copied: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java (from r885099, ofbiz/branches/addbirt/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?p2=ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java&p1=ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java Mon Dec 14 04:41:28 2009
@@ -36,85 +36,13 @@
public class BirtViewerAttributeBean extends ViewerAttributeBean {

public final static String module = BirtViewerAttributeBean.class.getName();
-
- /**
- * Module Options
- */
- private Map moduleOptions = null;
-
- /**
- * Request Type
- */
- private String requestType;
-
- private Boolean reportRtl;

- public BirtViewerAttributeBean(HttpServletRequest arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
+ public BirtViewerAttributeBean(HttpServletRequest request) {
+ super(request);
}

- /**
- * Init the bean.
- *
- * @param request
- * @throws Exception
- */
protected void __init( HttpServletRequest request ) throws Exception
{
- // If GetImage operate, return directly.
- if ( ParameterAccessor.isGetImageOperator( request )
- && ( IBirtConstants.SERVLET_PATH_FRAMESET
- .equalsIgnoreCase( request.getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_OUTPUT
- .equalsIgnoreCase( request.getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_RUN
- .equalsIgnoreCase( request.getServletPath( ) ) || IBirtConstants.SERVLET_PATH_PREVIEW
- .equalsIgnoreCase( request.getServletPath( ) ) ) )
- {
- return;
- }
-
- this.category = "BIRT"; //$NON-NLS-1$
- this.masterPageContent = ParameterAccessor
- .isMasterPageContent( request );
- this.isDesigner = ParameterAccessor.isDesigner( );
-
- if ( !ParameterAccessor.isBookmarkReportlet( request ) )
- {
- this.bookmark = ParameterAccessor.getBookmark( request );
- }
- else
- {
- this.bookmark = null;
- }
-
- this.isToc = ParameterAccessor.isToc( request );
- this.reportPage = ParameterAccessor.getPage( request );
- this.reportPageRange = ParameterAccessor.getPageRange( request );
- this.action = ParameterAccessor.getAction( request );
-
- // If use frameset/output/download/extract servlet pattern, generate
- // document
- // from design file
- if ( IBirtConstants.SERVLET_PATH_FRAMESET.equalsIgnoreCase( request
- .getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_OUTPUT.equalsIgnoreCase( request
- .getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_DOWNLOAD
- .equalsIgnoreCase( request.getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_EXTRACT
- .equalsIgnoreCase( request.getServletPath( ) ) )
- {
- this.reportDocumentName = ParameterAccessor.getReportDocument(
- request, null, true );
- }
- else
- {
- this.reportDocumentName = ParameterAccessor.getReportDocument(
- request, null, false );
- }
-
String reportParam = DataUtil.trimString( ParameterAccessor.getParameter( request, ParameterAccessor.PARAM_REPORT ));
if (reportParam.startsWith("component://")) {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -131,56 +59,10 @@
this.reportDesignName = ParameterAccessor.getReport( request, null );
}

- this.emitterId = ParameterAccessor.getEmitterId( request );
-
- // If print action, force to use postscript format
- this.format = ParameterAccessor.getFormat( request );
- if ( IBirtConstants.ACTION_PRINT.equalsIgnoreCase( action ) )
- {
- // Check whether turn on this funtion
- if ( ParameterAccessor.isSupportedPrintOnServer )
- {
- this.format = IBirtConstants.POSTSCRIPT_RENDER_FORMAT;
- this.emitterId = null;
- }
- else
- {
- this.action = null;
- }
- }
-
- // Set locale information
- BirtResources.setLocale( ParameterAccessor.getLocale( request ) );
-
- // Set the request type
- this.requestType = request
- .getHeader( ParameterAccessor.HEADER_REQUEST_TYPE );
-
- // Determine the report design and doc 's timestamp
- processReport( request );
-
- // Report title.
- this.reportTitle = ParameterAccessor.getTitle( request );
-
- // Set whether show the report title
- this.isShowTitle = ParameterAccessor.isShowTitle( request );
-
- // Set whether show the toolbar
- this.isShowToolbar = ParameterAccessor.isShowToolbar( request );
-
- // Set whether show the navigation bar
- this.isShowNavigationbar = ParameterAccessor
- .isShowNavigationbar( request );
-
- // get some module options
- this.moduleOptions = BirtUtility.getModuleOptions( request );
-
this.reportDesignHandle = getDesignHandle( request );
if ( this.reportDesignHandle == null )
throw new ViewerException(
ResourceConstants.GENERAL_EXCEPTION_NO_REPORT_DESIGN );
-
- this.reportRtl = null;

// Initialize report parameters.
__initParameters( request );

Copied: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java (from r885099, ofbiz/branches/addbirt/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?p2=ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java&p1=ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java Mon Dec 14 04:41:28 2009
@@ -26,15 +26,15 @@
import org.eclipse.birt.report.context.ViewerAttributeBean;

public class OFBizBirtContext extends BirtContext {
+
+ public final static String module = OFBizBirtContext.class.getName();

public OFBizBirtContext(HttpServletRequest request,
HttpServletResponse response) {
super(request, response);
- // TODO Auto-generated constructor stub
}

protected void __init() {
- // TODO Auto-generated method stub
this.bean = (ViewerAttributeBean) request
.getAttribute( IBirtConstants.ATTRIBUTE_BEAN );
if ( bean == null )

Copied: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (from r885099, ofbiz/branches/addbirt/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?p2=ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java&p1=ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Mon Dec 14 04:41:28 2009
@@ -37,17 +37,10 @@
import org.ofbiz.birt.report.context.OFBizBirtContext;
import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;

-public class BirtEngineServlet extends BaseReportEngineServlet {
- /**
- * TODO: what's this?
- */
- private static final long serialVersionUID = 1L;
+public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet {
+
+ public final static String module = BirtEngineServlet.class.getName();

- /**
- * Local initialization.
- *
- * @return
- */
protected void __init( ServletConfig config )
{
BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config
@@ -57,19 +50,9 @@

requester = new RequesterFragment( );
requester.buildComposite( );
- requester.setJSPRootPath( "/webcontent/birt" ); //$NON-NLS-1$
+ requester.setJSPRootPath( "/webcontent/birt" );
}

- /**
- * Init context.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @exception BirtException
- * @return IContext
- */
protected IContext __getContext( HttpServletRequest request,
HttpServletResponse response ) throws BirtException
{
@@ -77,68 +60,4 @@
getServletContext( ), null );
return new OFBizBirtContext( request, response );
}
-
- /**
- * Local authentication.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @return
- */
- protected boolean __authenticate( HttpServletRequest request,
- HttpServletResponse response )
- {
- return true;
- }
-
- /**
- * Local do get.
- */
- protected void __doGet( IContext context ) throws ServletException,
- IOException, BirtException
- {
- ViewerAttributeBean bean = (ViewerAttributeBean) context.getBean( );
- assert bean != null;
-
- if ( ( IBirtConstants.SERVLET_PATH_PREVIEW.equalsIgnoreCase( context
- .getRequest( ).getServletPath( ) )
- || IBirtConstants.SERVLET_PATH_DOCUMENT
- .equalsIgnoreCase( context.getRequest( )
- .getServletPath( ) ) || IBirtConstants.SERVLET_PATH_OUTPUT
- .equalsIgnoreCase( context.getRequest( ).getServletPath( ) ) )
- && bean.isShowParameterPage( ) )
- {
- requester.service( context.getRequest( ), context.getResponse( ) );
- }
- else if ( IBirtConstants.SERVLET_PATH_PARAMETER
- .equalsIgnoreCase( context.getRequest( ).getServletPath( ) ) )
- {
- requester.service( context.getRequest( ), context.getResponse( ) );
- }
- else
- {
- engine.service( context.getRequest( ), context.getResponse( ) );
- }
- }
-
- /**
- * Process exception for non soap request.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @param exception
- * @throws ServletException
- * @throws IOException
- */
- protected void __handleNonSoapException( HttpServletRequest request,
- HttpServletResponse response, Exception exception )
- throws ServletException, IOException
- {
- exception.printStackTrace( );
- BirtUtility.appendErrorMessage( response.getOutputStream( ), exception );
- }
}

Copied: ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (from r885099, ofbiz/branches/addbirt/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?p2=ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java&p1=ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Mon Dec 14 04:41:28 2009
@@ -33,40 +33,30 @@
import org.eclipse.birt.report.presentation.aggregation.layout.RunFragment;
import org.eclipse.birt.report.service.BirtReportServiceFactory;
import org.eclipse.birt.report.servlet.BirtSoapMessageDispatcherServlet;
+import org.eclipse.birt.report.servlet.ViewerServlet;
import org.eclipse.birt.report.utility.BirtUtility;
import org.ofbiz.birt.report.context.OFBizBirtContext;
import org.ofbiz.birt.report.service.OFBizBirtViewerReportService;

-public class BirtViewerServlet extends BirtSoapMessageDispatcherServlet {
+public class BirtViewerServlet extends ViewerServlet {

public final static String module = BirtViewerServlet.class.getName();

protected void __init(ServletConfig config) {
- // TODO Auto-generated method stub
BirtReportServiceFactory.init( new OFBizBirtViewerReportService( config
.getServletContext( ) ) );

// handle 'frameset' pattern
viewer = new FramesetFragment( );
viewer.buildComposite( );
- viewer.setJSPRootPath( "/webcontent/birt" ); //$NON-NLS-1$
+ viewer.setJSPRootPath( "/webcontent/birt" );

// handle 'run' pattern
run = new RunFragment( );
run.buildComposite( );
- run.setJSPRootPath( "/webcontent/birt" ); //$NON-NLS-1$
+ run.setJSPRootPath( "/webcontent/birt" );
}
-
- /**
- * Init context.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @exception BirtException
- * @return IContext
- */
+
protected IContext __getContext( HttpServletRequest request,
HttpServletResponse response ) throws BirtException
{
@@ -74,87 +64,4 @@
getServletContext( ), null );
return new OFBizBirtContext( request, response );
}
-
- /**
- * Local process http request with GET method.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @exception ServletException
- * @exception IOException
- * @return
- */
- protected void __doGet( IContext context ) throws ServletException,
- IOException, BirtException
- {
- IFragment activeFragment = null;
- String servletPath = context.getRequest( ).getServletPath( );
- if ( IBirtConstants.SERVLET_PATH_FRAMESET
- .equalsIgnoreCase( servletPath ) )
- {
- activeFragment = viewer;
- }
- else if ( IBirtConstants.SERVLET_PATH_RUN
- .equalsIgnoreCase( servletPath ) )
- {
- activeFragment = run;
- }
-
- if ( activeFragment != null )
- activeFragment.service( context.getRequest( ), context
- .getResponse( ) );
- }
-
- /**
- * Locale process http request with POST method. Four different servlet
- * paths are expected: "/frameset", "/navigation", "/toolbar", and "/run".
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @exception ServletException
- * @exception IOException
- * @return
- */
- protected void __doPost( IContext context ) throws ServletException,
- IOException, BirtException
- {
- }
-
- /**
- * Local authentication. Alwasy returns true.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @return
- */
- protected boolean __authenticate( HttpServletRequest request,
- HttpServletResponse response )
- {
- return true;
- }
-
- /**
- * Process exception for non soap request.
- *
- * @param request
- * incoming http request
- * @param response
- * http response
- * @param exception
- * @throws ServletException
- * @throws IOException
- */
- protected void __handleNonSoapException( HttpServletRequest request,
- HttpServletResponse response, Exception exception )
- throws ServletException, IOException
- {
- exception.printStackTrace( );
- BirtUtility.appendErrorMessage( response.getOutputStream( ), exception );
- }
}

Copied: ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml (from r885099, ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml?p2=ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml&p1=ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/controller.xml Mon Dec 14 04:41:28 2009
@@ -55,10 +55,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
</request-map>
- <request-map uri="Viewer">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="Viewer"/>
- </request-map>
<request-map uri="Report">
<security https="true" auth="true"/>
<response name="success" type="view" value="Report"/>
@@ -70,8 +66,8 @@
<request-map uri="sendBirtMail">
<security https="true" auth="true"/>
<event type="service" invoke="sendBirtMail"/>
- <response name="success" type="view" value="BirtMail"/>
- <response name="error" type="view" value="BirtMail"/>
+ <response name="success" type="view" value="Mail"/>
+ <response name="error" type="view" value="Mail"/>
</request-map>
<request-map uri="ViewHandler">
<security https="true" auth="true"/>

Copied: ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/web.xml (from r885099, ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/web.xml?p2=ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/web.xml&p1=ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/birt/webapp/birt/WEB-INF/web.xml Mon Dec 14 04:41:28 2009
@@ -232,10 +232,12 @@
<load-on-startup>1</load-on-startup>
</servlet>

+ 

<servlet>
<servlet-name>EngineServlet</servlet-name>
@@ -243,6 +245,7 @@
</servlet>
<servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>

+ 

<servlet-mapping>
<servlet-name>EngineServlet</servlet-name>

Copied: ofbiz/trunk/framework/birt/widget/BirtScreens.xml (from r885099, ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/widget/BirtScreens.xml?p2=ofbiz/trunk/framework/birt/widget/BirtScreens.xml&p1=ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml (original)
+++ ofbiz/trunk/framework/birt/widget/BirtScreens.xml Mon Dec 14 04:41:28 2009
@@ -23,31 +23,6 @@
</section>
</screen>

- <screen name="Viewer">
- <section>
- <actions>
- <set field="tabButtonItem" value="Viewer"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="Using viewer tag">
- <platform-specific>
- <html>
- <html-template location="component://birt/webapp/birt/birt/viewer.ftl"/>
- </html>
- </platform-specific>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="Report">
<section>
<actions>

Copied: ofbiz/trunk/framework/birt/widget/Menus.xml (from r885099, ofbiz/branches/addbirt/framework/birt/widget/Menus.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/widget/Menus.xml?p2=ofbiz/trunk/framework/birt/widget/Menus.xml&p1=ofbiz/branches/addbirt/framework/birt/widget/Menus.xml&r1=885099&r2=890175&rev=890175&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/birt/widget/Menus.xml Mon Dec 14 04:41:28 2009
@@ -24,9 +24,8 @@
</menu>

<menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="Viewer" title="${uiLabelMap.BirtViewer}"><link target="Viewer"/></menu-item>
<menu-item name="Report" title="${uiLabelMap.BirtReport}"><link target="Report"/></menu-item>
- <menu-item name="Mail" title="${uiLabelMap.BirtMail}"><link target="Mail"/></menu-item>
<menu-item name="Export" title="${uiLabelMap.BirtViewHandler}"><link target="ViewHandler"/></menu-item>
+ <menu-item name="Mail" title="${uiLabelMap.BirtMail}"><link target="Mail"/></menu-item>
</menu>
</menus>

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Mon Dec 14 04:41:28 2009
@@ -30,6 +30,7 @@
bi/build.xml,minilang/build.xml,
webapp/build.xml,guiapp/build.xml,widget/build.xml,
common/build.xml,datafile/build.xml,
+ common/build.xml,birt/build.xml,
testtools/build.xml,
appserver/build.xml,webtools/build.xml,example/build.xml"/>

Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Mon Dec 14 04:41:28 2009
@@ -32,6 +32,7 @@
<load-component component-location="service"/>
<load-component component-location="entityext"/>
<load-component component-location="bi"/>
+ <load-component component-location="birt"/>
<load-component component-location="webapp"/>
<load-component component-location="guiapp"/>
<load-component component-location="widget"/>

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Mon Dec 14 04:41:28 2009
@@ -49,6 +49,9 @@
import org.ofbiz.webapp.stats.ServerHitBin;
import org.ofbiz.webapp.stats.VisitHandler;

+import freemarker.ext.beans.BeansWrapper;
+import freemarker.ext.servlet.ServletContextHashModel;
+
/**
* ControlServlet.java - Master servlet for the web application.
*/
@@ -192,6 +195,9 @@
request.setAttribute("security", security);

request.setAttribute("_REQUEST_HANDLER_", requestHandler);
+
+ ServletContextHashModel ftlServletContext = new ServletContextHashModel(this, BeansWrapper.getDefaultInstance());
+ request.setAttribute("ftlServletContext", ftlServletContext);

// setup some things that should always be there
UtilHttp.setInitialRequestInfo(request);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=890175&r1=890174&r2=890175&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Mon Dec 14 04:41:28 2009
@@ -62,6 +62,7 @@
import freemarker.ext.jsp.TaglibFactory;
import freemarker.ext.servlet.HttpRequestHashModel;
import freemarker.ext.servlet.HttpSessionHashModel;
+import freemarker.ext.servlet.ServletContextHashModel;

/**
* Widget Library - Screen model class
@@ -242,6 +243,10 @@
TaglibFactory JspTaglibs = new TaglibFactory(servletContext);
context.put("JspTaglibs", JspTaglibs);
context.put("requestParameters", UtilHttp.getParameterMap(request));
+
+ ServletContextHashModel ftlServletContext = (ServletContextHashModel) request.getAttribute("ftlServletContext");
+ context.put("Application", ftlServletContext);
+ context.put("Request", context.get("requestAttributes"));

// this is a dummy object to stand-in for the JPublish page object for backward compatibility
context.put("page", FastMap.newInstance());