You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/11/06 06:22:58 UTC
svn commit: r833303 - in /ofbiz/trunk: LICENSE
framework/base/config/ofbiz-containers.xml framework/component-load.xml
framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Author: lektran
Date: Fri Nov 6 05:22:58 2009
New Revision: 833303
URL: http://svn.apache.org/viewvc?rev=833303&view=rev
Log:
Reverted changes to the trunk from r833294 that appear to have been intended for the birt branch
Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/framework/base/config/ofbiz-containers.xml
ofbiz/trunk/framework/component-load.xml
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=833303&r1=833302&r2=833303&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Fri Nov 6 05:22:58 2009
@@ -2305,147 +2305,6 @@
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.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/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=833303&r1=833302&r2=833303&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Fri Nov 6 05:22:58 2009
@@ -256,14 +256,6 @@
<property name="ciphers" value=""/>
</property>
</container>
-
- <!-- load the BIRT container -->
- <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer">
- <!-- the port below and port-1 will be opened by beanshell -->
- <property name="delegator-name" value="default"/>
- <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">
Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=833303&r1=833302&r2=833303&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Fri Nov 6 05:22:58 2009
@@ -31,7 +31,6 @@
<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=833303&r1=833302&r2=833303&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 Fri Nov 6 05:22:58 2009
@@ -48,9 +48,6 @@
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.
*/
@@ -194,9 +191,6 @@
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);