svn commit: r1714922 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/ClusterRuleSet.java webapps/docs/changelog.xml webapps/docs/config/cluster-interceptor.xml

[kfujino]

Author: kfujino
Date: Wed Nov 18 02:40:02 2015
New Revision: 1714922

URL: http://svn.apache.org/viewvc?rev=1714922&view=rev
Log:
Enable an explicit configuration of local member in the static cluster 
membership.

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1714922&r1=1714921&r2=1714922&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Wed 
Nov 18 02:40:02 2015
@@ -160,7 +160,14 @@ public class ClusterRuleSet extends Rule
                                 "addInterceptor",
                                 
"org.apache.catalina.tribes.ChannelInterceptor");
 
-            
+            digester.addObjectCreate(channelPrefix + "Interceptor/LocalMember",
+                                     null, // MUST be specified in the element
+                                     "className");
+            digester.addSetProperties(channelPrefix + 
"Interceptor/LocalMember");
+            digester.addSetNext(channelPrefix + "Interceptor/LocalMember",
+                                "setLocalMember",
+                                "org.apache.catalina.tribes.Member");
+
             digester.addObjectCreate(channelPrefix + "Interceptor/Member",
                                      null, // MUST be specified in the element
                                      "className");

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1714922&r1=1714921&r2=1714922&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 18 02:40:02 2015
@@ -179,6 +179,10 @@
         Optimize the session lock range in DeltaManager.requestCompleted.
         (kfujino)
       </fix>
+      <fix>
+        Enable an explicit configuration of local member in the static cluster
+        membership. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Tribes">

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1714922&r1=1714921&r2=1714922&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Wed Nov 18 
02:40:02 2015
@@ -67,6 +67,12 @@
    The <code>TcpFailureDetector</code> will do a health check on the static 
members,and also monitor them for crashes
    so they will have the same level of notification mechanism as the members 
that are automatically discovered.</p>
    <source><![CDATA[     <Interceptor 
className="org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor">
+       <LocalMember 
className="org.apache.catalina.tribes.membership.StaticMember"
+                  port="4000"
+                  securePort="-1"
+                  host="tomcat01.mydomain.com"
+                  domain="staging-cluster"
+                  uniqueId="{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,1}"/>
        <Member className="org.apache.catalina.tribes.membership.StaticMember"
                   port="5678"
                   securePort="-1"
@@ -193,6 +199,16 @@
      </attribute>
    </attributes>
   </subsection>
+</section>
+
+<section name="Nested Components">
+
+  <p><b>LocalMember:</b> <br/>
+    Static member that is the local member of the static cluster group.
+  </p>
+  <p><b>Member:</b> <br/>
+    Static member that add to the static cluster group.
+  </p>
 
   <subsection name="Nested element StaticMember Attributes">
    <attributes>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org