remm 2004/07/31 10:13:53
Modified: . build.xml
catalina/src/share/org/apache/catalina/startup
TldConfig.java
catalina/src/conf server.xml
catalina build.xml
Log:
- Rename tomcat-jk2.jar to tomcat-ajp.jar.
- Remove some of the other JK related JARs, including JNI, and config, as the
connectors won't support it.
Revision Changes Path
1.193 +6 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- build.xml 29 Jul 2004 19:16:08 -0000 1.192
+++ build.xml 31 Jul 2004 17:13:53 -0000 1.193
@@ -99,7 +99,7 @@
</uptodate>
<uptodate property="tomcatjk.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-jk2.jar">
+ targetfile="${tomcat.build}/server/lib/tomcat-ajp.jar">
<srcfiles dir="${jtc.home}/jk/java" includes="**" />
</uptodate>
@@ -187,15 +187,17 @@
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
<property name="jmx.jar" value="${jmx.jar}"/>
<property name="jmx.detect" value="true"/>
- <property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
<property name="jk.build" value="${tomcat.build}"/>
+ <property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ <property name="tomcat-jk2.jar"
value="${tomcat.build}/server/lib/tomcat-ajp.jar" />
+ <!--
<property name="tomcat-jk.jar"
value="${tomcat.build}/server/lib/tomcat-jk.jar" />
<property name="tomcat-jkconfig.jar"
value="${tomcat.build}/server/lib/jkconfig.jar" />
<property name="tomcat-jkshm.jar"
value="${tomcat.build}/server/lib/jkshm.jar" />
- <property name="tomcat-jk2.jar"
value="${tomcat.build}/server/lib/tomcat-jk2.jar" />
<property name="tomcat-jni.jar"
value="${tomcat.build}/server/lib/tomcat-jni.jar" />
+ -->
</ant>
@@ -653,7 +655,7 @@
<fileset dir="build/server/lib">
<include name="tomcat-coyote.jar"/>
<include name="tomcat-http11.jar"/>
- <include name="tomcat-jk2.jar"/>
+ <include name="tomcat-ajp.jar"/>
</fileset>
</copy>
1.41 +1 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- TldConfig.java 26 Jun 2004 17:41:31 -0000 1.40
+++ TldConfig.java 31 Jul 2004 17:13:53 -0000 1.41
@@ -99,8 +99,6 @@
noTldJars.add("jmx.jar");
noTldJars.add("jmx-tools.jar");
noTldJars.add("jsp-api.jar");
- noTldJars.add("jkshm.jar");
- noTldJars.add("jkconfig.jar");
noTldJars.add("naming-common.jar");
noTldJars.add("naming-resources.jar");
noTldJars.add("naming-factory.jar");
@@ -112,9 +110,7 @@
noTldJars.add("servlets-webdav.jar");
noTldJars.add("tomcat-util.jar");
noTldJars.add("tomcat-http11.jar");
- noTldJars.add("tomcat-jni.jar");
- noTldJars.add("tomcat-jk.jar");
- noTldJars.add("tomcat-jk2.jar");
+ noTldJars.add("tomcat-ajp.jar");
noTldJars.add("tomcat-coyote.jar");
noTldJars.add("xercesImpl.jar");
noTldJars.add("xmlParserAPIs.jar");
1.36 +4 -4 jakarta-tomcat-catalina/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- server.xml 26 Jul 2004 16:04:02 -0000 1.35
+++ server.xml 31 Jul 2004 17:13:53 -0000 1.36
@@ -79,7 +79,7 @@
IP address of the remote client.
-->
- <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
+ <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
<Connector port="8080"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" redirectPort="8443" acceptCount="100"
@@ -96,7 +96,7 @@
compressableMimeType="text/html,text/xml"
-->
- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
<!--
<Connector port="8443"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
@@ -105,7 +105,7 @@
clientAuth="false" sslProtocol="TLS" />
-->
- <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009"
enableLookups="false" redirectPort="8443" debug="0"
protocol="AJP/1.3" />
@@ -125,7 +125,7 @@
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host). -->
- <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
-->
1.63 +2 -4 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 27 Jun 2004 23:56:22 -0000 1.62
+++ build.xml 31 Jul 2004 17:13:53 -0000 1.63
@@ -672,10 +672,8 @@
<property name="jmx.jar" value="${jmx.jar}"/>
</ant>
- <copy todir="${catalina.deploy}/server/lib"
- file="${tomcat-jk2.jar}"/>
- <copy todir="${catalina.deploy}/bin"
- file="${tomcat-jni.jar}"/>
+ <copy tofile="${catalina.deploy}/server/lib/tomcat-ajp.jar"
+ file="${tomcat-jk2.jar}"/>
<copy todir="${catalina.deploy}/conf"
file="${jk2.properties}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
