craigmcc 01/05/07 21:12:41
Modified: catalina build.xml
catalina/src/conf server.xml
catalina/src/share/org/apache/catalina/connector/warp
WarpConnector.java
Log:
Re-enable compiling and starting the Java side of the warp connector.
Revision Changes Path
1.38 +1 -4 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 2001/04/27 00:33:59 1.37
+++ build.xml 2001/05/08 04:12:37 1.38
@@ -106,7 +106,6 @@
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"
@@ -233,11 +232,9 @@
<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>
@@ -280,7 +277,7 @@
<jar jarfile="${catalina.dist}/server/lib/catalina.jar"
basedir="${catalina.build}/classes"
excludes="**/org/apache/naming/**,**/connector/warp/**" />
- <jar jarfile="${catalina.dist}/server/lib/catalina.jar"
+ <jar jarfile="${catalina.dist}/server/lib/warp.jar"
basedir="${catalina.build}/classes"
includes="**/connector/warp/**" />
1.23 +1 -14 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- server.xml 2001/05/08 03:37:01 1.22
+++ server.xml 2001/05/08 04:12:38 1.23
@@ -297,40 +297,27 @@
<!-- Define an Apache-Connector Service -->
-<!--
<Service name="Tomcat-Apache">
--->
-<!--
<Connector className="org.apache.catalina.connector.warp.WarpConnector"
port="8008" minProcessors="5" maxProcessors="75"
+ disableLookups="false"
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>
1.9 +17 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java
Index: WarpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WarpConnector.java 2001/01/24 23:10:43 1.8
+++ WarpConnector.java 2001/05/08 04:12:40 1.9
@@ -78,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pier Fumagalli</a>
* @author Copyright © 1999, 2000 <a href="http://www.apache.org";>The
* Apache Software Foundation.
- * @version CVS $Id: WarpConnector.java,v 1.8 2001/01/24 23:10:43 pier Exp $
+ * @version CVS $Id: WarpConnector.java,v 1.9 2001/05/08 04:12:40 craigmcc Exp $
*/
public class WarpConnector implements Connector, Lifecycle, Runnable {
@@ -99,6 +99,8 @@
private boolean started=false;
/** The accept count for the server socket. */
private int count = 10;
+ /** Should we disable DNS lookups? */
+ private boolean disableLookups = false;
// -------------------------------------------------------- BEAN PROPERTIES
@@ -308,6 +310,20 @@
else this.debug("Setting container "+container.getInfo());
}
this.container=container;
+ }
+
+ /**
+ * Return the "disable DNS lookups" flag for this Connector.
+ */
+ public boolean getDisableLookups() {
+ return (this.disableLookups);
+ }
+
+ /**
+ * Set the "disable DNS lookups" flag for this Connector.
+ */
+ public void setDisableLookups(boolean disableLookups) {
+ this.disableLookups = disableLookups;
}
/**
