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

[jacopoc]

Author: jacopoc
Date: Tue Nov  6 12:07:49 2012
New Revision: 1406108

URL: http://svn.apache.org/viewvc?rev=1406108&view=rev
Log:
Upgrade from tomcat-7.0.27 to tomvat 7.0.32 (embedded), i.e. same version of trunk: the old Tomcat version was a affected by some vulnerabilities.

Added:
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar   (with props)
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar   (with props)
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar   (with props)
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar   (with props)
Removed:
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.catalina-ant.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.catalina.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.jasper-el.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-api.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-coyote.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-dbcp.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-es.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-fr.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-i18n-ja.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-jdbc.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-juli-adapters.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-juli.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.27.tomcat-util.jar
Modified:
    ofbiz/branches/release12.04/.classpath
    ofbiz/branches/release12.04/LICENSE

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1406108&r1=1406107&r2=1406108&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Tue Nov  6 12:07:49 2012
@@ -92,10 +92,10 @@
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/el-api-2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/jsp-api-2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/servlet-api-3.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
@@ -111,18 +111,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.32.catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.32.catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.32.tomcat-embed-core.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.32.tomcat-embed-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.32.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/branches/release12.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1406108&r1=1406107&r2=1406108&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Tue Nov  6 12:07:49 2012
@@ -65,10 +65,10 @@ ofbiz/trunk/framework/base/lib/j2eespecs
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/annotations-api-3.0.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar
 ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
 ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
 ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.8.6.jar
@@ -76,21 +76,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.32.catalina-ha.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32.catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32.tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32.tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32.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/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=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 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=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 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=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 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=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar?rev=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar?rev=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar?rev=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar?rev=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar?rev=1406108&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream