costin 02/05/06 15:48:56
Modified: jk/conf jk2.manifest jk2.properties jkconfig.manifest
shm.manifest workers2.properties
Added: jk/conf jkconf.ant.xml
Log:
Update the manifest's classpaths.
Added a sample/test ant file that generates the jk2 config.
Revision Changes Path
1.5 +1 -1 jakarta-tomcat-connectors/jk/conf/jk2.manifest
Index: jk2.manifest
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jk2.manifest,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk2.manifest 18 Apr 2002 19:16:45 -0000 1.4
+++ jk2.manifest 6 May 2002 22:48:56 -0000 1.5
@@ -1,2 +1,2 @@
Main-Class: org.apache.jk.apr.TomcatStarter
-Class-Path: ../lib/tomcat.jar bootstrap.jar
+Class-Path: ../lib/tomcat.jar bootstrap.jar log4j.jar log4j-core.jar
../lib/common/log4j.jar ../lib/common/log4j-core.jar ../lib/common/classes
1.7 +2 -2 jakarta-tomcat-connectors/jk/conf/jk2.properties
Index: jk2.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jk2.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk2.properties 18 Apr 2002 19:19:02 -0000 1.6
+++ jk2.properties 6 May 2002 22:48:56 -0000 1.7
@@ -6,9 +6,9 @@
## DOCUMENTATION OF THE FORMAT IN JkMain javadoc.
# Override the default port for the socketChannel
-# channelSocket.port=8019
+channelSocket.port=8019
# Default:
# channelUnix.file=${jkHome}/work/jk2.socket
# Just to check if the the config is working
-shm.file=/tmp/jk2.shm
+shm.file=${jkHome}/work/jk2.shm
1.2 +1 -1 jakarta-tomcat-connectors/jk/conf/jkconfig.manifest
Index: jkconfig.manifest
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/jkconfig.manifest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jkconfig.manifest 1 May 2002 19:53:57 -0000 1.1
+++ jkconfig.manifest 6 May 2002 22:48:56 -0000 1.2
@@ -1,2 +1,2 @@
Main-Class: org.apache.jk.config.WebXml2Jk
-Class-Path: tomcat-jk2.jar commons-logging.jar crimson.jar xercesImpl.jar
xmlApis.jar tomcat-util.jar
+Class-Path: tomcat-jk2.jar commons-logging.jar crimson.jar xercesImpl.jar
xmlApis.jar tomcat-util.jar log4j.jar log4j-core.jar
1.2 +1 -1 jakarta-tomcat-connectors/jk/conf/shm.manifest
Index: shm.manifest
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/shm.manifest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shm.manifest 1 May 2002 22:39:09 -0000 1.1
+++ shm.manifest 6 May 2002 22:48:56 -0000 1.2
@@ -1,2 +1,2 @@
Main-Class: org.apache.jk.common.Shm
-Class-Path: tomcat-jk2.jar commons-logging.jar tomcat-util.jar
+Class-Path: tomcat-jk2.jar commons-logging.jar tomcat-util.jar log4j.jar
log4j-core.jar
1.11 +17 -14 jakarta-tomcat-connectors/jk/conf/workers2.properties
Index: workers2.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workers2.properties 2 May 2002 19:46:17 -0000 1.10
+++ workers2.properties 6 May 2002 22:48:56 -0000 1.11
@@ -6,6 +6,7 @@
[config]
## TOMCAT_HOME, CATALINA_HOME, JAVA_HOME and LD_LIBRARY_PATH
# must be set for the jni worker to operate.
+debugEnv=0
# Logger options. For apache2 only level can be set ( it logs to apache's error.log
)
@@ -20,6 +21,11 @@
file=${serverRoot}/logs/jk2.shm
size=1000000
+[uriMap]
+debug=0
+
+[workerEnv]
+debug=0
#################### Channels ####################
# Each channel defines a communication mechanism to a tomcat instance.
@@ -27,25 +33,25 @@
# Default channel
-[channel.socket:localhost:8009]
-lbfactor=1
-tomcatId=localhost:8009
+#[channel.socket:localhost:8009]
+#lb_factor=1
+#tomcatId=localhost:8009
# Example additional socket channel. The location is in the name ( URL-style
[channel.socket:localhost:8019]
tomcatId=localhost:8019
-lbfactor=1
+lb_factor=1
group=lb_1
-group=lb_2
+group=lb
+
# Example unix socket.
# XXX We must use an explicit setting to use substitution - resolve this
-[channel.apr:unixSocket]
-file=${TOMCAT_HOME}/work/jk2.socket
+[channel.apr:${TOMCAT_HOME}/work/jk2.socket]
tomcatId=localhost:8009
-lbfactor=0
+lb_factor=0
#
@@ -66,7 +72,7 @@
# to work reliably and on all platforms. Same for other java libs.
# "java" script is a good example, Sun needs it to start java and we need it to.
# JAVA_HOME and TOMCAT_HOME can be set as environment variables
-[disabled:vm]
+[vm]
# That will work with both 3.x and 4.x.
OPT=-Djava.class.path=${TOMCAT_HOME}/bin/tomcat-jni.jar
OPT=-Dtomcat.home=${TOMCAT_HOME}
@@ -110,8 +116,8 @@
# Status worker. XXX protect it with <Location> and security settings,
# it'll display all properties - including eventual secrets.
#
-[uri:/jkstatus]
-context=/jkstatus
+[uri:/jkstatus/*]
+group=worker.status:
### Per/uri mappings
@@ -129,9 +135,6 @@
# Extension match
[uri:/examples/*.jsp]
-
-[uri:/jkstatus/*]
-worker=worker.status:
## No other forms of mappings are currently supported
# Because the spec doesn't support them.
1.1 jakarta-tomcat-connectors/jk/conf/jkconf.ant.xml
Index: jkconf.ant.xml
===================================================================
<project name="jkconf" default="main" basedir=".">
<target name="init-3x" if="33.detect">
<taskdef name="jkconf"
classname="org.apache.jk.config.WebXml2Jk" >
<classpath>
<!-- 3.3 support -->
<pathelement location="/ws/jtc/jk/build/classes" />
<pathelement location="${tomcat.home}/lib/container/tomcat-jk2.jar"
/>
<pathelement location="${tomcat.home}/lib/container/crimson.jar"/>
<pathelement
location="${tomcat.home}/lib/common/commons-logging.jar"/>
</classpath>
</taskdef>
</target>
<target name="init-4x" if="4x.detect" >
<path id="main.classpath">
<!-- 3.3 support -->
<fileset dir="${tomcat.home}/lib" includes="*.jar" />
<fileset dir="${tomcat.home}/server/lib" includes="*.jar" />
<fileset dir="${tomcat.home}/common/lib" includes="*.jar" />
</path>
<taskdef name="jkconf" classpathref="main.classpath"
classname="org.apache.jk.config.WebXml2Jk" />
</target>
<target name="detect" >
<property file="build.properties"/>
<property file="${user.home}/build.properties"/>
<property file="${user.home}/.build.properties"/>
<!-- default locations, overrident by properties.
This file must be installed in conf/ -->
<property name="tomcat.home" location=".." />
<available property="33.detect" file="${tomcat.home}/lib/container" />
<available property="4x.detect" file="${tomcat.home}/server/lib" />
</target>
<target name="init" depends="detect,init-3x,init-4x" />
<!-- ==================== Detection and reports ==================== -->
<target name="main" depends="init">
<jkconf docBase="${tomcat.home}/webapps/examples"
context="/examples" />
</target>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
