svn commit: r833660 - in /ofbiz/branches/addbirt: LICENSE framework/base/config/ofbiz-containers.xml framework/birt/webapp/birt/WEB-INF/web.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r833660 - in /ofbiz/branches/addbirt: LICENSE framework/base/config/ofbiz-containers.xml framework/birt/webapp/birt/WEB-INF/web.xml

hansbak-2
Author: hansbak
Date: Sat Nov  7 09:41:57 2009
New Revision: 833660

URL: http://svn.apache.org/viewvc?rev=833660&view=rev
Log:
re-commit missed files in last commit

Modified:
    ofbiz/branches/addbirt/LICENSE
    ofbiz/branches/addbirt/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml

Modified: ofbiz/branches/addbirt/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/LICENSE?rev=833660&r1=833659&r2=833660&view=diff
==============================================================================
--- ofbiz/branches/addbirt/LICENSE (original)
+++ ofbiz/branches/addbirt/LICENSE Sat Nov  7 09:41:57 2009
@@ -2305,6 +2305,148 @@
 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/com.ibm.icu_4.0.1.v20090415.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/flute.jar
+ofbiz/trunk/framework/birt/lib/javax.wsdl_1.5.1.v200806030408.jar
+ofbiz/trunk/framework/birt/lib/jaxrpc.jar
+ofbiz/trunk/framework/birt/lib/js.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/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+ofbiz/trunk/framework/birt/lib/org.eclipse.emf.common_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.5.0.v200906080927.jar
+ofbiz/trunk/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.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.apache.derby.core_10.3.1.4/derby.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc_2.5.0.v20090605/oda-jdbc.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.sampledb_2.5.0.v20090605/sampledb.jar
+ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.sampledb_2.5.0.v20090605/db/BirtSample.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
 

Modified: ofbiz/branches/addbirt/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/config/ofbiz-containers.xml?rev=833660&r1=833659&r2=833660&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/addbirt/framework/base/config/ofbiz-containers.xml Sat Nov  7 09:41:57 2009
@@ -256,13 +256,6 @@
             <property name="ciphers" value=""/>
         </property>
     </container>
-
-    <!-- load BeanShell remote telnet server -->
-    <container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer">
-        <!-- the port below and port-1 will be opened by beanshell -->
-        <property name="telnet-port" value="9990"/>
-        <property name="app-name" value="OFBiz"/>
-    </container>
     
     <!-- load the BIRT container -->
     <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer">
@@ -270,4 +263,11 @@
         <property name="dispatcher-name" value="birt-dispatcher"/>
         <property name="delegator-group-helper-name" value="org.ofbiz"/>
     </container>
+
+    <!-- load BeanShell remote telnet server -->
+    <container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer">
+        <!-- the port below and port-1 will be opened by beanshell -->
+        <property name="telnet-port" value="9990"/>
+        <property name="app-name" value="OFBiz"/>
+    </container>
 </ofbiz-containers>

Modified: ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml?rev=833660&r1=833659&r2=833660&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/webapp/birt/WEB-INF/web.xml Sat Nov  7 09:41:57 2009
@@ -119,7 +119,7 @@
     -->
     <context-param>
         <param-name>BIRT_VIEWER_SCRIPTLIB_DIR</param-name>
-        <param-value></param-value>
+        <param-value>${ofbiz.home}/framework/birt/scriptlib</param-value>
     </context-param>
     
     <!-- Resource location directory. Defaults to ${birt home} -->