svn commit: r1564531 - in /ofbiz/branches/release12.04: ./ framework/geronimo/lib/

Author: jleroux
Date: Tue Feb  4 22:19:51 2014
New Revision: 1564531

URL: http://svn.apache.org/r1564531
Log:
"Applied fix from trunk for revision: 1564473"
------------------------------------------------------------------------
r1564473 | jleroux | 2014-02-04 21:36:34 +0100 (mar. 04 févr. 2014) | 1 ligne

Updates geronimo-connector & geronimo-transaction to 3.1.1
------------------------------------------------------------------------

Added:
    ofbiz/branches/release12.04/framework/geronimo/lib/geronimo-connector-3.1.1.jar
      - copied unchanged from r1564473, ofbiz/trunk/framework/geronimo/lib/geronimo-connector-3.1.1.jar
    ofbiz/branches/release12.04/framework/geronimo/lib/geronimo-transaction-3.1.1.jar
      - copied unchanged from r1564473, ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-3.1.1.jar
Removed:
    ofbiz/branches/release12.04/framework/geronimo/lib/geronimo-connector-2.1.1.jar
    ofbiz/branches/release12.04/framework/geronimo/lib/geronimo-transaction-2.1.1.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:r1564473

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1564531&r1=1564530&r2=1564531&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Tue Feb  4 22:19:51 2014
@@ -118,8 +118,8 @@
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-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"/>
-    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/>

Modified: ofbiz/branches/release12.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1564531&r1=1564530&r2=1564531&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Tue Feb  4 22:19:51 2014
@@ -103,8 +103,8 @@ framework/webapp/lib/ezmorph-0.9.1.jar
 framework/webapp/lib/rome-0.9.jar
 framework/webapp/lib/serializer-2.7.0.jar
 framework/webapp/lib/xalan-2.7.1.jar
-framework/geronimo/lib/geronimo-connector-2.1.1.jar
-framework/geronimo/lib/geronimo-transaction-2.1.1.jar
+framework/geronimo/lib/geronimo-connector-3.1.1.jar
+framework/geronimo/lib/geronimo-transaction-3.1.1.jar
 applications/content/lib/fontbox-1.4.0.jar
 applications/content/lib/jempbox-1.4.0.jar
 applications/content/lib/lucene-core-3.5.0.jar