Author: jleroux
Date: Sat Aug 2 11:26:54 2014
New Revision: 1615301
URL: http://svn.apache.org/r1615301
Log:
"Applied fix from trunk for revision: 1615297"
------------------------------------------------------------------------
r1615297 | jleroux | 2014-08-02 13:20:09 +0200 (sam. 02 août 2014) | 3 lignes
Update Tomcat from 7.0.54 to 7.0.55
Forgot LICENSE and .classpath
------------------------------------------------------------------------
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:r1615297
Modified: ofbiz/branches/release12.04/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1615301&r1=1615300&r2=1615301&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Sat Aug 2 11:26:54 2014
@@ -110,16 +110,16 @@
<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-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-util.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-catalina.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-jasper.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.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"/>
Modified: ofbiz/branches/release12.04/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1615301&r1=1615300&r2=1615301&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Sat Aug 2 11:26:54 2014
@@ -76,15 +76,15 @@ 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.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-util.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.55-catalina.jar
+framework/catalina/lib/tomcat-7.0.55-jasper.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.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
@@ -2315,6 +2315,7 @@ questions or comments regarding the usag
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
Eclipse Public License - v 1.0:
+framework/catalina/lib/ecj-4.4.jar
framework/birt/lib/flute.jar
framework/birt/lib/jaxrpc.jar
framework/birt/lib/js.jar
