[JBoss-dev] CVS update: contrib/tomcat/src/etc/conf/tomcat server.xml.patch
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 ChangesPath No revision No revision 1.4.2.2 +31 -27contrib/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-dev] CVS update: contrib/tomcat/src/etc/conf/tomcat server.xml.patch
User: starksm Date: 01/11/27 19:53:39 Modified:tomcat/src/etc/conf/tomcat Tag: Branch_2_4 server.xml.patch Log: Update for tomcat-3.2.4 Revision ChangesPath No revision No revision 1.4.2.1 +27 -31contrib/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 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- server.xml.patch 2001/06/22 05:49:08 1.4 +++ server.xml.patch 2001/11/28 03:53:39 1.4.2.1 @@ -1,47 +1,43 @@ -*** server.xml Tue Dec 12 13:36:20 2000 server.jboss.xml Thu May 24 09:52:03 2001 +*** server.xml Tue Nov 27 19:52:39 2001 +--- server.jboss.xml Tue Nov 27 19:56:41 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 - 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 +--- 120,136 + ContextInterceptor className=org.apache.tomcat.context.LoaderInterceptor / - ContextInterceptor ++ ContextInterceptor + className=org.jboss.tomcat.naming.JbossWebXmlReader / -+ ContextInterceptor + ContextInterceptor className=org.apache.tomcat.context.DefaultCMSetter / ContextInterceptor className=org.apache.tomcat.context.WorkDirInterceptor / -! !-- JBoss, Set the request thread classloader to the thread context classloader -- -! RequestInterceptor className=org.apache.tomcat.request.Jdk12Interceptor / -! +!!-- 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 -- !-- 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 / *** -*** 176,215 +*** 183,222 className=org.apache.tomcat.request.AccessInterceptor debug=0 / @@ -78,18 +74,18 @@ ! userCredCol=user_pass !userRoleTable=user_roles ! roleNameCol=role_name / -! -- + -- !-- Loaded last since JSP's that load-on-startup use request handling -- ContextInterceptor 181,190 +--- 184,193 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
[JBoss-dev] CVS update: contrib/tomcat/src/etc/conf/tomcat server.xml.patch
User: starksm Date: 01/04/18 13:19:33 Modified:tomcat/src/etc/conf/tomcat server.xml.patch Log: Update the comments on the jboss interceptors Revision ChangesPath 1.3 +11 -6 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- server.xml.patch 2001/04/18 04:30:51 1.2 +++ server.xml.patch 2001/04/18 20:19:33 1.3 @@ -1,5 +1,5 @@ *** server.xml Tue Dec 12 13:36:20 2000 server.jboss.xml Mon Apr 16 19:23:01 2001 +--- server.jboss.xml Wed Apr 18 13:21:15 2001 *** *** 124,135 ContextInterceptor @@ -14,17 +14,19 @@ RequestInterceptor className="org.apache.tomcat.request.SessionInterceptor" noCookies="false" / 124,144 +--- 124,146 ContextInterceptor className="org.apache.tomcat.context.WorkDirInterceptor" / -! !-- JBoss, fixes classloader hierarchies. -- +! !-- JBoss, fixes classloader hierarchies to allow optimized calls from +! servlets/jsps to EJBs +! -- ! ContextInterceptor className="org.jboss.tomcat.ContextClassLoaderInterceptor" / ! ! !-- JBoss, Add the jboss-web.xml parser. -- ! ContextInterceptor className="org.jboss.tomcat.naming.JbossWebXmlReader" / ! -! !-- JBoss, Set the request thread classloader. -- +! !-- 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 @@ -38,12 +40,15 @@ noCookies="false" / *** *** 182,187 191,199 +--- 193,204 RequestInterceptor className="org.apache.tomcat.request.SimpleRealm" debug="0" / + -+!-- JBoss, Map the current web user to the SecurityAssociation principal. -- ++!-- JBoss, Map the current web user to the SecurityAssociation principal. ++ This needs to be after the tomcat Realm interceptor that is used to ++ authenticate web users. ++-- +RequestInterceptor className="org.jboss.tomcat.security.JbossRealm" / !-- UnComment the following and comment out the ___ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/tomcat/src/etc/conf/tomcat server.xml.patch
User: starksm Date: 01/04/17 21:30:51 Modified:tomcat/src/etc/conf/tomcat server.xml.patch Log: Change JBOSS_HOME to JBOSS_DIST Change TOMCAT_HOME to TOMCAT_DIST Update server.xml.patch to be against the shipped 3.2.1 server.xml file Revision ChangesPath 1.2 +22 -118 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- server.xml.patch 2001/04/18 02:40:41 1.1 +++ server.xml.patch 2001/04/18 04:30:51 1.2 @@ -1,22 +1,11 @@ -*** server.xml Tue Mar 13 13:15:37 2001 +*** server.xml Tue Dec 12 13:36:20 2000 --- server.jboss.xml Mon Apr 16 19:23:01 2001 *** -*** 123,153 - className="org.apache.tomcat.context.DefaultCMSetter" / +*** 124,135 ContextInterceptor className="org.apache.tomcat.context.WorkDirInterceptor" / -! !-- JBoss, Setup the class loader heirarchy to enable in VM call optimization. -!Add after the org.apache.tomcat.context.WorkDirInterceptor ContextInterceptor -! -- - ContextInterceptor className="org.jboss.tomcat.ContextClassLoaderInterceptor" / -- !-- JBoss, Add the jboss-web.xml parser. Add after the org.jboss.tomcat.ContextClassLoaderInterceptor --ContextInterceptor -- -- -- ContextInterceptor className="org.jboss.tomcat.naming.JbossWebXmlReader" / - - -- !-- Request processing -- +! !-- Request processing -- !-- 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 @@ -25,28 +14,19 @@ RequestInterceptor className="org.apache.tomcat.request.SessionInterceptor" noCookies="false" / -- !-- JBoss, Set the request thread classloader. Add before the org.apache.tomcat.request.SessionInterceptor --RequestInterceptor -- -- -- RequestInterceptor className="org.apache.tomcat.request.Jdk12Interceptor" / -- - - !-- Find the container ( context and prefix/extension map ) - for a request. 123,147 - className="org.apache.tomcat.context.DefaultCMSetter" / +--- 124,144 ContextInterceptor className="org.apache.tomcat.context.WorkDirInterceptor" / -! -! !-- JBoss, fixes classloader hierarchies. -- - ContextInterceptor className="org.jboss.tomcat.ContextClassLoaderInterceptor" / - -+ !-- JBoss, Add the jboss-web.xml parser. -- -+ ContextInterceptor className="org.jboss.tomcat.naming.JbossWebXmlReader" / -+ !-- JBoss, Set the request thread classloader. -- -+ RequestInterceptor className="org.apache.tomcat.request.Jdk12Interceptor" / - +! !-- JBoss, fixes classloader hierarchies. -- +! ContextInterceptor className="org.jboss.tomcat.ContextClassLoaderInterceptor" / +! +! !-- JBoss, Add the jboss-web.xml parser. -- +! ContextInterceptor className="org.jboss.tomcat.naming.JbossWebXmlReader" / +! +! !-- JBoss, Set the request thread 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 @@ -56,91 +36,15 @@ RequestInterceptor className="org.apache.tomcat.request.SessionInterceptor" noCookies="false" / - - !-- Find the container ( context and prefix/extension map ) - for a request. *** -*** 191,199 - className="org.apache.tomcat.request.AccessInterceptor" - debug="0" / - -! RequestInterceptor -! className="org.jboss.tomcat.security.JbossRealm" / - - - !-- Loaded last since JSP's that load-on-startup use request handling -- - ContextInterceptor 185,227 - className="org.apache.tomcat.request.AccessInterceptor" +*** 182,187 +--- 191,199 + RequestInterceptor + className="org.apache.tomcat.request.SimpleRealm" debug="0" / - -! !-- Check permissions using the simple xml file. You can -! plug more advanced authentication modules. -! -- -!