[jboss-cvs] JBossAS SVN: r109265 - in trunk: testsuite/src/main/org/jboss/test/cluster/mod_cluster and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-11-10 23:32:33 -0500 (Wed, 10 Nov 2010)
New Revision: 109265

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
   trunk/tomcat/src/resources/mod_cluster/mod_cluster-jboss-beans.xml
Log:
Upgrade mod_cluster to 1.1.0.Final

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-11-11 04:19:45 UTC (rev 109264)
+++ trunk/component-matrix/pom.xml	2010-11-11 04:32:33 UTC (rev 109265)
@@ -115,7 +115,7 @@
     <version.org.jboss.metadata.ejb>2.0.0-alpha-22</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
     <version.org.jboss.metadata.war>2.0.0.Alpha15</version.org.jboss.metadata.war>
-    <version.org.jboss.mod_cluster>1.1.0.CR3</version.org.jboss.mod_cluster>
+    <version.org.jboss.mod_cluster>1.1.0.Final</version.org.jboss.mod_cluster>
     <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
     <version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java	2010-11-11 04:19:45 UTC (rev 109264)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java	2010-11-11 04:32:33 UTC (rev 109265)
@@ -109,7 +109,9 @@
       
       for (int i = 0; i < hosts.length; ++i)
       {
-         String host = InetAddress.getByName(hosts[i]).getHostAddress();
+         String host = InetAddress.getByName(hosts[i]).toString();
+         int index = host.indexOf("/");
+         host = (index > 0) ? host.substring(0, index) : host.substring(1);
          
          requests.clear();
 

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java	2010-11-11 04:19:45 UTC (rev 109264)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java	2010-11-11 04:32:33 UTC (rev 109265)
@@ -84,7 +84,9 @@
       
       for (int i = 0; i < hosts.length; ++i)
       {
-         String host = InetAddress.getByName(hosts[i]).getHostAddress();
+         String host = InetAddress.getByName(hosts[i]).toString();
+         int index = host.indexOf("/");
+         host = (index > 0) ? host.substring(0, index) : host.substring(1);
          
          servers[i].invoke(name, "addProxy", new Object[] { "127.0.0.1", this.proxy.getPort() }, new String[] { String.class.getName(), Integer.TYPE.getName() });
          

Modified: trunk/tomcat/src/resources/mod_cluster/mod_cluster-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/mod_cluster/mod_cluster-jboss-beans.xml	2010-11-11 04:19:45 UTC (rev 109264)
+++ trunk/tomcat/src/resources/mod_cluster/mod_cluster-jboss-beans.xml	2010-11-11 04:32:33 UTC (rev 109265)
@@ -86,13 +86,12 @@
          has nothing to do with handling of https requests by JBoss Web -->
     <property name="ssl">false</property>
     
-    <!-- Use domains to group nodes into fail-over groups -->
-    <!-- Requests stuck to a node that is no longer available with fail over to a node within the same domain, if possible -->
-    <!-- Typically used in concert with sticky sessions and buddy replication -->
-    <!--property name="domain"></property-->
+    <!-- Use load balancing groups to group nodes into fail-over groups -->
+    <!-- Requests stuck to a node that is no longer available with fail over to a node within the same load balancing group, if possible -->
+    <!--property name="loadBalancingGroup"></property-->
     
-    <!-- Should we use an HA singleton per domain? -->
-    <!--property name="masterPerDomain"></property-->
+    <!-- Should we use an HA singleton per load balancing group? -->
+    <!--property name="masterPerLoadBalancingGroup"></property-->
     
     <!-- Configuration values for the load balancer itself (must be the
          same on all nodes in the cluster). These will be passed to the