Author: jacopoc Date: Wed Jul 9 07:56:50 2014 New Revision: 1609052 URL: http://svn.apache.org/r1609052 Log: Applied fix from trunk for revision: 1609047 ===
Fixed Tomcat internal logging that was broken after the upgrade to the 7 series; log4j configuration for Tomcat is now inline with the one described in http://tomcat.apache.org/tomcat-7.0-doc/logging.html Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar - copied unchanged from r1609047, ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar ofbiz/branches/release12.04/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar - copied unchanged from r1609047, ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar Removed: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.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:r1609047 Modified: ofbiz/branches/release12.04/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1609052&r1=1609051&r2=1609052&view=diff ============================================================================== --- ofbiz/branches/release12.04/.classpath (original) +++ ofbiz/branches/release12.04/.classpath Wed Jul 9 07:56:50 2014 @@ -117,8 +117,9 @@ <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-juli.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/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=1609052&r1=1609051&r2=1609052&view=diff ============================================================================== --- ofbiz/branches/release12.04/LICENSE (original) +++ ofbiz/branches/release12.04/LICENSE Wed Jul 9 07:56:50 2014 @@ -82,8 +82,9 @@ framework/catalina/lib/tomcat-7.0.54-cat 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-juli.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/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
