costin 01/07/20 11:46:04
Modified: src/share/org/apache/tomcat/modules/config ApacheConfig.java
Log:
Remove the SetHandler option.
This is new code, and will probably be available with all the new
features and ajp14 as part of j-t-c.
There is no need to put it into the official 3.3 beta/release - people
who need this feature will be better served by a standalone module, as
this is likely to evolve in the future ( as oposed to the 3.3 "main" codebase,
which is supposed to remain freezed - so we can focus on features and modules
knowing the base is stable and it's not going to change )
The current autoconfiguration mechanism in 3.3 ( using JkMount ) should work
as well ( or better ) than before, with either the old mod_jk or the new
one.
Revision Changes Path
1.19 +10 -36
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ApacheConfig.java 2001/07/20 12:45:20 1.18
+++ ApacheConfig.java 2001/07/20 18:46:04 1.19
@@ -1,4 +1,4 @@
-/* $Id: ApacheConfig.java,v 1.18 2001/07/20 12:45:20 larryi Exp $
+/* $Id: ApacheConfig.java,v 1.19 2001/07/20 18:46:04 costin Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -127,9 +127,6 @@
the web.xml may not be duplicated in Apache.
Review the mod_jk.conf file to see what
configuration is actually being set in Apache.</li>
- <li><b>useJkMount</b> - If true, use JkMount mount directives. If false,
- <Location> and SetHandler directives are used.
- the default is true.</li>
<li><b>jkDebug</b> - JK Loglevel setting. May be debug, info, error, or emerg.
If not set, defaults to no log.</li>
<li><b>noRoot</b> - If true, the root context is not mapped to
@@ -140,7 +137,7 @@
<p>
@author Costin Manolache
@author Mel Martinez
- @version $Revision: 1.18 $ $Date: 2001/07/20 12:45:20 $
+ @version $Revision: 1.19 $ $Date: 2001/07/20 18:46:04 $
*/
public class ApacheConfig extends BaseInterceptor {
@@ -237,13 +234,6 @@
forwardAll=b;
}
- /** Use JkMount directives ( default ) or <Location>
- and SetHandler ( if false )
- */
- public void setUseJkMount( boolean b ) {
- useJkMount=b;
- }
-
/** Special option - do not generate mappings for the ROOT
context. The default is true, and will not generate the mappings,
not redirecting all pages to tomcat (since /* matches everything).
@@ -579,17 +569,11 @@
log("Ignoring root context in mount-all mode ");
return true;
}
- if( useJkMount ) {
- mod_jk.println(indent + "JkMount " + nPath + " " + jkProto );
- if( "".equals(ctxPath) )
- mod_jk.println(indent + "JkMount " + nPath + "* " + jkProto );
- else
- mod_jk.println(indent + "JkMount " + nPath + "/* " + jkProto );
- } else {
- mod_jk.println(indent + "<Location \"" + nPath + "\">");
- mod_jk.println(indent + " SetHandler jakarta-servlet");
- mod_jk.println(indent + "</Location>");
- }
+ mod_jk.println(indent + "JkMount " + nPath + " " + jkProto );
+ if( "".equals(ctxPath) )
+ mod_jk.println(indent + "JkMount " + nPath + "* " + jkProto );
+ else
+ mod_jk.println(indent + "JkMount " + nPath + "/* " + jkProto );
if( vhost != null ) {
mod_jk.println("</VirtualHost>");
indent="";
@@ -685,25 +669,15 @@
private boolean addExtensionMapping( String ctxPath, String ext,
PrintWriter mod_jk )
{
- mod_jk.println(indent + "<LocationMatch " + ctxPath + "/(.*/)*.*\\." +
- ext + " >" );
- mod_jk.println(indent + " SetHandler jakarta-servlet ");
- mod_jk.println(indent + "</LocationMatch>");
+ mod_jk.println(indent + "JkMount " + ctxPath + "/*." + ext
+ + " " + jkProto);
return true;
}
private boolean addMapping( String fullPath, PrintWriter mod_jk ) {
log( "Adding map for " + fullPath );
- if( useJkMount ) {
- mod_jk.println(indent + "JkMount " + fullPath + " " + jkProto );
- } else {
- mod_jk.println(indent + "<Location " + fullPath + " >");
- mod_jk.println(indent + " SetHandler jakarta-servlet ");
- // XXX Other nice things like setting servlet and other attributes
- mod_jk.println(indent + "</Location>");
- mod_jk.println();
- }
+ mod_jk.println(indent + "JkMount " + fullPath + " " + jkProto );
return true;
}
