vmassol 01/08/02 08:02:32
Modified: cactus/build build-servletapi.xml build.properties.sample
build.xml
cactus/conf/sample/build/servlet22
build-tests-enhydra-31.xml build-tests-resin-12.xml
build-tests-tomcat-32.xml build-tests-tomcat-33.xml
build-tests-weblogic-51.xml build.properties.sample
build.xml
cactus/conf/sample/build/servlet23 build-tests-resin-13.xml
build-tests-tomcat-40.xml build.properties.sample
build.xml
cactus/conf/sample/build/share build-share.xml
build-tests-orion-14.xml build-tests-resin-20.xml
cactus/conf/sample/conf/test/servlet22/enhydra31
multiserver.conf
cactus/conf/sample/conf/test/servlet22/resin12 resin.conf
cactus/conf/sample/conf/test/servlet22/tomcat32 server.xml
cactus/conf/sample/conf/test/servlet22/tomcat33 server.xml
cactus/conf/sample/conf/test/servlet22/weblogic51
weblogic.properties
cactus/conf/sample/conf/test/servlet23/resin13 resin.conf
cactus/conf/sample/conf/test/servlet23/tomcat40 server.xml
cactus/conf/sample/conf/test/share cactus.properties
cactus/conf/sample/conf/test/share/orion14
default-web-site.xml
cactus/conf/sample/conf/test/share/resin20 resin.conf
cactus/docs/framework/xdocs changes.xml
Log:
added test.port parameter to make the port number used to start the servlet engines
configurable
Revision Changes Path
1.15 +8 -0 jakarta-commons/cactus/build/build-servletapi.xml
Index: build-servletapi.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build-servletapi.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-servletapi.xml 2001/07/05 12:11:29 1.14
+++ build-servletapi.xml 2001/08/02 15:02:31 1.15
@@ -19,6 +19,12 @@
files will be copied with version number
postfixed.
+ test.port [OPTIONAL] The port that should be used for
+ starting the servers during unit testing. This
+ should be used not to interfere with other
+ running servers. The default is 8080. This
+ property is used when running the functional tests
+
Additionally and depending on the servlet engines whith which you wish to
run your tests, you'll need to set the following kind of properties :
@@ -548,6 +554,7 @@
<property name="orion.home.14"/>
<property name="weblogic.home.51"/>
<property name="enhydra.home.31"/>
+ <property name="test.port"/>
</argsList>
<java classname="org.apache.tools.ant.Main"
@@ -579,6 +586,7 @@
<property name="resin.home.20"/>
<property name="tomcat.home.40"/>
<property name="orion.home.14"/>
+ <property name="test.port"/>
</argsList>
<java classname="org.apache.tools.ant.Main"
1.5 +8 -2 jakarta-commons/cactus/build/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 2001/06/18 12:53:33 1.4
+++ build.properties.sample 2001/08/02 15:02:31 1.5
@@ -27,6 +27,11 @@
# out/dist
#dist.dir = e:/tmp/cactus-dist
+# Port that will be used to start the servlet engines for testing. This is
+# optional and if omitted will default to 8080. This is used when you don't
+# want to interfere with a running servlet engine on port 8080.
+#test.port=8180
+
# Servlet engine locations for the tests
# Note: If you don't want to run the test on a given servlet engine, just
@@ -34,10 +39,11 @@
# tests on the Resin 1.2, comment the "resin.home.12" property.
resin.home.12 = f:/applis/resin-1.2.5
-tomcat.home.32 = f:/applis/jakarta-tomcat-3.2.1
+tomcat.home.32 = f:/applis/jakarta-tomcat-3.2.2
+#tomcat.home.33 = f:/applis/jakarta-tomcat-3.3-b1
orion.home.14 = f:/applis/orion-1.4.5
weblogic.home.51 = e:/weblogic
resin.home.20 = f:/applis/resin-2.0.0
resin.home.13 = f:/applis/resin-1.3.s010125
-tomcat.home.40 = f:/applis/jakarta-tomcat-4.0-b1
+tomcat.home.40 = f:/applis/jakarta-tomcat-4.0
#enhydra.home.31 = xxx
1.19 +6 -0 jakarta-commons/cactus/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2001/07/05 14:10:41 1.18
+++ build.xml 2001/08/02 15:02:31 1.19
@@ -32,6 +32,12 @@
files will be copied with version number
postfixed. Required for the dist target only.
Default is <root>/dist
+
+ test.port [OPTIONAL] The port that should be used for
+ starting the servers during unit testing. This
+ should be used not to interfere with other
+ running servers. The default is 8080. This
+ property is used when running the functional tests
Additionally and depending on the servlet engines whith which you wish to
run your tests, you'll need to set the following kind of properties :
1.2 +1 -1
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-enhydra-31.xml
Index: build-tests-enhydra-31.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-enhydra-31.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-enhydra-31.xml 2001/06/18 12:53:35 1.1
+++ build-tests-enhydra-31.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_enhydra_31"
stopTarget="stop_enhydra_31"
testTarget="tests"/>
1.2 +3 -2
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-resin-12.xml
Index: build-tests-resin-12.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-resin-12.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-resin-12.xml 2001/06/17 17:17:29 1.1
+++ build-tests-resin-12.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_resin_12"
stopTarget="stop_resin_12"
testTarget="tests"/>
@@ -99,7 +99,8 @@
<mkdir dir="${out.resin12.dir}"/>
<!-- Copy resin configuration files -->
- <copy file="${conf.resin12.dir}/resin.conf"
tofile="${out.resin12.dir}/resin.conf"/>
+ <copy file="${conf.resin12.dir}/resin.conf"
+ tofile="${out.resin12.dir}/resin.conf" filtering="on"/>
<!-- Create the war file -->
<copy file="${out.test.dir}/test.war" tofile="${out.resin12.dir}/test.war"/>
1.2 +3 -1
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-tomcat-32.xml
Index: build-tests-tomcat-32.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-tomcat-32.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-tomcat-32.xml 2001/06/17 17:17:29 1.1
+++ build-tests-tomcat-32.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_tomcat_32"
stopTarget="stop_tomcat_32"
testTarget="tests"/>
@@ -46,6 +46,8 @@
<java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
<jvmarg value="-Dtomcat.home=${tomcat.home.32}"/>
<arg value="-stop"/>
+ <arg value="-config"/>
+ <arg value="${out.tomcat32.dir}/conf/server.xml"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.home.32}/lib">
1.2 +3 -1
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-tomcat-33.xml
Index: build-tests-tomcat-33.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-tomcat-33.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-tomcat-33.xml 2001/06/30 22:37:06 1.1
+++ build-tests-tomcat-33.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_tomcat_33"
stopTarget="stop_tomcat_33"
testTarget="tests"/>
@@ -47,6 +47,8 @@
<java classname="org.apache.tomcat.startup.Main" fork="yes">
<jvmarg value="-Dtomcat.home=${tomcat.home.33}"/>
<arg value="-stop"/>
+ <arg value="-config"/>
+ <arg value="${out.tomcat33.full.dir}/conf/server.xml"/>
<classpath>
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${tomcat.home.33}/lib">
1.2 +2 -2
jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-weblogic-51.xml
Index: build-tests-weblogic-51.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build-tests-weblogic-51.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-weblogic-51.xml 2001/06/17 17:17:29 1.1
+++ build-tests-weblogic-51.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_weblogic_51"
stopTarget="stop_weblogic_51"
testTarget="tests"/>
@@ -59,7 +59,7 @@
<pathelement location="${weblogic.home.51}/lib/weblogicaux.jar"/>
</classpath>
- <arg value="t3://localhost:8080/test"/>
+ <arg value="t3://localhost:${test.port}/test"/>
<arg value="SHUTDOWN"/>
<arg value="system"/>
<arg value="password"/>
1.10 +5 -0
jakarta-commons/cactus/conf/sample/build/servlet22/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build.properties.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties.sample 2001/06/30 22:38:59 1.9
+++ build.properties.sample 2001/08/02 15:02:31 1.10
@@ -18,6 +18,11 @@
# the task that copies it in the "testwar" target.
log4j.jar = ../lib/log4j-core.jar
+# Port that will be used to start the servlet engines for testing. This is
+# optional and if omitted will default to 8080. This is used when you don't
+# want to interfere with a running servlet engine on port 8080.
+#test.port=8180
+
# Servlet engine locations for the tests
# Note: If you don't want to run the test on a given servlet engine, just
1.4 +5 -0 jakarta-commons/cactus/conf/sample/build/servlet22/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/06/30 22:37:05 1.3
+++ build.xml 2001/08/02 15:02:31 1.4
@@ -32,6 +32,11 @@
cactus.ant.jar [REQUIRED] The path to the Cactus custom Ant
tasks jar file
+ test.port [OPTIONAL] The port that should be used for
+ starting the servers during unit testing. This
+ should be used not to interfere with other
+ running servers. The default is 8080.
+
Additionally and depending on the servlet engines whith which you wish to
run your tests, you'll need to set the following kind of properties :
1.2 +3 -2
jakarta-commons/cactus/conf/sample/build/servlet23/build-tests-resin-13.xml
Index: build-tests-resin-13.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build-tests-resin-13.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-resin-13.xml 2001/06/17 17:17:30 1.1
+++ build-tests-resin-13.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_resin_13"
stopTarget="stop_resin_13"
testTarget="tests"/>
@@ -99,7 +99,8 @@
<mkdir dir="${out.resin13.dir}"/>
<!-- Copy resin configuration files -->
- <copy file="${conf.resin13.dir}/resin.conf"
tofile="${out.resin13.dir}/resin.conf"/>
+ <copy file="${conf.resin13.dir}/resin.conf"
+ tofile="${out.resin13.dir}/resin.conf" filtering="on"/>
<!-- Create the war file -->
<copy file="${out.test.dir}/test.war" tofile="${out.resin13.dir}/test.war"/>
1.4 +1 -1
jakarta-commons/cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build-tests-tomcat-40.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-tomcat-40.xml 2001/06/30 18:56:24 1.3
+++ build-tests-tomcat-40.xml 2001/08/02 15:02:31 1.4
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_tomcat_40"
stopTarget="stop_tomcat_40"
testTarget="tests"/>
1.9 +5 -0
jakarta-commons/cactus/conf/sample/build/servlet23/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build.properties.sample,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties.sample 2001/06/30 22:39:00 1.8
+++ build.properties.sample 2001/08/02 15:02:31 1.9
@@ -18,6 +18,11 @@
# the task that copies it in the "testwar" target.
log4j.jar = ../lib/log4j-core.jar
+# Port that will be used to start the servlet engines for testing. This is
+# optional and if omitted will default to 8080. This is used when you don't
+# want to interfere with a running servlet engine on port 8080.
+#test.port=8180
+
# Servlet engine locations for the tests
# Note: If you don't want to run the test on a given servlet engine, just
1.2 +5 -0 jakarta-commons/cactus/conf/sample/build/servlet23/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/06/17 17:17:30 1.1
+++ build.xml 2001/08/02 15:02:31 1.2
@@ -29,6 +29,11 @@
cactus.ant.jar [REQUIRED] The path to the Cactus custom Ant
tasks jar file
+ test.port [OPTIONAL] The port that should be used for
+ starting the servers during unit testing. This
+ should be used not to interfere with other
+ running servers. The default is 8080.
+
Additionally and depending on the servlet engines whith which you wish to
run your tests, you'll need to set the following kind of properties :
1.4 +10 -1 jakarta-commons/cactus/conf/sample/build/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/share/build-share.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-share.xml 2001/06/18 20:23:18 1.3
+++ build-share.xml 2001/08/02 15:02:31 1.4
@@ -17,6 +17,14 @@
<!--
========================================================================
+ Default values that can be overidden
+ ========================================================================
+ -->
+ <!-- The port that will be used to start the servers -->
+ <property name="test.port" value="8080"/>
+
+ <!--
+ ========================================================================
Set the properties related to the source tree
========================================================================
-->
@@ -122,6 +130,7 @@
<!-- Filters -->
<filter token="version" value="${project.version}"/>
<filter token="year" value="${year}"/>
+ <filter token="test.port" value="${test.port}"/>
<!-- Initialize custom Ant task needed for running the server tests -->
<taskdef name="runservertests"
classname="org.apache.commons.cactus.ant.RunServerTestsTask">
@@ -206,7 +215,7 @@
<!-- As this classes directory will be used to run the client side
of Cactus, we need to copy the cactus.properties -->
<copy todir="${out.classes.dir}"
- file="${conf.test.dir}/cactus.properties"/>
+ file="${conf.test.dir}/cactus.properties" filtering="on"/>
</target>
1.2 +3 -2
jakarta-commons/cactus/conf/sample/build/share/build-tests-orion-14.xml
Index: build-tests-orion-14.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/share/build-tests-orion-14.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-orion-14.xml 2001/06/17 17:17:30 1.1
+++ build-tests-orion-14.xml 2001/08/02 15:02:31 1.2
@@ -9,7 +9,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_orion_14"
stopTarget="stop_orion_14"
testTarget="tests"/>
@@ -94,7 +94,8 @@
<copy file="${conf.orion14.dir}/application.xml"
tofile="${out.orion14.dir}/conf/application.xml"/>
<copy file="${conf.orion14.dir}/default-web-site.xml"
- tofile="${out.orion14.dir}/conf/default-web-site.xml"/>
+ tofile="${out.orion14.dir}/conf/default-web-site.xml"
+ filtering="on"/>
<copy file="${conf.orion14.dir}/principals.xml"
tofile="${out.orion14.dir}/conf/principals.xml"/>
<copy file="${conf.orion14.dir}/rmi.xml"
1.2 +3 -2
jakarta-commons/cactus/conf/sample/build/share/build-tests-resin-20.xml
Index: build-tests-resin-20.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/share/build-tests-resin-20.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-resin-20.xml 2001/06/17 17:17:30 1.1
+++ build-tests-resin-20.xml 2001/08/02 15:02:31 1.2
@@ -10,7 +10,7 @@
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
- <runservertests testURL="http://localhost:8080/test";
+ <runservertests testURL="http://localhost:${test.port}/test";
startTarget="start_resin_20"
stopTarget="stop_resin_20"
testTarget="tests"/>
@@ -100,7 +100,8 @@
<mkdir dir="${out.resin20.dir}"/>
<!-- Copy resin configuration files -->
- <copy file="${conf.resin20.dir}/resin.conf"
tofile="${out.resin20.dir}/resin.conf"/>
+ <copy file="${conf.resin20.dir}/resin.conf"
+ tofile="${out.resin20.dir}/resin.conf" filtering="on"/>
<!-- Create the war file -->
<copy file="${out.test.dir}/test.war" tofile="${out.resin20.dir}/test.war"/>
1.3 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/servlet22/enhydra31/multiserver.conf
Index: multiserver.conf
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet22/enhydra31/multiserver.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multiserver.conf 2001/06/18 20:23:03 1.2
+++ multiserver.conf 2001/08/02 15:02:32 1.3
@@ -370,4 +370,4 @@
Connection.CM_0.NumThreads = 200
Connection.CM_0.Type = http
Connection.CM_0.QueueSize = 400
-Connection.CM_0.Port = 8080
+Connection.CM_0.Port = @test.port@
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/servlet22/resin12/resin.conf
Index: resin.conf
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet22/resin12/resin.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin.conf 2001/06/17 18:12:06 1.1
+++ resin.conf 2001/08/02 15:02:32 1.2
@@ -4,7 +4,7 @@
<app-dir>.</app-dir>
- <http port='8080'/>
+ <http port='@test.port@'/>
<host id=''>
1.2 +6 -2
jakarta-commons/cactus/conf/sample/conf/test/servlet22/tomcat32/server.xml
Index: server.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet22/tomcat32/server.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server.xml 2001/06/17 18:12:07 1.1
+++ server.xml 2001/08/02 15:02:32 1.2
@@ -23,12 +23,16 @@
<ContextInterceptor
className="org.apache.tomcat.context.LoadOnStartupInterceptor" />
<Connector className="org.apache.tomcat.service.PoolTcpConnector">
<Parameter name="handler"
value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
- <Parameter name="port" value="8080"/>
+ <Parameter name="port" value="@test.port@"/>
</Connector>
+
+ <!-- Note: we use a port different from the standard one (8007) not
+ to interfere with an other running tomcat -->
<Connector className="org.apache.tomcat.service.PoolTcpConnector">
<Parameter name="handler"
value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/>
- <Parameter name="port" value="8007"/>
+ <Parameter name="port" value="8777"/>
</Connector>
+
<Context path="" docBase="" debug="0" />
</ContextManager>
1.2 +4 -2
jakarta-commons/cactus/conf/sample/conf/test/servlet22/tomcat33/server.xml
Index: server.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet22/tomcat33/server.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server.xml 2001/06/30 22:37:09 1.1
+++ server.xml 2001/08/02 15:02:32 1.2
@@ -83,16 +83,18 @@
secure - use SSL ( https )
keystore, keypass - certs for SSL
port -->
- <Http10Interceptor port="8080"
+ <Http10Interceptor port="@test.port@"
secure="false"
maxThreads="100"
maxSpareThreads="50"
minSpareThreads="10" />
+ <!-- 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="8007" />
+ port="8777" />
</ContextManager>
</Server>
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/servlet22/weblogic51/weblogic.properties
Index: weblogic.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet22/weblogic51/weblogic.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- weblogic.properties 2001/06/17 18:12:08 1.1
+++ weblogic.properties 2001/08/02 15:02:32 1.2
@@ -1,5 +1,5 @@
-weblogic.system.listenPort=8080
[EMAIL PROTECTED]@
# Define the test webapp
[EMAIL PROTECTED]@/test
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/servlet23/resin13/resin.conf
Index: resin.conf
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet23/resin13/resin.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin.conf 2001/06/17 18:12:09 1.1
+++ resin.conf 2001/08/02 15:02:32 1.2
@@ -4,7 +4,7 @@
<app-dir>.</app-dir>
- <http port='8080'/>
+ <http port='@test.port@'/>
<host id=''>
<war-dir id='.'/>
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/servlet23/tomcat40/server.xml
Index: server.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/servlet23/tomcat40/server.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server.xml 2001/06/17 18:12:10 1.1
+++ server.xml 2001/08/02 15:02:32 1.2
@@ -3,7 +3,7 @@
<Service name="Tomcat-Standalone">
<Connector className="org.apache.catalina.connector.http.HttpConnector"
- port="8080" minProcessors="5" maxProcessors="75"
+ port="@test.port@" minProcessors="5" maxProcessors="75"
acceptCount="10" debug="0"/>
<Engine name="Standalone" defaultHost="localhost" debug="0">
1.2 +2 -2
jakarta-commons/cactus/conf/sample/conf/test/share/cactus.properties
Index: cactus.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/share/cactus.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cactus.properties 2001/06/17 18:12:10 1.1
+++ cactus.properties 2001/08/02 15:02:32 1.2
@@ -9,6 +9,6 @@
# that you use for your application. In the example below, the context is
# "test".
-cactus.servletRedirectorURL = http://localhost:8080/test/ServletRedirector
-cactus.jspRedirectorURL = http://localhost:8080/test/JspRedirector
+cactus.servletRedirectorURL = http://localhost:@test.port@/test/ServletRedirector
+cactus.jspRedirectorURL = http://localhost:@test.port@/test/JspRedirector
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/share/orion14/default-web-site.xml
Index: default-web-site.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/share/orion14/default-web-site.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-web-site.xml 2001/06/17 18:12:11 1.1
+++ default-web-site.xml 2001/08/02 15:02:32 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE web-site PUBLIC "Orion Web-site"
"http://www.orionserver.com/dtds/web-site.dtd";>
-<web-site host="[ALL]" port="8080" display-name="Default Orion WebSite">
+<web-site host="[ALL]" port="@test.port@" display-name="Default Orion WebSite">
<!-- The default web-app for this site, bound to the root -->
<default-web-app application="default" name="test"/>
1.2 +1 -1
jakarta-commons/cactus/conf/sample/conf/test/share/resin20/resin.conf
Index: resin.conf
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/conf/test/share/resin20/resin.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin.conf 2001/06/17 18:12:12 1.1
+++ resin.conf 2001/08/02 15:02:32 1.2
@@ -4,7 +4,7 @@
<app-dir>.</app-dir>
- <http port='8080'/>
+ <http port='@test.port@'/>
<host id=''>
<war-dir id='.'/>
1.33 +5 -0 jakarta-commons/cactus/docs/framework/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/docs/framework/xdocs/changes.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- changes.xml 2001/08/02 08:35:11 1.32
+++ changes.xml 2001/08/02 15:02:32 1.33
@@ -109,6 +109,11 @@
<release version="1.2 in CVS">
<action dev="VMA" type="add">
+ The port used to start the servlet engines when running the sample
+ tests (using the provided Ant scripts) is now configurable. This allows
+ for not interfering with other servers running on the same port.
+ </action>
+ <action dev="VMA" type="add">
New tutorial for integration within JBuilder. Thanks to
<link href="mailto:[EMAIL PROTECTED]";>Cedric Chabanois</link>
and <link href="mailto:[EMAIL PROTECTED]";>Kunal
