cvs commit: jakarta-tomcat-connectors/jk/conf jk2.properties workers2.properties

[co...@apache.org]

costin      02/04/15 17:14:12

  Modified:    jk/conf  jk2.properties workers2.properties
  Log:
  Add the JNI channel to the default config ( need to check on other
  platforms and make sure it's a no-op if we're not in jni mode ).
  
  The current configuration seem to work with both 3.3 and 4.0 in JNI mode
  ( at least on Linux, IBM-JDK-1.3.1, Apache2.0 - with LD_LIBRARY set corectly )
  
  This is not a supported feature for jk2.0 - just making sure the code is in a decent
  shape.
  
  Revision  Changes    Path
  1.4       +3 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk2.properties	12 Apr 2002 00:26:29 -0000	1.3
  +++ jk2.properties	16 Apr 2002 00:14:12 -0000	1.4
  @@ -15,7 +15,7 @@
   
   # Handlers that will be loaded by jk2:
   # Default:
  -handler.list=channel,unixChannel,channel8019,request,container
  +handler.list=channel,unixChannel,channel8019,channelJni,request,container
   
   # Transport handler. 
   # Default:
  @@ -34,7 +34,8 @@
   handler.unixChannel.file=${jkHome}/work/jk2.socket
   handler.unixChannel.next=request
   
  -#handler.channel.className=org.apache.jk.common.ChannelJni
  +handler.channelJni.className=org.apache.jk.common.ChannelJni
  +handler.channelJni.next=request
   
   # Optional - right now request handles all messages
   # handler.dispatch.className=org.apache.jk.common.HandlerDispatch
  
  
  
  1.5       +7 -9      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- workers2.properties	13 Apr 2002 05:55:18 -0000	1.4
  +++ workers2.properties	16 Apr 2002 00:14:12 -0000	1.5
  @@ -4,8 +4,8 @@
   
   # Global options ( in addition to the pre-defined fs, ps, java_home
   [config]
  -#TOMCAT_HOME=/opt/tomcat
  -TOMCAT_HOME=/opt/40
  +TOMCAT_HOME=/opt/tomcat
  +#TOMCAT_HOME=/opt/40
   JAVA_HOME=/usr/java/ibm1.3
   
   
  @@ -71,24 +71,22 @@
   # JAVA_HOME and TOMCAT_HOME can be set as environment variables
   [vm]
   # Optional: JVM= PATH_TO_libjvm.so ( standard locations are searched )
  -#OPT=-Djava.class.path=${TOMCAT_HOME}/lib/tomcat.jar
  -OPT=-Djava.class.path=${TOMCAT_HOME}/bin/bootstrap.jar
  +OPT=-Djava.class.path=${TOMCAT_HOME}/lib/tomcat.jar${ps}${TOMCAT_HOME}/lib/container/tomcat-jni.jar
  +# OPT=-Djava.class.path=${TOMCAT_HOME}/bin/bootstrap.jar
   #OPT=-Djava.class.path=${TOMCAT_HOME}/lib/container/tomcat-jk2.jar${ps}${TOMCAT_HOME}/lib/common/tomcat-util.jar
  -#OPT=-Djava.class.path=${TOMCAT_HOME}/server/lib/tomcat-jk2.jar${ps}${TOMCAT_HOME}/server/lib/tomcat-util.jar
   OPT=-Xmx128M
   OPT=-Dtomcat.home=${TOMCAT_HOME}
   OPT=-Dcatalina.home=${TOMCAT_HOME}
   OPT=-Djava.compiler=NONE
   
   
  -# Call org.apache.jk.server.JniMain with the 3 params.
  -# XXX make it more generic
   [worker.jni:jniCmd1]
   # For 3.3
  -#class=org/apache/tomcat/startup/Main
  +class=org/apache/tomcat/startup/Main
  +#ARG=start
   
   # For 4.0
  -class=org/apache/catalina/startup/Bootstrap
  +# class=org/apache/catalina/startup/Bootstrap
   ARG=start
   
   # For JkMain ( testing )
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>