svn commit: r1732573 - in /ofbiz/branches/release15.12: ./ framework/catalina/lib/

Author: jleroux
Date: Fri Feb 26 22:50:16 2016
New Revision: 1732573

URL: http://svn.apache.org/viewvc?rev=1732573&view=rev
Log:
"Applied fix from trunk for revision: 1732570"
------------------------------------------------------------------------
r1732570 | jleroux | 2016-02-26 23:41:03 +0100 (ven. 26 févr. 2016) | 1 ligne

I made an error while naming Tomcat extras files at r1717760. This fixes it including .classpath file  - Tomcat 7.0.65 - OFBIZ-6752
------------------------------------------------------------------------


Added:
    ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.65-tomcat-util.jar
      - copied unchanged from r1732570, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.65-tomcat-util.jar
    ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar
      - copied unchanged from r1732570, ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar
Removed:
    ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.65-tomcat-juli-adapters.jar
    ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-7.0.65-tomcat-util.jar
Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/.classpath

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 22:50:16 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731382,1731396,1732454
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731382,1731396,1732454,1732570

Modified: ofbiz/branches/release15.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/.classpath?rev=1732573&r1=1732572&r2=1732573&view=diff
==============================================================================
--- ofbiz/branches/release15.12/.classpath (original)
+++ ofbiz/branches/release15.12/.classpath Fri Feb 26 22:50:16 2016
@@ -99,9 +99,9 @@
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-jasper.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-api.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-coyote.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-util.jar"/>
  <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-util.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar"/>
  <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.1.jar"/>
  <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
  <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.14.jar"/>