rleland 2003/07/31 21:58:08 Modified: conf/test/tomcat32 server.xml conf/test/tomcat33 server.xml conf/test/tomcat40 server.xml conf/test/tomcat41 server.xml Log: cactus.contextURL is now set by build.properties at top level. So servlet.xml containts correct port. Revision Changes Path 1.3 +1 -1 jakarta-struts/conf/test/tomcat32/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-struts/conf/test/tomcat32/server.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- server.xml 7 Feb 2003 22:35:30 -0000 1.2 +++ server.xml 1 Aug 2003 04:58:08 -0000 1.3 @@ -19,7 +19,7 @@ <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="9090"/> + <Parameter name="port" value="@tomcat.connector.port@"/> </Connector> <Connector className="org.apache.tomcat.service.PoolTcpConnector"> <Parameter name="handler" value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/> 1.3 +1 -1 jakarta-struts/conf/test/tomcat33/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-struts/conf/test/tomcat33/server.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- server.xml 7 Feb 2003 22:35:30 -0000 1.2 +++ server.xml 1 Aug 2003 04:58:08 -0000 1.3 @@ -121,7 +121,7 @@ by default report Tomcat Web Server ... set an empty string to avoid sending server header --> - <Http10Connector port="9090" + <Http10Connector port="@tomcat.connector.port@" secure="false" maxThreads="100" maxSpareThreads="50" 1.4 +1 -1 jakarta-struts/conf/test/tomcat40/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-struts/conf/test/tomcat40/server.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- server.xml 7 Feb 2003 01:20:14 -0000 1.3 +++ server.xml 1 Aug 2003 04:58:08 -0000 1.4 @@ -3,7 +3,7 @@ <Service name="Tomcat-Standalone"> <Connector className="org.apache.catalina.connector.http.HttpConnector" - port="9090" minProcessors="5" maxProcessors="75" + port="@tomcat.connector.port@" minProcessors="5" maxProcessors="75" acceptCount="10" debug="0"/> <Engine name="Standalone" defaultHost="localhost" debug="0"> 1.3 +1 -1 jakarta-struts/conf/test/tomcat41/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-struts/conf/test/tomcat41/server.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- server.xml 7 Feb 2003 01:20:14 -0000 1.2 +++ server.xml 1 Aug 2003 04:58:08 -0000 1.3 @@ -29,7 +29,7 @@ <Service name="Tomcat-Standalone"> <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" - port="9090" minProcessors="5" maxProcessors="75" + port="@tomcat.connector.port@" minProcessors="5" maxProcessors="75" enableLookups="true" redirectPort="8443" acceptCount="10" debug="0" connectionTimeout="20000" useURIValidationHack="false"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]