svn commit: r836336 - in /ofbiz/branches/addbirt: ./ framework/birt/ framework/birt/lib/ framework/birt/lib/platform/plugins/org.apache.derby.core_10.3.1.4/ framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc_2.5.1.v20090821/ fram...

[hansbak-2]

Author: hansbak
Date: Sun Nov 15 07:57:09 2009
New Revision: 836336

URL: http://svn.apache.org/viewvc?rev=836336&view=rev
Log:
removing unwanted jars and directories

Removed:
    ofbiz/branches/addbirt/framework/birt/lib/com.ibm.icu_4.0.1.v20090822.jar
    ofbiz/branches/addbirt/framework/birt/lib/flute.jar
    ofbiz/branches/addbirt/framework/birt/lib/javax.wsdl_1.5.1.v200806030408.jar
    ofbiz/branches/addbirt/framework/birt/lib/js.jar
    ofbiz/branches/addbirt/framework/birt/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
    ofbiz/branches/addbirt/framework/birt/lib/org.eclipse.emf.common_2.5.0.v200906151043.jar
    ofbiz/branches/addbirt/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar
    ofbiz/branches/addbirt/framework/birt/lib/org.eclipse.emf.ecore_2.5.0.v200906151043.jar
    ofbiz/branches/addbirt/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
    ofbiz/branches/addbirt/framework/birt/lib/platform/plugins/org.apache.derby.core_10.3.1.4/
    ofbiz/branches/addbirt/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc_2.5.1.v20090821/
    ofbiz/branches/addbirt/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.sampledb_2.5.1.v20090821/
Modified:
    ofbiz/branches/addbirt/LICENSE
    ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml
    ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/BirtWorker.java
    ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java

Modified: ofbiz/branches/addbirt/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/LICENSE?rev=836336&r1=836335&r2=836336&view=diff
==============================================================================
--- ofbiz/branches/addbirt/LICENSE (original)
+++ ofbiz/branches/addbirt/LICENSE Sun Nov 15 07:57:09 2009
@@ -2306,7 +2306,6 @@
 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
@@ -2315,18 +2314,10 @@
 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
@@ -2440,10 +2431,6 @@
 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

Modified: ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml?rev=836336&r1=836335&r2=836336&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml Sun Nov 15 07:57:09 2009
@@ -23,6 +23,15 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="lib/*"/>
+    <classpath type="jar" location="lib/platform/plugins/com.ibm.icu_4.0.1.v20090822.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/javax.wsdl_1.5.1.v200806030408.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.apache.commons.codec_1.3.0.v20080530-1600.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.eclipse.emf.common_2.5.0.v200906151043.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.eclipse.emf.ecore_2.5.0.v200906151043.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.w3c.css.sac_1.3.0.v200805290154.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090521/lib/js.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.w3c.sac_1.3.0.v20070710/lib/flute.jar"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>

Modified: ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/BirtWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/BirtWorker.java?rev=836336&r1=836335&r2=836336&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/BirtWorker.java (original)
+++ ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/BirtWorker.java Sun Nov 15 07:57:09 2009
@@ -77,6 +77,8 @@
         Debug.logInfo("Get report engine", module);
         IReportEngine engine = BirtContainer.getReportEngine();
     
+        /*
+        --- DISABLE JDBC FEATURE
         // set the jdbc connection
         String delegatorGroupHelperName = BirtContainer.getDelegatorGroupHelperName();
         Delegator delegator = BirtContainer.getDelegator();
@@ -84,6 +86,7 @@
         String helperName = delegator.getGroupHelperName(delegatorGroupHelperName);    // gets the helper (localderby, localmysql, localpostgres, etc.) for your entity group org.ofbiz
         Connection connection = ConnectionFactory.getConnection(helperName);
         engine.getConfig().getAppContext().put("OdaJDBCDriverPassInConnection", connection);
+        */
         
         IRunAndRenderTask task = engine.createRunAndRenderTask(design);
         if (birtLocale != null) {

Modified: ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java?rev=836336&r1=836335&r2=836336&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java (original)
+++ ofbiz/branches/addbirt/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java Sun Nov 15 07:57:09 2009
@@ -103,8 +103,11 @@
                 // put all app context from Birt Container to Report Engine Service
                 ReportEngineService.getInstance().getEngineConfig().getAppContext().putAll(
                         BirtContainer.getReportEngine().getConfig().getAppContext());
+                /*
+                --- DISABLE JDBC FEATURE
                 Connection connection = getConnection();
                 BirtContainer.getReportEngine().getConfig().getAppContext().put("OdaJDBCDriverPassInConnection", connection);
+                */
             } catch (Exception e) {
                 Debug.logError(e, module);
             }
@@ -265,8 +268,11 @@
                 // put all app context from Birt Container to Report Engine Service
                 ReportEngineService.getInstance().getEngineConfig().getAppContext().putAll(
                         BirtContainer.getReportEngine().getConfig().getAppContext());
+                /*
+                --- DISABLE JDBC FEATURE
                 Connection connection = getConnection();
                 ReportEngineService.getInstance( ).getEngineConfig().getAppContext().put("OdaJDBCDriverPassInConnection", connection);
+                */
             } catch (Exception e) {
                 Debug.logError(e, module);
             }