remm 2003/09/06 10:49:22
Modified: . 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.157 +4 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 5 Sep 2003 06:46:01 -0000 1.156
+++ build.xml 6 Sep 2003 17:49:22 -0000 1.157
@@ -132,7 +132,7 @@
<copy file="${commons-el.jar}"
todir="${tomcat.build}/common/lib"/>
- <copy todir="${tomcat.build}/common/lib"
+ <copy todir="${tomcat.build}/bin"
file="${commons-logging-api.jar}" />
<copy tofile="${tomcat.build}/common/lib/jmx.jar" file="${jmx.jar}" />
<copy tofile="${tomcat.build}/common/lib/jmx-tools.jar"
@@ -142,11 +142,10 @@
<copy tofile="${tomcat.build}/common/lib/jmx-remote-tools.jar"
file="${jmx-remote-tools.jar}" failonerror="false" />
- <copy todir="${tomcat.build}/server/lib" file="${commons-logging.jar}" />
<copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
<copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
</target>
@@ -280,6 +279,7 @@
<path id="jspc.classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${tomcat.build}/server/classes"/>
<fileset dir="${tomcat.build}/server/lib">
<include name="*.jar"/>
@@ -724,7 +724,6 @@
<fileset dir="${tomcat.build}/server/lib">
<include name="commons-digester.jar"/>
<include name="commons-beanutils.jar"/>
- <include name="commons-logging.jar"/>
</fileset>
</copy>
<copy todir="${tomcat.deployer}/lib">
@@ -735,6 +734,7 @@
<copy todir="${tomcat.deployer}/lib"
file="${tomcat.build}/server/lib/catalina-ant.jar"/>
+ <copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/>
<jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"
index="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
