[Jboss-cvs] JBossAS SVN: r55260 - branches/Branch_4_0/tomcat/src/resources

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 4 14:57:25 EDT 2006


Author: dimitris at jboss.org
Date: 2006-08-04 14:57:22 -0400 (Fri, 04 Aug 2006)
New Revision: 55260

Modified:
   branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml
   branches/Branch_4_0/tomcat/src/resources/jboss-service.xml
Log:
Fix the formatting

Modified: branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml	2006-08-04 18:52:29 UTC (rev 55259)
+++ branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml	2006-08-04 18:57:22 UTC (rev 55260)
@@ -6,39 +6,38 @@
    <mbean code="org.jboss.web.tomcat.tc5.Tomcat5"
       name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml">
 
-	  <!-- You can configure a set of authenticators keyed by http-auth method used. This
-		  will apply the same set of authenticators across all web applications. You can
-		  override the set of authenticators at the web application level by adding
-		  <authenticators> element to the respective jboss-web.xml --> 
-	  <!--
-		  <attribute name="Authenticators" serialDataType="jbxb">
-			<java:properties xmlns:java="urn:jboss:java-properties"
-				xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-				xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
-				<java:property>
-					<java:key>BASIC</java:key>
-					<java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>CLIENT-CERT</java:key>
-					<java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>DIGEST</java:key>
-					<java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>FORM</java:key>
-					<java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
-				</java:property> 
-				<java:property>
-					<java:key>NONE</java:key>
-					<java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
-				</java:property> 
-			</java:properties> 
-	   </attribute> 
-	   -->
-	   
+      <!-- You can configure a set of authenticators keyed by http-auth method used. This
+      will apply the same set of authenticators across all web applications. You can
+      override the set of authenticators at the web application level by adding
+      <authenticators> element to the respective jboss-web.xml --> 
+      <!--
+      <attribute name="Authenticators" serialDataType="jbxb">
+         <java:properties xmlns:java="urn:jboss:java-properties"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+            xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+            <java:property>
+               <java:key>BASIC</java:key>
+               <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>CLIENT-CERT</java:key>
+               <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>DIGEST</java:key>
+               <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>FORM</java:key>
+               <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
+            </java:property> 
+            <java:property>
+               <java:key>NONE</java:key>
+               <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
+            </java:property> 
+         </java:properties>
+      </attribute> 
+      -->
 
       <!-- The JAAS security domain to use in the absense of an explicit
       security-domain specification in the war WEB-INF/jboss-web.xml
@@ -87,42 +86,42 @@
       -->
 
       <!--
-        *******************************************************
-        ****************** CLUSTERING *************************
-        *******************************************************
-        In order to activate HTTP Session clustering for Tomcat
-        make sure you run JBoss's "all" configuration i.e.
-        "run -c all"
-        (the default configuration doesn't contain clustering)
+         *******************************************************
+         ****************** CLUSTERING *************************
+         *******************************************************
+         In order to activate HTTP Session clustering for Tomcat
+         make sure you run JBoss's "all" configuration i.e.
+         "run -c all"
+         (the default configuration doesn't contain clustering) 
 
-        Furthermore, you may change SnapshotMode and
-        SnapshotInterval attributes below to indicate when to
-        synchronize changes with the other node(s).
+         Furthermore, you may change SnapshotMode and
+         SnapshotInterval attributes below to indicate when to
+         synchronize changes with the other node(s).
 
-        If you use Apache+mod_jk(2) you will most probably use
-        the AJP1.3 connector below. Thus, if you so wish,
-        you may comment (i.e. deactivate) the HTTP connector
-        as it won't be used anymore.
+         If you use Apache+mod_jk(2) you will most probably use
+         the AJP1.3 connector below. Thus, if you so wish,
+         you may comment (i.e. deactivate) the HTTP connector
+         as it won't be used anymore.
 
-        *******************************************************
-        *******************************************************
-        *******************************************************
-       --> 
+         *******************************************************
+         *******************************************************
+         *******************************************************
+      --> 
 		
-		<!--
-		If you are using clustering, the following two attributes
-		define when the sessions are replicated to the other nodes.
-		The default value, "instant", synchronously replicates changes
-		to the other nodes at the end of requests. In this case, the 
-		"SnapshotInterval" attribute is not used.
-		The "interval" mode, in association with the "SnapshotInterval"
-		attribute, indicates that modified sessions will only be replicated
-		every "SnapshotInterval" milliseconds at most.	
+      <!--
+         If you are using clustering, the following two attributes
+         define when the sessions are replicated to the other nodes.
+         The default value, "instant", synchronously replicates changes
+         to the other nodes at the end of requests. In this case, the 
+         "SnapshotInterval" attribute is not used.
+         The "interval" mode, in association with the "SnapshotInterval"
+         attribute, indicates that modified sessions will only be replicated
+         every "SnapshotInterval" milliseconds at most.	
 		
-		Note that this attribute is not in effect if the replication-granularity
-		is set to FIELD. If it is FIELD, it will be per http request (that is, 
-		"instant" mode.)
-		--> 
+         Note that this attribute is not in effect if the replication-granularity
+         is set to FIELD. If it is FIELD, it will be per http request (that is, 
+         "instant" mode.)
+      --> 
       <attribute name="SnapshotMode">instant</attribute> <!-- you may switch to "interval" -->
       <attribute name="SnapshotInterval">2000</attribute>
 

Modified: branches/Branch_4_0/tomcat/src/resources/jboss-service.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/jboss-service.xml	2006-08-04 18:52:29 UTC (rev 55259)
+++ branches/Branch_4_0/tomcat/src/resources/jboss-service.xml	2006-08-04 18:57:22 UTC (rev 55260)
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id$ -->
-
 <server> 
    
    <!-- Tomcat 5 Service-->
    <mbean code="org.jboss.web.tomcat.tc5.Tomcat5"
       name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml">
+      
       <!-- You can configure a set of authenticators keyed by http-auth method used. This
-		  will apply the same set of authenticators across all web applications. You can
-		  override the set of authenticators at the web application level by adding
-		  <authenticators> element to the respective jboss-web.xml --> 
-	  <!--
-		  <attribute name="Authenticators" serialDataType="jbxb">
-			<java:properties xmlns:java="urn:jboss:java-properties"
-				xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-				xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
-				<java:property>
-					<java:key>BASIC</java:key>
-					<java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>CLIENT-CERT</java:key>
-					<java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>DIGEST</java:key>
-					<java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
-				</java:property>
-				<java:property>
-					<java:key>FORM</java:key>
-					<java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
-				</java:property> 
-				<java:property>
-					<java:key>NONE</java:key>
-					<java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
-				</java:property> 
-			</java:properties> 
-	   </attribute> 
-	   -->
+      will apply the same set of authenticators across all web applications. You can
+      override the set of authenticators at the web application level by adding
+      <authenticators> element to the respective jboss-web.xml --> 
+      <!--
+      <attribute name="Authenticators" serialDataType="jbxb">
+         <java:properties xmlns:java="urn:jboss:java-properties"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+            xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+            <java:property>
+               <java:key>BASIC</java:key>
+               <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>CLIENT-CERT</java:key>
+               <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>DIGEST</java:key>
+               <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
+            </java:property>
+            <java:property>
+               <java:key>FORM</java:key>
+               <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
+            </java:property> 
+            <java:property>
+               <java:key>NONE</java:key>
+               <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
+            </java:property> 
+         </java:properties>
+      </attribute> 
+      -->
 	   
-	   
       <!-- The JAAS security domain to use in the absense of an explicit
       security-domain specification in the war WEB-INF/jboss-web.xml
       -->
@@ -89,42 +88,42 @@
       -->
 
       <!--
-        *******************************************************
-        ****************** CLUSTERING *************************
-        *******************************************************
-        In order to activate HTTP Session clustering for Tomcat
-        make sure you run JBoss's "all" configuration i.e.
-        "run -c all"
-        (the default configuration doesn't contain clustering)
+         *******************************************************
+         ****************** CLUSTERING *************************
+         *******************************************************
+         In order to activate HTTP Session clustering for Tomcat
+         make sure you run JBoss's "all" configuration i.e.
+         "run -c all"
+         (the default configuration doesn't contain clustering)
+ 
+         Furthermore, you may change SnapshotMode and
+         SnapshotInterval attributes below to indicate when to
+         synchronize changes with the other node(s).   
 
-        Furthermore, you may change SnapshotMode and
-        SnapshotInterval attributes below to indicate when to
-        synchronize changes with the other node(s).
+         If you use Apache+mod_jk(2) you will most probably use
+         the AJP1.3 connector below. Thus, if you so wish,
+         you may comment (i.e. deactivate) the HTTP connector
+         as it won't be used anymore.
 
-        If you use Apache+mod_jk(2) you will most probably use
-        the AJP1.3 connector below. Thus, if you so wish,
-        you may comment (i.e. deactivate) the HTTP connector
-        as it won't be used anymore.
-
-        *******************************************************
-        *******************************************************
-        *******************************************************
-       --> 
+         *******************************************************
+         *******************************************************
+         *******************************************************
+      --> 
 		
-		<!--
-		If you are using clustering, the following two attributes
-		define when the sessions are replicated to the other nodes.
-		The default value, "instant", synchronously replicates changes
-		to the other nodes at the end of requests. In this case, the 
-		"SnapshotInterval" attribute is not used.
-		The "interval" mode, in association with the "SnapshotInterval"
-		attribute, indicates that modified sessions will only be replicated
-		every "SnapshotInterval" milliseconds at most.
+      <!--
+         If you are using clustering, the following two attributes
+         define when the sessions are replicated to the other nodes.
+         The default value, "instant", synchronously replicates changes
+         to the other nodes at the end of requests. In this case, the 
+         "SnapshotInterval" attribute is not used.
+         The "interval" mode, in association with the "SnapshotInterval"
+         attribute, indicates that modified sessions will only be replicated
+         every "SnapshotInterval" milliseconds at most.
 		
-		Note that this attribute is not in effect if the replication-granularity
-		is set to FIELD. If it is FIELD, it will be per http request (that is, 
-		"instant" mode.)
-		--> 
+         Note that this attribute is not in effect if the replication-granularity
+         is set to FIELD. If it is FIELD, it will be per http request (that is, 
+         "instant" mode.)
+      --> 
       <attribute name="SnapshotMode">instant</attribute> <!-- you may switch to "interval" -->
       <attribute name="SnapshotInterval">2000</attribute>
 




More information about the jboss-cvs-commits mailing list