svn commit: r1343263 - in /ofbiz/trunk: ./ framework/catalina/lib/

[jacopoc]

Author: jacopoc
Date: Mon May 28 14:22:15 2012
New Revision: 1343263

URL: http://svn.apache.org/viewvc?rev=1343263&view=rev
Log:
Removed a bunch of unused jars imported from the Tomcat distribution and replaced with the ones in the "Embedded" distribution.
 For details about the upgrade process for future Tomcat releases see my notes:
  https://cwiki.apache.org/confluence/display/OFBTECH/How+to+upgrade+the+embedded+Tomcat

Added:
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar   (with props)
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar   (with props)
Removed:
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.catalina.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.jasper-el.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.jasper.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-es.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-fr.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-ja.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-jdbc.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar
    ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1343263&r1=1343262&r2=1343263&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon May 28 14:22:15 2012
@@ -108,18 +108,11 @@
     <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.jasper-el.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1343263&r1=1343262&r2=1343263&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon May 28 14:22:15 2012
@@ -74,21 +74,11 @@ ofbiz/trunk/framework/base/lib/scripting
 ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-es.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.jasper-el.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-ja.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-fr.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar
 ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
 ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar

Added: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar?rev=1343263&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar?rev=1343263&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar?rev=1343263&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

[jack687]

Awesome work. Thanks a lot. I am struggling to deploy ofbiz in external tomcat 7.* server. Can u write a guide for this one too.