User: starksm Date: 01/04/17 19:40:41 Added: tomcat/src/etc/conf/tomcat jboss.conf.patch jboss.jcml.patch server.xml.patch Log: Patch files that transform the default dist config files into those required for the JBoss/EmbededTomcat bundle Revision Changes Path 1.1 contrib/tomcat/src/etc/conf/tomcat/jboss.conf.patch Index: jboss.conf.patch =================================================================== *** ../default/jboss.conf Tue Apr 17 13:28:07 2001 --- jboss.conf Tue Apr 17 13:30:03 2001 *************** *** 41,52 **** </MLET> ! <!-- 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"> ! -- /MLET> ! --> <!-- 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> ! <!-- 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"> ! </MLET> <!-- 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/"> 1.1 contrib/tomcat/src/etc/conf/tomcat/jboss.jcml.patch Index: jboss.jcml.patch =================================================================== *** ../default/jboss.jcml Tue Apr 17 13:34:28 2001 --- jboss.jcml Tue Apr 17 13:37:50 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" /> - --> <!-- 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"> --- 116,123 ---- <attribute name="BeanCacheJMSMonitoringEnabled">false</attribute> </mbean> ! <!-- Uncomment to add embedded tomcat service --> <mbean code="org.jboss.tomcat.EmbeddedTomcatService" 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.1 contrib/tomcat/src/etc/conf/tomcat/server.xml.patch Index: server.xml.patch =================================================================== *** server.xml Tue Mar 13 13:15:37 2001 --- server.jboss.xml Mon Apr 16 19:23:01 2001 *************** *** 123,153 **** className="org.apache.tomcat.context.DefaultCMSetter" /> <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 --> <!-- 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" /> - <!-- 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" /> <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" /> <!-- 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" /> <!-- 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" 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-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development