svn commit: r1334583 - in /ofbiz/branches/release10.04: ./ .classpath LICENSE framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar framework/entity/lib/commons-dbcp-1.4.jar

Author: jleroux
Date: Sun May  6 09:50:16 2012
New Revision: 1334583

URL: http://svn.apache.org/viewvc?rev=1334583&view=rev
Log:
"Applied fix from trunk for revision: 1324685"
------------------------------------------------------------------------
r1324685 | jacopoc | 2012-04-11 12:24:18 +0200 (mer., 11 avr. 2012) | 3 lines

Upgrade DBCP from snapshot version of 1.3 to the new release 1.4


------------------------------------------------------------------------

Added:
    ofbiz/branches/release10.04/framework/entity/lib/commons-dbcp-1.4.jar
      - copied unchanged from r1324685, ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
Removed:
    ofbiz/branches/release10.04/framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar
Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/.classpath
    ofbiz/branches/release10.04/LICENSE

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1324685

Modified: ofbiz/branches/release10.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/.classpath?rev=1334583&r1=1334582&r2=1334583&view=diff
==============================================================================
--- ofbiz/branches/release10.04/.classpath (original)
+++ ofbiz/branches/release10.04/.classpath Sun May  6 09:50:16 2012
@@ -114,7 +114,7 @@
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-juli-adapters.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.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"/>
  <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>

Modified: ofbiz/branches/release10.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/LICENSE?rev=1334583&r1=1334582&r2=1334583&view=diff
==============================================================================
--- ofbiz/branches/release10.04/LICENSE (original)
+++ ofbiz/branches/release10.04/LICENSE Sun May  6 09:50:16 2012
@@ -74,7 +74,7 @@ ofbiz/trunk/framework/catalina/lib/tomca
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar
-ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar
+ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derby-10.5.3.0.jar
 ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar
 ofbiz/trunk/framework/jetty/lib/jasper-compiler-5.5.15.jar