You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/01/18 23:26:39 UTC
cvs commit: jakarta-cactus/conf/sample/conf/test/servlet23/tomcat40 server.xml web.xml
vmassol 02/01/18 14:26:39
Modified: conf/sample/build/servlet23 build-tests-tomcat-40.xml
conf/sample/conf/test/servlet23/tomcat40 server.xml
Removed: conf/sample/conf/test/servlet23/tomcat40 web.xml
Log:
now the Cactus related to basic authentication work ok with Tomcat 4.0, Tomcat 4.0.1, Tomcat 4.0.2b2. However, there is a problem with the nightly build from Tomcat 4.1dev (dunno why).
Revision Changes Path
1.6 +8 -6 jakarta-cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-tests-tomcat-40.xml 13 Jan 2002 21:21:16 -0000 1.5
+++ build-tests-tomcat-40.xml 18 Jan 2002 22:26:39 -0000 1.6
@@ -25,8 +25,7 @@
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
- <arg value="-config"/>
- <arg value="${out.tomcat40.full.dir}/conf/server.xml"/>
+ <jvmarg value="-Dcatalina.base=${out.tomcat40.dir}"/>
<arg value="start"/>
<classpath>
@@ -38,7 +37,7 @@
<!-- These are ignore if -Dbuild.sysclasspath=only is used -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
- <include name="server/catalina.jar"/>
+ <!--include name="server/catalina.jar"/-->
</fileset>
</classpath>
</java>
@@ -54,6 +53,7 @@
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
+ <jvmarg value="-Dcatalina.base=${out.tomcat40.dir}"/>
<arg value="stop"/>
<classpath>
@@ -100,9 +100,6 @@
<property name="out.tomcat40.dir" value="${out.test.dir}/tomcat40"/>
<property name="conf.tomcat40.dir" value="${conf.test.dir}/tomcat40"/>
- <property name="out.tomcat40.full.dir" value="${basedir}/${out.tomcat40.dir}"/>
-
- <filter token="out.tomcat40.full.dir" value="${out.tomcat40.full.dir}"/>
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${out.tomcat40.dir}/conf"/>
@@ -119,6 +116,11 @@
<copy todir="${out.tomcat40.dir}/conf" filtering="on">
<fileset dir="${conf.tomcat40.dir}"/>
</copy>
+
+ <!-- Copy the Tomcat web.xml - We need to copy this file as it has
+ changed between Tomcat 4.x versions and one version of it doesn't
+ work with another version of Tomcat 4 -->
+ <copy file="${tomcat.home.40}/conf/web.xml" todir="${out.tomcat40.dir}/conf"/>
<!-- Copy the war file -->
<copy file="${out.test.dir}/test.war" tofile="${out.tomcat40.dir}/webapps/test.war"/>
1.3 +1 -1 jakarta-cactus/conf/sample/conf/test/servlet23/tomcat40/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/conf/sample/conf/test/servlet23/tomcat40/server.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- server.xml 2 Aug 2001 15:02:32 -0000 1.2
+++ server.xml 18 Jan 2002 22:26:39 -0000 1.3
@@ -10,7 +10,7 @@
<Realm className="org.apache.catalina.realm.MemoryRealm" />
- <Host name="localhost" debug="0" appBase="@out.tomcat40.full.dir@/webapps">
+ <Host name="localhost" debug="0" appBase="webapps" unpackWARs="true">
</Host>
</Engine>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>