craigmcc 01/04/26 17:34:00
Modified: catalina build.xml
catalina/src/conf server.xml
Log:
Remove the warp connector from the build (and from the default
server.xml configuration) until I have time to figure out why
it breaks a build from scratch.
Revision Changes Path
1.37 +3 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.xml 2001/04/07 22:11:45 1.36
+++ build.xml 2001/04/27 00:33:59 1.37
@@ -106,6 +106,7 @@
classpath="${parser.jar}:${jaxp.jar}:${regexp.jar}:${servlet.jar}:${jcert.jar}:${jnet.jar}:${jsse.jar}:${jmxri.jar}"
deprecation="off" debug="on" optimize="off" target="1.2"
excludes="**/CVS/**">
+ <exclude name="**/warp/*.java"/>
<exclude name="**/factory/Tyrex*.java"
unless="tyrex.present" />
<exclude name="**/factory/ResourceFactory.java"
@@ -232,9 +233,11 @@
<jar jarfile="${catalina.deploy}/server/lib/catalina.jar"
basedir="${catalina.build}/classes"
excludes="**/org/apache/naming/**,**/connector/warp/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class"
/>
+<!--
<jar jarfile="${catalina.deploy}/server/lib/warp.jar"
basedir="${catalina.build}/classes"
includes="**/connector/warp/**" />
+-->
</target>
1.21 +14 -1 jakarta-tomcat-4.0/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- server.xml 2001/04/12 01:06:11 1.20
+++ server.xml 2001/04/27 00:34:00 1.21
@@ -294,27 +294,40 @@
<!-- Define an Apache-Connector Service -->
+<!--
<Service name="Tomcat-Apache">
+-->
+<!--
<Connector className="org.apache.catalina.connector.warp.WarpConnector"
port="8008" minProcessors="5" maxProcessors="75"
acceptCount="10" debug="0"/>
+-->
<!-- Replace "localhost" with what your Apache "ServerName" is set to -->
+<!--
<Engine className="org.apache.catalina.connector.warp.WarpEngine"
name="Apache" defaultHost="localhost" debug="0" appBase="webapps">
+-->
<!-- Global logger unless overridden at lower levels -->
+<!--
<Logger className="org.apache.catalina.logger.FileLogger"
prefix="apache_log." suffix=".txt"
timestamp="true"/>
+-->
<!-- Because this Realm is here, an instance will be shared globally -->
+<!--
<Realm className="org.apache.catalina.realm.MemoryRealm" />
+-->
+<!--
</Engine>
+-->
+<!--
</Service>
-
+-->
</Server>
