remm        2003/09/06 10:49:43

  Modified:    catalina build.xml
  Log:
  - Modify the bundling of commons-logging to fix (hopefully) the nagging CL issues.
  - The commons-logging-api JAR will now be put in the system classloader.
    When using an alternate logging implmentation (ex: log4j) you should put the
    wrapper implementation in the same classloader or there will likely be trouble.
  - Ex: When using a Struts 1.1 webapp with log4j, there should be commons-logging.jar
    (just the log4j logger is fine as well) next to it.
  - Of course, overriding the log4j API in a webapp is still not possible. It wasn't
    before as c-logging was treated as a special case by the classloader (like JAXP).
  - This nasty case now works for me (bug 22701), as well as using log4j with
    privileged webapps (with or without SSL).
  
  Revision  Changes    Path
  1.56      +2 -4      jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml 30 Aug 2003 13:19:40 -0000      1.55
  +++ build.xml 6 Sep 2003 17:49:43 -0000       1.56
  @@ -539,6 +539,8 @@
       <chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
   
       <!-- Common Extensions -->
  +    <copy todir="${catalina.build}/bin"
  +           file="${commons-logging-api.jar}"/>
   <!--
       <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
   -->
  @@ -561,10 +563,6 @@
              file="${commons-beanutils.jar}"/>
       <copy todir="${catalina.build}/server/lib"
              file="${commons-digester.jar}"/>
  -    <copy todir="${catalina.build}/server/lib"
  -           file="${commons-logging.jar}"/>
  -    <copy todir="${catalina.build}/common/lib"
  -           file="${commons-logging-api.jar}"/>
       <copy todir="${catalina.build}/server/lib" file="${regexp.jar}"/>
   
     </target>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to