Author: erwan
Date: Wed Nov 7 21:44:32 2012
New Revision: 1406830
URL: http://svn.apache.org/viewvc?rev=1406830&view=rev
Log:
Upgrading to tomcat 6.0.36 following CVE-2012-2733
Added:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar
(with props)
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar
(with props)
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar
(with props)
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/ecj-3.7.2.jar (with
props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli-adapters.jar
(with props)
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar
(with props)
Removed:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.35-annotations-api.jar
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.35-el-api.jar
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.35-jsp-api.jar
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.35-servlet-api.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-catalina-ha.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-catalina-tribes.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-catalina.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-ecj-3.7.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-jasper-el.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-jasper.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-tomcat-coyote.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-tomcat-dbcp.jar
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.35-tomcat-juli.jar
Modified:
ofbiz/branches/release11.04/.classpath
ofbiz/branches/release11.04/LICENSE
Modified: ofbiz/branches/release11.04/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/.classpath?rev=1406830&r1=1406829&r2=1406830&view=diff
==============================================================================
--- ofbiz/branches/release11.04/.classpath (original)
+++ ofbiz/branches/release11.04/.classpath Wed Nov 7 21:44:32 2012
@@ -91,10 +91,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-6.0.35-annotations-api.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.35-el-api.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.35-jsp-api.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.35-servlet-api.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.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"/>
@@ -124,15 +124,15 @@
<classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/>
<classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/>
<classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-ecj-3.7.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-catalina.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-catalina-ha.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-catalina-tribes.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-jasper.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-jasper-el.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-tomcat-coyote.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-tomcat-dbcp.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.35-tomcat-juli.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-ecj-3.7.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-catalina.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-jasper.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-jasper-el.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-6.0.36-tomcat-juli.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/release11.04/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/LICENSE?rev=1406830&r1=1406829&r2=1406830&view=diff
==============================================================================
--- ofbiz/branches/release11.04/LICENSE (original)
+++ ofbiz/branches/release11.04/LICENSE Wed Nov 7 21:44:32 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-6.0.35-annotations-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-el-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-jsp-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-servlet-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.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.7.7.jar
@@ -76,14 +76,14 @@ 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/trunk/framework/catalina/lib/tomcat-6.0.35-catalina-ha.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-catalina-tribes.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-catalina.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-jasper-el.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-jasper.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-coyote.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-dbcp.jar
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-juli.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-jasper.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar
+ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar
ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
ofbiz/trunk/framework/entity/lib/jdbc/derby-10.7.1.1.jar
ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.7.1.1.jar
@@ -2429,7 +2429,7 @@ ofbiz/trunk/framework/birt/lib/platform/
ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520-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
-ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-ecj-3.7.jar
+ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.jar
=========================================================================
Eclipse Public License - v 1.0
Added:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/branches/release11.04/framework/catalina/lib/ecj-3.7.2.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/ecj-3.7.2.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/branches/release11.04/framework/catalina/lib/ecj-3.7.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-catalina.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-jasper.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli-adapters.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli-adapters.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli-adapters.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar?rev=1406830&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ofbiz/branches/release11.04/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
