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

[jacopoc]

Author: jacopoc
Date: Mon Jul  8 14:35:09 2013
New Revision: 1500770

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

Upgrade from Tomcat 7.0.41 to 7.0.42


Added:
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.42-catalina-ha.jar
      - copied unchanged from r1500760, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.42-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.42-catalina-tribes.jar
      - copied unchanged from r1500760, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.42-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-core.jar
      - copied unchanged from r1500760, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-core.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-jasper.jar
      - copied unchanged from r1500760, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-logging-log4j.jar
      - copied unchanged from r1500760, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.42-tomcat-embed-logging-log4j.jar
Removed:
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.41-catalina-ha.jar
    ofbiz/branches/release12.04/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
    ofbiz/branches/release12.04/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
Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/.classpath

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

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1500770&r1=1500769&r2=1500770&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Mon Jul  8 14:35:09 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.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/catalina/lib/tomcat-7.0.42-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.42-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.42-tomcat-embed-core.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.42-tomcat-embed-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.42-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"/>