craigmcc 00/11/07 14:15:39
Modified: src/etc Tag: tomcat_32 server.xml
src/share/org/apache/tomcat/request Tag: tomcat_32
InvokerInterceptor.java SessionInterceptor.java
Log:
Restore a limited ability to configure the matching prefix for the invoker
servlet (defaults to "/servlet/"). This ability had been removed when Tomcat
3.2 was changed to stop reading the global web.xml file.
NOTE: The default you configure in server.xml applies to *all* web apps that
are installed in this instance of Tomcat.
NOTE: Tomcat 4.0 reverts back to the behavior of Tomcat 3.1 -- it uses the
values in "conf/web.xml" as defaults for all web applications, which are then
customized from the web.xml file for each individual web app separately.
Revision Changes Path
No revision
No revision
1.29.2.7 +7 -1 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -r1.29.2.6 -r1.29.2.7
--- server.xml 2000/09/28 02:07:01 1.29.2.6
+++ server.xml 2000/11/07 22:15:26 1.29.2.7
@@ -139,10 +139,16 @@
debug="0" />
<!-- Non-standard invoker, for backward compat. ( /servlet/* )
+ You can modify the prefix that is matched by adjusting the
+ "prefix" parameter below. Be sure your modified pattern
+ starts and ends with a slash.
+
+ NOTE: This prefix applies to *all* web applications that
+ are running in this instance of Tomcat.
-->
<RequestInterceptor
className="org.apache.tomcat.request.InvokerInterceptor"
- debug="0" />
+ debug="0" prefix="/servlet/" />
<!-- "default" handler - static files and dirs
-->
No revision
No revision
1.4.2.2 +9 -0
jakarta-tomcat/src/share/org/apache/tomcat/request/InvokerInterceptor.java
Index: InvokerInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/InvokerInterceptor.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- InvokerInterceptor.java 2000/08/26 13:03:38 1.4.2.1
+++ InvokerInterceptor.java 2000/11/07 22:15:34 1.4.2.2
@@ -84,6 +84,15 @@
String prefix="/servlet/";
int prefixLen=prefix.length();
+ public String getPrefix() {
+ return (prefix);
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ this.prefixLen = prefix.length();
+ }
+
public int requestMap(Request req) {
// If we have an explicit mapper - return
Container ct=req.getContainer();
1.24.2.1 +1 -0
jakarta-tomcat/src/share/org/apache/tomcat/request/SessionInterceptor.java
Index: SessionInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SessionInterceptor.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- SessionInterceptor.java 2000/06/30 20:21:41 1.24
+++ SessionInterceptor.java 2000/11/07 22:15:35 1.24.2.1
@@ -212,3 +212,4 @@
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
