svn commit: r1601320 - in /ofbiz/branches/release12.04: ./ framework/base/lib/j2eespecs/ framework/catalina/lib/ framework/testtools/lib/

[jacopoc]

Author: jacopoc
Date: Mon Jun  9 08:12:09 2014
New Revision: 1601320

URL: http://svn.apache.org/r1601320
Log:
Upgraded to the latest bug fix release of Apache Tomcat: 7.0.54

Added:
    ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
      - copied unchanged from r1598330, ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
Removed:
    ofbiz/branches/release12.04/framework/catalina/lib/ecj-4.2.2.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar
    ofbiz/branches/release12.04/framework/testtools/lib/org.springframework.web-3.1.0.M2.jar
Modified:
    ofbiz/branches/release12.04/.classpath
    ofbiz/branches/release12.04/LICENSE
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Mon Jun  9 08:12:09 2014
@@ -110,12 +110,15 @@
     <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.2.2.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/ecj-P20140317-1600.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.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-3.1.1.jar"/>
@@ -148,7 +151,6 @@
     <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/>
-    <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/>
     <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
     <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>

Modified: ofbiz/branches/release12.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Mon Jun  9 08:12:09 2014
@@ -76,11 +76,14 @@ framework/base/lib/scripting/jansi-1.2.1
 framework/base/lib/xmlrpc-client-3.1.2.jar
 framework/base/lib/xmlrpc-common-3.1.2.jar
 framework/base/lib/xmlrpc-server-3.1.2.jar
-framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar
-framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar
-framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar
-framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar
-framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar
+framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.54-catalina.jar
+framework/catalina/lib/tomcat-7.0.54-jasper.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
 framework/entity/lib/commons-dbcp-1.4.jar
 framework/entity/lib/jdbc/derby-10.8.2.2.jar
 framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -2342,7 +2345,7 @@ framework/birt/lib/org.w3c.dom.svg_1.1.0
 framework/birt/lib/saaj.jar
 framework/birt/lib/Tidy.jar
 framework/birt/lib/viewservlets.jar
-framework/catalina/lib/ecj-4.2.2.jar
+framework/catalina/lib/ecj-P20140317-1600.jar
 framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar
 framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar
 framework/jetty/lib/jetty-http-8.1.2.v20120308.jar

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar?rev=1601320&r1=1601319&r2=1601320&view=diff
==============================================================================
Binary files - no diff available.