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 Changes Path
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.
-! -->
-! <RequestInterceptor
-! className="org.apache.tomcat.request.SimpleRealm"
-! debug="0" />
-!
-! <!-- JBoss, Map the current web user to the SecurityAssociation principal.
-->
-! <RequestInterceptor className="org.jboss.tomcat.security.JbossRealm" />
-!
-! <!-- UnComment the following and comment out the
-! above to get a JDBC realm.
-! Other options for driverName:
-! driverName="oracle.jdbc.driver.OracleDriver"
-! connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-! connectionName="scott"
-! connectionPassword="tiger"
-!
-! driverName="org.gjt.mm.mysql.Driver"
-! connectionURL="jdbc:mysql://localhost/authority"
-! connectionName="test"
-! connectionPassword="test"
-
-+ "connectionName" and "connectionPassword" are optional.
-+ -->
-+ <!--
-+ <RequestInterceptor
-+ className="org.apache.tomcat.request.JDBCRealm"
-+ debug="99"
-+ driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-+ connectionURL="jdbc:odbc:TOMCAT"
-+ userTable="users"
-+ userNameCol="user_name"
-+ userCredCol="user_pass"
-+ userRoleTable="user_roles"
-+ roleNameCol="role_name" />
-+ -->
-
- <!-- Loaded last since JSP's that load-on-startup use request handling -->
- <ContextInterceptor
-***************
-*** 243,252 ****
- value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/>
- <Parameter name="port" value="8007"/>
- </Connector>
-- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
-- <Parameter name="handler"
value="org.apache.tomcat.service.connector.Ajp13ConnectionHandler"/>
-- <Parameter name="port" value="8009"/>
-- </Connector>
-
- <!-- ==================== Special webapps ==================== -->
- <!-- You don't need this if you place your app in webapps/
---- 271,276 ----
-***************
-*** 265,271 ****
- <Context path="/examples"
- docBase="webapps/examples"
- crossContext="false"
-! debug="1"
- reloadable="true" >
- </Context>
-
---- 289,295 ----
- <Context path="/examples"
- docBase="webapps/examples"
- crossContext="false"
-! debug="0"
- reloadable="true" >
- </Context>
++
++ <!-- JBoss, Map the current web user to the SecurityAssociation principal.
-->
++ <RequestInterceptor className="org.jboss.tomcat.security.JbossRealm" />
+ <!-- UnComment the following and comment out the
+ above to get a JDBC realm.
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
