User: starksm
Date: 01/12/10 20:45:07
Modified: tomcat/src/etc/conf/tomcat Tag: Branch_2_4 server.xml.patch
Log:
Revert to tomcat-3.2.3 since tomcat-3.2.4 has broken the jsp thread context
class loader and the java:comp/env does not work
Revision Changes Path
No revision
No revision
1.4.2.2 +31 -27 contrib/tomcat/src/etc/conf/tomcat/server.xml.patch
Index: server.xml.patch
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/server.xml.patch,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- server.xml.patch 2001/11/28 03:53:39 1.4.2.1
+++ server.xml.patch 2001/12/11 04:45:06 1.4.2.2
@@ -1,43 +1,47 @@
-*** server.xml Tue Nov 27 19:52:39 2001
---- server.jboss.xml Tue Nov 27 19:56:41 2001
+*** server.xml Tue Dec 12 13:36:20 2000
+--- server.jboss.xml Thu May 24 09:52:03 2001
***************
*** 120,135 ****
-
<ContextInterceptor
className="org.apache.tomcat.context.LoaderInterceptor" />
<ContextInterceptor
className="org.apache.tomcat.context.DefaultCMSetter" />
<ContextInterceptor
className="org.apache.tomcat.context.WorkDirInterceptor" />
-
-! <!-- Uncomment if you are using JDK1.2 or higher.
- Insures proper thread context class loader is in effect for servlet
execution
- <ContextInterceptor
- className="org.apache.tomcat.request.Jdk12Interceptor" />
-- -->
- <!-- Request processing -->
+! <!-- Request processing -->
<!-- Session interceptor will extract the session id from cookies and
---- 120,136 ----
-
+ deal with URL rewriting ( by fixing the URL ). If you wish to
+ suppress the use of cookies for session identifiers, change the
+ "noCookies" attribute to "true"
+ -->
+ <RequestInterceptor
+ className="org.apache.tomcat.request.SessionInterceptor"
+ noCookies="false" />
+--- 120,140 ----
<ContextInterceptor
className="org.apache.tomcat.context.LoaderInterceptor" />
-+ <ContextInterceptor
-+ className="org.jboss.tomcat.naming.JbossWebXmlReader" />
<ContextInterceptor
++ className="org.jboss.tomcat.naming.JbossWebXmlReader" />
++ <ContextInterceptor
className="org.apache.tomcat.context.DefaultCMSetter" />
<ContextInterceptor
className="org.apache.tomcat.context.WorkDirInterceptor" />
-
-! <!-- Uncomment if you are using JDK1.2 or higher. -->
- Insures proper thread context class loader is in effect for servlet
execution
- <ContextInterceptor
- className="org.apache.tomcat.request.Jdk12Interceptor" />
- <!-- Request processing -->
+! <!-- JBoss, Set the request thread classloader to the thread context
classloader -->
+! <RequestInterceptor
className="org.apache.tomcat.request.Jdk12Interceptor" />
+!
<!-- Session interceptor will extract the session id from cookies and
+ deal with URL rewriting ( by fixing the URL ). If you wish to
+ suppress the use of cookies for session identifiers, change the
+ "noCookies" attribute to "true"
+ -->
++
+ <RequestInterceptor
+ className="org.apache.tomcat.request.SessionInterceptor"
+ noCookies="false" />
***************
-*** 183,222 ****
+*** 176,215 ****
className="org.apache.tomcat.request.AccessInterceptor"
debug="0" />
@@ -74,18 +78,18 @@
! userCredCol="user_pass"
! userRoleTable="user_roles"
! roleNameCol="role_name" />
- -->
+! -->
<!-- Loaded last since JSP's that load-on-startup use request handling -->
<ContextInterceptor
---- 184,193 ----
+--- 181,190 ----
className="org.apache.tomcat.request.AccessInterceptor"
debug="0" />
-! <!-- JBoss, Perform authentication and authorization using the
security-domain
-! security manager.
- -->
-+ <RequestInterceptor
className="org.jboss.tomcat.security.JBossSecurityMgrRealm" />
+! <!-- JBoss, Perform authentication and authorization using the
security-domain
+! security manager.
+! -->
+! <RequestInterceptor
className="org.jboss.tomcat.security.JBossSecurityMgrRealm" />
<!-- Loaded last since JSP's that load-on-startup use request handling -->
<ContextInterceptor
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
