[jboss-cvs] JBossAS SVN: r109768 - in branches/JBoss-AS-6.0.x-ipv6/testsuite: imports and 2 other directories.

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

Author: rachmatowicz at jboss.com
Date: 2010-12-07 21:38:58 -0500 (Tue, 07 Dec 2010)
New Revision: 109768

Modified:
   branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
   branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
Log:
Fix up naming autodiscovery mcast address in NamingRestartUnitTestCase (JBAS-8540)

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml	2010-12-07 22:08:25 UTC (rev 109767)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml	2010-12-08 02:38:58 UTC (rev 109768)
@@ -198,6 +198,15 @@
    <property name="java.net.preferIPv6Addresses" value="true"/>
    <echo message="Using java.net.preferIPv4Stack=${java.net.preferIPv4Stack},java.net.preferIPv6Addresses=${java.net.preferIPv6Addresses}"/> 
 	
+	<!-- this autodiscovery mcast address is used by NamingRestartUnitTestCase and must vary depending on IP stack -->
+	<!-- JBAS-8540 -->
+	<condition property="jbosstest.naming.autodiscovery.mcast_addr" value="230.9.9.9" else="ff0e::9:9:9">
+	  <and>
+ 	    <isset property="java.net.preferIPv4Stack"/>
+ 	    <istrue value="${java.net.preferIPv4Stack}"/>
+	  </and>	
+	</condition>	
+	
    <!-- =================== -->
    <!-- Basic Configuration -->
    <!-- =================== -->
@@ -1776,6 +1785,8 @@
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="jbosstest.useJBM" value="true"/>
+      	 <!-- used by NamingRestartUnitTestcase -->
+         <sysproperty key="jbosstest.naming.autodiscovery.mcast_adddr" value="${jbosstest.naming.autodiscovery.mcast_addr}"/>
 
       	 <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
@@ -3034,7 +3045,6 @@
       <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
       <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
       <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
-      
 
         <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml	2010-12-07 22:08:25 UTC (rev 109767)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml	2010-12-08 02:38:58 UTC (rev 109768)
@@ -116,6 +116,8 @@
          <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />      	
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+      	 <!-- JBAS-8540 -->
+         <sysproperty key="naming.autodiscovery.mcast_addr" value="${jbosstest.naming.autodiscovery.mcast_addr}"/>
       </server>
 <!--  Configured for tests-secured, full run.conf JAVA_OPTS are not needed
 -->
@@ -129,6 +131,7 @@
          <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="naming.autodiscovery.mcast_addr" value="${jbosstest.naming.autodiscovery.mcast_addr}"/>
       </server>
       <server name="generic" config="${generic.config}" host="${node0}" >
          <jvmarg value="-Xms128m" />

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2010-12-07 22:08:25 UTC (rev 109767)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2010-12-08 02:38:58 UTC (rev 109768)
@@ -49,7 +49,8 @@
 {
    private static final String NAMING_PORT = "19099";
    private static final String HA_NAMING_PORT = "19100";
-   private static final String DISCOVERY_ADDRESS = "230.9.9.9";
+   // JBAS-8540
+   private static final String DISCOVERY_ADDRESS = System.getProperty("jbosstest.naming.autodiscovery.mcast_addr", "230.9.9.9");
    private static final String DISCOVERY_PORT = "19102";
  
    private static final String BIND_NAME = "BindName";

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2010-12-07 22:08:25 UTC (rev 109767)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2010-12-08 02:38:58 UTC (rev 109768)
@@ -103,8 +103,8 @@
       
       <property name="discoveryDisabled">false</property>
       <property name="autoDiscoveryBindAddress">${jboss.bind.address}</property>
-      <!-- We use a custom Multicast Address and port for auto-discovery -->
-      <property name="autoDiscoveryAddress">230.9.9.9</property>
+      <!-- We use a custom Multicast Address and port for auto-discovery (JBAS-8540) -->
+      <property name="autoDiscoveryAddress">${naming.autodiscovery.mcast_addr}</property>
       <property name="autoDiscoveryGroup">19102</property>
       <property name="autoDiscoveryTTL">1</property>