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/03 14:34:48 UTC
cvs commit: jakarta-cactus/docs/framework/xdocs changes.xml
vmassol 02/01/03 05:34:48
Modified: conf/sample/build/servlet22 build-tests-tomcat-33.xml
conf/sample/conf/test/servlet22/tomcat33 server.xml
docs/framework/xdocs changes.xml
Added: conf/sample/conf/test/servlet22/tomcat33 modules.xml
Log:
Improved Tomcat 3.3 configuration, thanks to Larry Isaacs.
Revision Changes Path
1.4 +21 -20 jakarta-cactus/conf/sample/build/servlet22/build-tests-tomcat-33.xml
Index: build-tests-tomcat-33.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/conf/sample/build/servlet22/build-tests-tomcat-33.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-tomcat-33.xml 7 Aug 2001 16:50:01 -0000 1.3
+++ build-tests-tomcat-33.xml 3 Jan 2002 13:34:48 -0000 1.4
@@ -1,4 +1,4 @@
- <!--
+ <!--
========================================================================
Run Tomcat 3.3 tests
========================================================================
@@ -16,7 +16,7 @@
</target>
- <!--
+ <!--
========================================================================
Start Tomcat 3.3
========================================================================
@@ -24,11 +24,10 @@
<target name="start_tomcat_33">
<java classname="org.apache.tomcat.startup.Main" fork="yes">
- <jvmarg value="-Dtomcat.home=${tomcat.home.33}"/>
- <arg value="-config"/>
- <arg value="${out.tomcat33.full.dir}/conf/server.xml"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
+ <jvmarg value="-Dtomcat.home=${out.tomcat33.full.dir}"/>
+ <jvmarg value="-Dtomcat.install=${tomcat.home.33}"/>
+ <arg value="start"/>
+ <classpath>
<fileset dir="${tomcat.home.33}/lib">
<include name="tomcat.jar"/>
</fileset>
@@ -37,28 +36,27 @@
</target>
- <!--
+ <!--
========================================================================
Stop Tomcat 3.3
========================================================================
-->
<target name="stop_tomcat_33">
- <java classname="org.apache.tomcat.startup.StopTomcat" fork="yes">
- <jvmarg value="-Dtomcat.home=${tomcat.home.33}"/>
- <arg value="-ajpid"/>
- <arg value="${out.tomcat33.full.dir}/conf/ajp12.id"/>
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
+ <java classname="org.apache.tomcat.startup.Main" fork="yes">
+ <jvmarg value="-Dtomcat.home=${out.tomcat33.full.dir}"/>
+ <jvmarg value="-Dtomcat.install=${tomcat.home.33}"/>
+ <arg value="stop"/>
+ <classpath>
<fileset dir="${tomcat.home.33}/lib">
- <include name="stop-tomcat.jar"/>
+ <include name="tomcat.jar"/>
</fileset>
</classpath>
</java>
</target>
- <!--
+ <!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
@@ -75,7 +73,7 @@
</target>
- <!--
+ <!--
========================================================================
Prepare directories and variables for running the tests
========================================================================
@@ -89,16 +87,19 @@
<property name="out.tomcat33.full.dir" value="${basedir}/${out.tomcat33.dir}"/>
<filter token="out.tomcat33.dir" value="${out.tomcat33.dir}"/>
+ <!-- Delete everything -->
+ <delete dir="${out.tomcat33.dir}/webapps"/>
+
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${out.tomcat33.dir}/conf"/>
<mkdir dir="${out.tomcat33.dir}/work"/>
<mkdir dir="${out.tomcat33.dir}/webapps"/>
- <!-- Delete some config file so that they will be copied every time -->
- <delete file="${out.tomcat33.dir}/conf/testserver.xml"/>
-
<copy file="${conf.tomcat33.dir}/server.xml"
todir="${out.tomcat33.dir}/conf" filtering="on"/>
+
+ <copy file="${conf.tomcat33.dir}/modules.xml"
+ todir="${out.tomcat33.dir}/conf"/>
<!-- Copy the war file -->
<copy file="${out.test.dir}/test.war" tofile="${out.tomcat33.dir}/webapps/test.war"/>
1.3 +6 -9 jakarta-cactus/conf/sample/conf/test/servlet22/tomcat33/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/conf/sample/conf/test/servlet22/tomcat33/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 3 Jan 2002 13:34:48 -0000 1.3
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<Server>
- <ContextManager home="@out.tomcat33.dir@" debug="0" workDir="work" showDebugInfo="true">
+ <ContextManager workDir="work">
<!-- ==================== Global modules ==================== -->
- <LogSetter name="tc_log" timestamps="true"
- verbosityLevel="DEBUG" />
+ <LogSetter name="tc_log" timestamps="true" path="tomcat.log"
+ verbosityLevel="INFORMATION" />
<LogEvents enabled="false" />
<AutoDeploy source="webapps" target="webapps" />
<AutoWebApp dir="webapps" host="DEFAULT" />
- <SimpleMapper1 debug="0" />
+ <SimpleMapper1 />
<SessionExpirer checkInterval="60" />
<SessionIdGenerator randomClass="java.util.Random"
@@ -83,7 +83,7 @@
secure - use SSL ( https )
keystore, keypass - certs for SSL
port -->
- <Http10Interceptor port="@test.port@"
+ <Http10Connector port="@test.port@"
secure="false"
maxThreads="100"
maxSpareThreads="50"
@@ -91,10 +91,7 @@
<!-- Note: we use a port different from the standard one (8007) not
to interfere with an other running tomcat -->
- <RequestInterceptor
- className="org.apache.tomcat.modules.server.Ajp12Interceptor"
- tomcatAuthentication="false"
- port="8777" />
+ <Ajp12Connector port="8777" />
</ContextManager>
</Server>
1.1 jakarta-cactus/conf/sample/conf/test/servlet22/tomcat33/modules.xml
Index: modules.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<modules>
<module name="JNIConnectionHandler" javaClass="org.apache.tomcat.modules.server.JNIConnectionHandler"/>
<module name="WorkDirSetup" javaClass="org.apache.tomcat.modules.config.WorkDirSetup"/>
<module name="PathSetter" javaClass="org.apache.tomcat.modules.config.PathSetter"/>
<module name="ApacheConfig" javaClass="org.apache.tomcat.modules.config.ApacheConfig"/>
<module name="JservConfig" javaClass="org.apache.tomcat.modules.config.JservConfig"/>
<module name="PolicyLoader" javaClass="org.apache.tomcat.modules.config.PolicyLoader"/>
<module name="AutoWebApp" javaClass="org.apache.tomcat.modules.config.AutoWebApp"/>
<module name="Http10Interceptor" javaClass="org.apache.tomcat.modules.server.Http10Interceptor"/>
<module name="Http10Connector" javaClass="org.apache.tomcat.modules.server.Http10Interceptor"/>
<module name="JniConnector" javaClass="org.apache.tomcat.modules.server.JNIConnectionHandler"/>
<module name="Ajp12Connector" javaClass="org.apache.tomcat.modules.server.Ajp12Interceptor"/>
<module name="Ajp13Connector" javaClass="org.apache.tomcat.modules.server.Ajp13Interceptor"/>
<module name="NSConfig" javaClass="org.apache.tomcat.modules.config.NSConfig"/>
<module name="IISConfig" javaClass="org.apache.tomcat.modules.config.IISConfig"/>
<module name="AutoDeploy" javaClass="org.apache.tomcat.modules.config.AutoDeploy"/>
<module name="ServerXmlReader" javaClass="org.apache.tomcat.modules.config.ServerXmlReader"/>
<module name="LoaderInterceptor11" javaClass="org.apache.tomcat.modules.config.LoaderInterceptor11"/>
<module name="ContextXmlReader" javaClass="org.apache.tomcat.modules.config.ContextXmlReader"/>
<module name="LogSetter" javaClass="org.apache.tomcat.modules.config.LogSetter"/>
<module name="SimpleSessionStore" javaClass="org.apache.tomcat.modules.session.SimpleSessionStore"/>
<module name="SessionIdGenerator" javaClass="org.apache.tomcat.modules.session.SessionIdGenerator"/>
<module name="SessionExpirer" javaClass="org.apache.tomcat.modules.session.SessionExpirer"/>
<module name="SessionId" javaClass="org.apache.tomcat.modules.session.SessionId"/>
<module name="AccountingInterceptor" javaClass="org.apache.tomcat.modules.loggers.AccountingInterceptor"/>
<module name="LogEvents" javaClass="org.apache.tomcat.modules.loggers.LogEvents"/>
<module name="SimpleRealm" javaClass="org.apache.tomcat.modules.aaa.SimpleRealm"/>
<module name="JDBCRealm" javaClass="org.apache.tomcat.modules.aaa.JDBCRealm"/>
<module name="CredentialsInterceptor" javaClass="org.apache.tomcat.modules.aaa.CredentialsInterceptor"/>
<module name="AccessInterceptor" javaClass="org.apache.tomcat.modules.aaa.AccessInterceptor"/>
<module name="AccessLogInterceptor" javaClass="org.apache.tomcat.modules.loggers.AccessLogInterceptor"/>
<module name="InvokerInterceptor" javaClass="org.apache.tomcat.modules.generators.InvokerInterceptor"/>
<module name="ErrorHandler" javaClass="org.apache.tomcat.modules.generators.ErrorHandler"/>
<module name="Jdk12Interceptor" javaClass="org.apache.tomcat.modules.generators.Jdk12Interceptor"/>
<module name="StaticInterceptor" javaClass="org.apache.tomcat.modules.generators.StaticInterceptor"/>
<module name="ReloadInterceptor" javaClass="org.apache.tomcat.modules.mappers.ReloadInterceptor"/>
<module name="DecodeInterceptor" javaClass="org.apache.tomcat.modules.mappers.DecodeInterceptor"/>
<module name="SimpleMapper1" javaClass="org.apache.tomcat.modules.mappers.SimpleMapper1"/>
<module name="WebXmlReader" javaClass="org.apache.tomcat.facade.WebXmlReader"/>
<module name="JspInterceptor" javaClass="org.apache.tomcat.facade.JspInterceptor"/>
<module name="Servlet22Interceptor" javaClass="org.apache.tomcat.facade.Servlet22Interceptor"/>
<module name="LoadOnStartupInterceptor" javaClass="org.apache.tomcat.facade.LoadOnStartupInterceptor"/>
<module name="ProfileLoader" javaClass="org.apache.tomcat.config.ProfileLoader"/>
<module name="TagPoolManagerInterceptor" javaClass="org.apache.tomcat.facade.TagPoolManagerInterceptor"/>
<module name="TrustedLoader" javaClass="org.apache.tomcat.modules.config.TrustedLoader"/>
</modules>
1.73 +4 -0 jakarta-cactus/docs/framework/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/docs/framework/xdocs/changes.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- changes.xml 15 Dec 2001 23:36:01 -0000 1.72
+++ changes.xml 3 Jan 2002 13:34:48 -0000 1.73
@@ -127,6 +127,10 @@
</devs>
<release version="1.3 in CVS">
+ <action dev="VMA" type="fix" due-to="Larry Isaacs" due-to-email="Larry.Isaacs@sas.com">
+ Improved Tomcat 3.3 configuration that is bundled with the Cactus
+ sample application.
+ </action>
<action dev="VMA" type="add">
Added automatic script support for WebLogic 6.1.
</action>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>