vmassol 2004/03/10 10:31:19
Modified:
integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat
Tomcat3xContainer.java
documentation/docs/xdocs changes.xml
Log:
Added support for Tomcat 3.3.2 (note that this required adding the commons-logging
jar to the Tomcat bootstrap classpath).
Revision Changes Path
1.10 +11 -1
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/Tomcat3xContainer.java
Index: Tomcat3xContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/tomcat/Tomcat3xContainer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Tomcat3xContainer.java 29 Feb 2004 10:10:41 -0000 1.9
+++ Tomcat3xContainer.java 10 Mar 2004 18:31:18 -0000 1.10
@@ -115,6 +115,16 @@
Path classpath = java.createClasspath();
classpath.createPathElement().setLocation(
new File(getDir(), "lib/tomcat.jar"));
+
+ // It seems that since Tomcat 3.3.2, the commons-logging jar is
+ // required in the Tomcat bootstrap classpath...
+ File commonsLoggingJarFile =
+ new File(getDir(), "lib/common/commons-logging-api.jar");
+ if (commonsLoggingJarFile.exists())
+ {
+ classpath.createPathElement().setLocation(commonsLoggingJarFile);
+ }
+
java.setClassname("org.apache.tomcat.startup.Main");
java.createArg().setValue(theArg);
java.execute();
1.170 +4 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- changes.xml 2 Mar 2004 20:04:36 -0000 1.169
+++ changes.xml 10 Mar 2004 18:31:18 -0000 1.170
@@ -68,6 +68,10 @@
</devs>
<release version="1.6dev" date="in CVS">
+ <action dev="VMA" type="add">
+ Added support for Tomcat 3.3.2 (note that this required adding the
+ commons-logging jar to the Tomcat bootstrap classpath).
+ </action>
<action dev="VMA" type="update" due-to="Kazuhito Suguri"
due-to-email="[EMAIL PROTECTED]">
In the Form authentication code, changed the response check logic
for the pre-authentication step to accept any status code less
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
