svn commit: r1499737 - in /ofbiz/branches/release12.04: ./ framework/catalina/lib/

[jacopoc]

Author: jacopoc
Date: Thu Jul  4 12:44:51 2013
New Revision: 1499737

URL: http://svn.apache.org/r1499737
Log:
Applied fix from trunk for revision: 1499732
===

Upgrade from Tomcat 7.0.40 to Tomcat 7.0.41

Added:
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-catalina-ha.jar
      - copied unchanged from r1499732, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.41-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-catalina-tribes.jar
      - copied unchanged from r1499732, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.41-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-core.jar
      - copied unchanged from r1499732, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-core.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-jasper.jar
      - copied unchanged from r1499732, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-logging-log4j.jar
      - copied unchanged from r1499732, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-logging-log4j.jar
Removed:
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.40-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.40-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-core.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-logging-log4j.jar
Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/.classpath
    ofbiz/branches/release12.04/LICENSE

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1499732

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1499737&r1=1499736&r2=1499737&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Thu Jul  4 12:44:51 2013
@@ -111,11 +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-4.2.2.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.40-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.40-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.40-tomcat-embed-core.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.40-tomcat-embed-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.40-tomcat-embed-logging-log4j.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.41-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.41-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.41-tomcat-embed-core.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.41-tomcat-embed-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.41-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=1499737&r1=1499736&r2=1499737&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Thu Jul  4 12:44:51 2013
@@ -76,11 +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.40-catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.40-catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-core.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-jasper.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.40-tomcat-embed-logging-log4j.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.41-catalina-ha.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.41-catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.41-tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.41-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