User: starksm
Date: 01/06/21 22:49:08
Modified: tomcat/src/etc/conf/tomcat jboss.conf.patch jboss.jcml.patch
server.xml.patch
Log:
Merge the 2.2 branch changes
Revision Changes Path
1.2 +8 -10 contrib/tomcat/src/etc/conf/tomcat/jboss.conf.patch
Index: jboss.conf.patch
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/jboss.conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jboss.conf.patch 2001/04/18 02:40:41 1.1
+++ jboss.conf.patch 2001/06/22 05:49:08 1.2
@@ -1,11 +1,10 @@
-*** ../default/jboss.conf Tue Apr 17 13:28:07 2001
---- jboss.conf Tue Apr 17 13:30:03 2001
+*** jboss.conf Thu May 24 10:10:07 2001
+--- jboss.conf.tomcat Thu May 24 10:14:12 2001
***************
-*** 41,52 ****
- </MLET>
+*** 42,52 ****
-! <!-- Uncomment to add Tomcat classes to classpath
+ <!-- Uncomment to add Tomcat classes to classpath
! -- MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
! -- ARG TYPE="java.lang.String" VALUE="path to tomcat "/lib" goes here">
! -- ARG TYPE="java.lang.String" VALUE="Tomcat">
@@ -14,14 +13,13 @@
<!-- Uncomment to add Jetty classes to classpath (make sure Arg1 ends in a slash)
-- MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
---- 41,51 ----
- </MLET>
+--- 42,51 ----
-! <!-- Uncomment to add Tomcat classes to classpath-->
+ <!-- Uncomment to add Tomcat classes to classpath
! <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-! <ARG TYPE="java.lang.String" VALUE="../../../tomcat/lib/">
-! <ARG TYPE="java.lang.String" VALUE="Tomcat">
+! <ARG TYPE="java.lang.String" VALUE="../../../tomcat/lib/">
+! <ARG TYPE="java.lang.String" VALUE="Tomcat">
! </MLET>
<!-- Uncomment to add Jetty classes to classpath (make sure Arg1 ends in a slash)
1.2 +4 -4 contrib/tomcat/src/etc/conf/tomcat/jboss.jcml.patch
Index: jboss.jcml.patch
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/etc/conf/tomcat/jboss.jcml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jboss.jcml.patch 2001/04/18 02:40:41 1.1
+++ jboss.jcml.patch 2001/06/22 05:49:08 1.2
@@ -1,12 +1,12 @@
-*** ../default/jboss.jcml Tue Apr 17 13:34:28 2001
---- jboss.jcml Tue Apr 17 13:37:50 2001
+*** jboss.jcml Thu May 24 10:18:58 2001
+--- jboss.jcml.tomcat Thu May 24 10:18:15 2001
***************
*** 116,124 ****
<attribute name="BeanCacheJMSMonitoringEnabled">false</attribute>
</mbean>
! <!-- Uncomment to add embedded tomcat service
- <mbean code="org.jboss.tomcat.EmbeddedTomcatService"
name="DefaultDomain:service=EmbeddedTomcat" />
+ <mbean code="org.jboss.tomcat.EmbeddedTomcatServiceSX"
name="DefaultDomain:service=EmbeddedTomcat" />
- -->
<!-- Uncomment and set file URL to add Jetty service (you can set config more
than once)
@@ -16,7 +16,7 @@
</mbean>
! <!-- Uncomment to add embedded tomcat service -->
- <mbean code="org.jboss.tomcat.EmbeddedTomcatService"
name="DefaultDomain:service=EmbeddedTomcat" />
+ <mbean code="org.jboss.tomcat.EmbeddedTomcatServiceSX"
name="DefaultDomain:service=EmbeddedTomcat" />
<!-- Uncomment and set file URL to add Jetty service (you can set config more
than once)
<mbean code="org.jboss.jetty.JettyService" name="DefaultDomain:service=Jetty">
1.4 +63 -23 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- server.xml.patch 2001/04/18 20:19:33 1.3
+++ server.xml.patch 2001/06/22 05:49:08 1.4
@@ -1,8 +1,12 @@
*** server.xml Tue Dec 12 13:36:20 2000
---- server.jboss.xml Wed Apr 18 13:21:15 2001
+--- server.jboss.xml Thu May 24 09:52:03 2001
***************
-*** 124,135 ****
+*** 120,135 ****
<ContextInterceptor
+ className="org.apache.tomcat.context.LoaderInterceptor" />
+ <ContextInterceptor
+ className="org.apache.tomcat.context.DefaultCMSetter" />
+ <ContextInterceptor
className="org.apache.tomcat.context.WorkDirInterceptor" />
! <!-- Request processing -->
@@ -14,18 +18,16 @@
<RequestInterceptor
className="org.apache.tomcat.request.SessionInterceptor"
noCookies="false" />
---- 124,146 ----
+--- 120,140 ----
+ <ContextInterceptor
+ className="org.apache.tomcat.context.LoaderInterceptor" />
<ContextInterceptor
++ className="org.jboss.tomcat.naming.JbossWebXmlReader" />
++ <ContextInterceptor
+ className="org.apache.tomcat.context.DefaultCMSetter" />
+ <ContextInterceptor
className="org.apache.tomcat.context.WorkDirInterceptor" />
-! <!-- 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 to the thread context
classloader -->
! <RequestInterceptor
className="org.apache.tomcat.request.Jdk12Interceptor" />
!
@@ -39,17 +41,55 @@
className="org.apache.tomcat.request.SessionInterceptor"
noCookies="false" />
***************
-*** 182,187 ****
---- 193,204 ----
- <RequestInterceptor
- className="org.apache.tomcat.request.SimpleRealm"
+*** 176,215 ****
+ className="org.apache.tomcat.request.AccessInterceptor"
debug="0" />
-+
-+ <!-- 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
- above to get a JDBC realm.
+! <!-- Check permissions using the simple xml file. You can
+! plug more advanced authentication modules.
+! -->
+! <RequestInterceptor
+! className="org.apache.tomcat.request.SimpleRealm"
+! debug="0" />
+!
+! <!-- 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
+--- 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" />
+
+ <!-- Loaded last since JSP's that load-on-startup use request handling -->
+ <ContextInterceptor
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
