User: starksm
Date: 01/09/30 15:07:22
Modified: catalina/src/etc/conf/catalina jboss.conf.patch
jboss.jcml.patch
Log:
Update the standard conf to embedded catalina conf patch files
Revision Changes Path
1.2 +28 -21 contrib/catalina/src/etc/conf/catalina/jboss.conf.patch
Index: jboss.conf.patch
===================================================================
RCS file: /cvsroot/jboss/contrib/catalina/src/etc/conf/catalina/jboss.conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jboss.conf.patch 2001/09/27 01:36:25 1.1
+++ jboss.conf.patch 2001/09/30 22:07:22 1.2
@@ -1,5 +1,5 @@
-*** jboss.conf Wed Sep 26 18:24:36 2001
---- jboss.conf.catalina Wed Sep 26 18:25:13 2001
+*** jboss.conf Sun Sep 30 14:36:20 2001
+--- jboss.conf.catalina Sun Sep 30 14:53:29 2001
***************
*** 32,38 ****
</MLET>
@@ -9,29 +9,36 @@
</MLET>
<MLET CODE = "org.jboss.util.Shutdown" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
---- 32,56 ----
+--- 32,38 ----
</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="../../../catalina/common/lib/">
-! <ARG TYPE="java.lang.String" VALUE="CatalinaCommon">
-! </MLET>
-! <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-! <ARG TYPE="java.lang.String" VALUE="../../../catalina/server/lib/">
-! <ARG TYPE="java.lang.String" VALUE="CatalinaServer">
-! </MLET>
-! <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-! <ARG TYPE="java.lang.String" VALUE="../../../catalina/bin/">
-! <ARG TYPE="java.lang.String" VALUE="CatalinaBin">
-! </MLET>
-! <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
-! <ARG TYPE="java.lang.String" VALUE="../../../catalina/lib/">
-! <ARG TYPE="java.lang.String" VALUE="CatalinaLib">
-! </MLET>
-!
! <MLET CODE = "org.jboss.configuration.ConfigurationService"
ARCHIVE="jboss.jar,../xml.jar" CODEBASE="../../lib/ext/">
</MLET>
<MLET CODE = "org.jboss.util.Shutdown" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
+***************
+*** 40,42 ****
+--- 40,61 ----
+
+ <MLET CODE = "org.jboss.util.ServiceControl" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
+ </MLET>
++
++ <!-- Uncomment to add Catalina classes to classpath -->
++ <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
++ <ARG TYPE="java.lang.String" VALUE="../../../catalina/common/lib/">
++ <ARG TYPE="java.lang.String" VALUE="CatalinaCommon">
++ </MLET>
++ <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
++ <ARG TYPE="java.lang.String" VALUE="../../../catalina/server/lib/">
++ <ARG TYPE="java.lang.String" VALUE="CatalinaServer">
++ </MLET>
++ <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
++ <ARG TYPE="java.lang.String" VALUE="../../../catalina/bin/">
++ <ARG TYPE="java.lang.String" VALUE="CatalinaBin">
++ </MLET>
++ <MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
++ <ARG TYPE="java.lang.String" VALUE="../../../catalina/lib/">
++ <ARG TYPE="java.lang.String" VALUE="CatalinaLib">
++ </MLET>
++
1.3 +22 -16 contrib/catalina/src/etc/conf/catalina/jboss.jcml.patch
Index: jboss.jcml.patch
===================================================================
RCS file: /cvsroot/jboss/contrib/catalina/src/etc/conf/catalina/jboss.jcml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jboss.jcml.patch 2001/09/27 01:56:23 1.2
+++ jboss.jcml.patch 2001/09/30 22:07:22 1.3
@@ -1,16 +1,22 @@
-117,119c125,127
-< <!-- Uncomment to add embedded tomcat service
-< <mbean code="org.jboss.tomcat.EmbeddedTomcatServiceSX"
name="DefaultDomain:service=EmbeddedTomcat" />
-< -->
----
-> <!-- Uncomment to add embedded tomcat service -->
-> <mbean code="org.jboss.web.catalina.EmbeddedCatalinaServiceSX"
name="DefaultDomain:service=EmbeddedCatalina" >
-> </mbean>
-205c213
-< <!-- Make sure you change EmbeddedTomcat to Jetty if you are using Jetty -->
----
-> <!-- Make sure you change EmbeddedCatalina to Jetty if you are using Jetty -->
-209c217
-< <attribute name="WarDeployerName">:service=EmbeddedTomcat</attribute>
----
-> <attribute name="WarDeployerName">:service=EmbeddedCatalina</attribute>
+*** jboss.jcml Sun Sep 30 14:36:24 2001
+--- jboss.jcml.catalina Sun Sep 30 14:57:40 2001
+***************
+*** 114,122 ****
+ <attribute name="BeanCacheJMSMonitoringEnabled">false</attribute>
+ </mbean>
+
+! <!-- Uncomment to add embedded tomcat service
+! <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">
+--- 114,121 ----
+ <attribute name="BeanCacheJMSMonitoringEnabled">false</attribute>
+ </mbean>
+
+! <!-- Uncomment to add embedded catalina service -->
+! <mbean code="org.jboss.web.catalina.EmbeddedCatalinaServiceSX"
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">
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development