larryi 01/10/01 19:55:13
Modified: src/share/org/apache/tomcat/modules/config IISConfig.java
BaseJkConfig.java ApacheConfig.java
Log:
Change jkProtocol setting to jkWorker. This more accurately shows
what this setting is for.
Revision Changes Path
1.9 +8 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/IISConfig.java
Index: IISConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/IISConfig.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IISConfig.java 2001/09/23 15:29:51 1.8
+++ IISConfig.java 2001/10/02 02:55:13 1.9
@@ -99,9 +99,12 @@
<li><b>jkLog</b> - path to log file to be used by isapi_redirect.</li>
<li><b>jkDebug</b> - Loglevel setting. May be debug, info, error, or emerg.
If not set, defaults to emerg.</li>
- <li><b>jkProtocol</b> The desired protocal, "ajp12" or "ajp13". If not
- specified, defaults to "ajp13" if an Ajp13Interceptor
- is in use, otherwise it defaults to "ajp12".</li>
+ <li><b>jkWorker</b> The desired worker. Must be set to one of the workers
+ defined in the workers.properties file. "ajp12", "ajp13"
+ or "inprocess" are the workers found in the default
+ workers.properties file. If not specified, defaults
+ to "ajp13" if an Ajp13Interceptor is in use, otherwise
+ it defaults to "ajp12".</li>
<li><b>forwardAll</b> - If true, forward all requests to Tomcat. This helps
insure that all the behavior configured in the web.xml
file functions correctly. If false, let IIS serve
@@ -128,7 +131,7 @@
@author Costin Manolache
@author Larry Isaacs
@author Gal Shachor
- @version $Revision: 1.8 $
+ @version $Revision: 1.9 $
*/
public class IISConfig extends BaseJkConfig {
@@ -260,7 +263,7 @@
uri_worker.println("#");
uri_worker.println("# Default worker to be used through our mappings");
uri_worker.println("#");
- uri_worker.println("default.worker=" + jkProto);
+ uri_worker.println("default.worker=" + jkWorker);
uri_worker.println();
}
1.5 +15 -12
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/BaseJkConfig.java
Index: BaseJkConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/BaseJkConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseJkConfig.java 2001/08/23 15:01:57 1.4
+++ BaseJkConfig.java 2001/10/02 02:55:13 1.5
@@ -1,4 +1,4 @@
-/* $Id: BaseJkConfig.java,v 1.4 2001/08/23 15:01:57 costin Exp $
+/* $Id: BaseJkConfig.java,v 1.5 2001/10/02 02:55:13 larryi Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -91,9 +91,12 @@
<li><b>jkLog</b> - path to log file to be used by jk connector.</li>
<li><b>jkDebug</b> - Loglevel setting. May be debug, info, error, or emerg.
If not set, defaults to emerg.</li>
- <li><b>jkProtocol</b> The desired protocal, "ajp12" or "ajp13". If not
- specified, defaults to "ajp13" if an Ajp13Interceptor
- is in use, otherwise it defaults to "ajp12".</li>
+ <li><b>jkWorker</b> The desired worker. Must be set to one of the workers
+ defined in the workers.properties file. "ajp12", "ajp13"
+ or "inprocess" are the workers found in the default
+ workers.properties file. If not specified, defaults
+ to "ajp13" if an Ajp13Interceptor is in use, otherwise
+ it defaults to "ajp12".</li>
<li><b>forwardAll</b> - If true, forward all requests to Tomcat. This helps
insure that all the behavior configured in the web.xml
file functions correctly. If false, let Apache serve
@@ -118,7 +121,7 @@
<p>
@author Costin Manolache
@author Larry Isaacs
- @version $Revision: 1.4 $
+ @version $Revision: 1.5 $
*/
public class BaseJkConfig extends BaseInterceptor {
protected File configHome = null;
@@ -126,7 +129,7 @@
protected File jkLog = null;
protected String jkDebug="emerg";
- protected String jkProto = null;
+ protected String jkWorker = null;
protected boolean noRoot=true;
protected boolean forwardAll=true;
@@ -266,8 +269,8 @@
set the Ajp protocal
@param <b>protocal</b> String protocol, "ajp12" or "ajp13"
*/
- public void setJkProtocol(String protocol){
- jkProto = protocol;
+ public void setJkWorker(String worker){
+ jkWorker = worker;
}
// -------------------- Initialize/guess defaults --------------------
@@ -289,14 +292,14 @@
for( int i=0; i<ci.length; i++ ) {
Object con=ci[i];
- // if jkProto not specified and Ajp13 Interceptor found, use Ajp13
- if( jkProto == null && (con instanceof Ajp13Interceptor) ) {
- jkProto = "ajp13";
+ // if jkWorker not specified and Ajp13 Interceptor found, use Ajp13
+ if( jkWorker == null && (con instanceof Ajp13Interceptor) ) {
+ jkWorker = "ajp13";
}
}
// default to ajp12
- if( jkProto==null ) jkProto="ajp12";
+ if( jkWorker==null ) jkWorker="ajp12";
}
// -------------------- Config Utils --------------------
1.27 +14 -11
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ApacheConfig.java 2001/08/17 03:53:24 1.26
+++ ApacheConfig.java 2001/10/02 02:55:13 1.27
@@ -1,4 +1,4 @@
-/* $Id: ApacheConfig.java,v 1.26 2001/08/17 03:53:24 larryi Exp $
+/* $Id: ApacheConfig.java,v 1.27 2001/10/02 02:55:13 larryi Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -118,9 +118,12 @@
<li><b>jkLog</b> - path to log file to be used by mod_jk.</li>
<li><b>jkDebug</b> - JK Loglevel setting. May be debug, info, error, or emerg.
If not set, defaults to emerg.</li>
- <li><b>jkProtocol</b> The desired protocal, "ajp12" or "ajp13" or "inprocess".
If not
- specified, defaults to "ajp13" if an Ajp13Interceptor
- is in use, otherwise it defaults to "ajp12".</li>
+ <li><b>jkWorker</b> The desired worker. Must be set to one of the workers
+ defined in the workers.properties file. "ajp12", "ajp13"
+ or "inprocess" are the workers found in the default
+ workers.properties file. If not specified, defaults
+ to "ajp13" if an Ajp13Interceptor is in use, otherwise
+ it defaults to "ajp12".</li>
<li><b>forwardAll</b> - If true, forward all requests to Tomcat. This helps
insure that all the behavior configured in the web.xml
file functions correctly. If false, let Apache serve
@@ -146,7 +149,7 @@
@author Costin Manolache
@author Larry Isaacs
@author Mel Martinez
- @version $Revision: 1.26 $ $Date: 2001/08/17 03:53:24 $
+ @version $Revision: 1.27 $ $Date: 2001/10/02 02:55:13 $
*/
public class ApacheConfig extends BaseJkConfig {
@@ -460,9 +463,9 @@
}
mod_jk.println();
- mod_jk.println(indent + "JkMount " + nPath + " " + jkProto );
+ mod_jk.println(indent + "JkMount " + nPath + " " + jkWorker );
if( "".equals(ctxPath) ) {
- mod_jk.println(indent + "JkMount " + nPath + "* " + jkProto );
+ mod_jk.println(indent + "JkMount " + nPath + "* " + jkWorker );
if ( vhost != null ) {
mod_jk.println(indent + "DocumentRoot \"" +
getApacheDocBase(context) + "\"");
@@ -474,7 +477,7 @@
}
} else
- mod_jk.println(indent + "JkMount " + nPath + "/* " + jkProto );
+ mod_jk.println(indent + "JkMount " + nPath + "/* " + jkWorker );
}
@@ -526,7 +529,7 @@
// map ( the real path that is used by form auth ), so no need
// for this one
//mod_jk.println("JkMount " + path + "/*j_security_check " +
- // jkProto);
+ // jkWorker);
//mod_jk.println();
// XXX ErrorDocument
@@ -542,7 +545,7 @@
if( debug > 0 )
log( "Adding extension map for " + ctxPath + "/*." + ext );
mod_jk.println(indent + "JkMount " + ctxPath + "/*." + ext
- + " " + jkProto);
+ + " " + jkWorker);
return true;
}
@@ -552,7 +555,7 @@
protected boolean addMapping( String fullPath, PrintWriter mod_jk ) {
if( debug > 0 )
log( "Adding map for " + fullPath );
- mod_jk.println(indent + "JkMount " + fullPath + " " + jkProto );
+ mod_jk.println(indent + "JkMount " + fullPath + " " + jkWorker );
return true;
}
