Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 109713)
+++ component-matrix/pom.xml	(revision 109834)
@@ -2123,7 +2123,7 @@
       <dependency>
         <groupId>org.jboss.test</groupId>
         <artifactId>jboss-test</artifactId>
-        <version>1.2.0.Beta1</version>
+        <version>1.2.0.Final</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss.logging</groupId>
@@ -2143,7 +2143,7 @@
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-server-manager</artifactId>
-        <version>1.0.4.Beta1</version>
+        <version>1.0.4.Final</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss.jbossas</groupId>
Index: testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java	(revision 109713)
+++ testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java	(revision 109834)
@@ -146,12 +146,21 @@
       
       testLoader = new ClassLoader(Thread.currentThread().getContextClassLoader()){};
       
+      // set the jgroups.bind_addr to the testsuite bind_addr
       String jgroups_bind_addr = System.getProperty("jgroups.bind_addr");
       if (jgroups_bind_addr == null)
       {
-         System.setProperty("jbosstest.cluster.node0", System.getProperty("jbosstest.cluster.node0", "localhost"));
+         System.setProperty("jgroups.bind_addr", System.getProperty("jbosstest.cluster.node0", "localhost"));
       }
+
+      // JBAS-8540 need to use a stack specific default for JGroups mcast address
+      String jgroups_udp_mcast_addr = System.getProperty("jgroups.udp.mcast_addr");
+      if (jgroups_udp_mcast_addr == null)
+      {
+         System.setProperty("jgroups.udp.mcast_addr", System.getProperty("jbosstest.jgroups.mcast_addr", "230.111.111.111"));
+      }
       
+      
       factory1 = new TestClassLoaderJChannelFactory();
       factory1.setMultiplexerConfig("cluster/channelfactory/stacks.xml");
       factory1.setAssignLogicalAddresses(false);
Index: testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java	(revision 109713)
+++ testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java	(revision 109834)
@@ -57,8 +57,12 @@
    public void testDefaults() throws Exception
    {
       ObjectName name = ObjectName.getInstance("jboss.web:type=Manager,host=localhost,path=/http-default");
-      MBeanServerConnection server = this.getServer();
       
+      // JBAS-8540 - this was failing under IPv6 and not IPv4
+      // MBeanServerConnection server = this.getServer();
+      // we are in a clustered test case; non-clustered system properties may not always be defined  
+      MBeanServerConnection server = this.getAdaptors()[0];
+      
       String[] names = new String[] {
             "cacheConfigName",
             "useJK",
Index: testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	(revision 109713)
+++ testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	(revision 109834)
@@ -143,7 +143,7 @@
     */
    public void testBasicSecuredDIIAccess() throws Exception
    {
-      String targetAddress = "http://" + getServerHost() + ":8080/ws4ee-jbws309/BasicSecured";
+      String targetAddress = "http://" + getServerHostForURL() + ":8080/ws4ee-jbws309/BasicSecured";
 
       File wsdlFile = new File("resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl");
       assertTrue("wsdl file exists", wsdlFile.exists());
Index: testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	(revision 109713)
+++ testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	(revision 109834)
@@ -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";
Index: testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java	(revision 109713)
+++ testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java	(revision 109834)
@@ -77,7 +77,8 @@
       return new ObjectName("jboss.test:service=InvokerTest,secured=true");
    }
    // JBAS-8540
-   static final String TARGET_SERVER_FOR_URL = System.getProperty("jbosstest.server.host.url", "localhost");
+   // use JBossTestCase.getServerHost() instead
+   // static final String TARGET_SERVER_FOR_URL = System.getProperty("jbosstest.server.host.url", "localhost");
    private MBeanServerConnection getJMXServer() throws Exception
    {
       HashMap env = new HashMap();
@@ -92,7 +93,7 @@
          env.put(JMXConnector.CREDENTIALS, creds);
       }
 
-      JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"+TARGET_SERVER_FOR_URL+":1090/jmxrmi");
+      JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"+getServerHostForURL()+":1090/jmxrmi");
       JMXConnector jmxc = JMXConnectorFactory.connect(url, env);
       MBeanServerConnection adaptor = jmxc.getMBeanServerConnection();
       return adaptor;
Index: testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml
===================================================================
--- testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml	(revision 109713)
+++ testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml	(revision 109834)
@@ -8,7 +8,7 @@
   <service-ref>
     <service-ref-name>service/HelloWorldService</service-ref-name>
     <!--config-name>Standard WSSecurity Client</config-name-->
-    <wsdl-override>http://@jbosstest.host.name@:8080/webservice-jbas5614?wsdl</wsdl-override>
+    <wsdl-override>http://@jbosstest.host.nameforurl@:8080/webservice-jbas5614?wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>
Index: testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl	(revision 109713)
+++ testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl	(revision 109834)
@@ -29,7 +29,7 @@
   </binding>
   <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/jaxws-endpoint"/>
+      <soap:address location="http://@jbosstest.host.nameforurl@:8080/jaxws-endpoint"/>
     </port>
   </service>
 </definitions>
Index: testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl
===================================================================
--- testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl	(revision 109713)
+++ testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl	(revision 109834)
@@ -27,10 +27,10 @@
  </binding>
  <service name="OrganizationService">
   <port name="BasicSecuredPort" binding="tns:OrganizationBinding">
-   <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/BasicSecured"/>
+   <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/BasicSecured"/>
   </port>
   <port name="RoleSecuredPort" binding="tns:OrganizationBinding">
-   <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/RoleSecured"/>
+   <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/RoleSecured"/>
   </port>
  </service>
 </definitions>
Index: testsuite/src/resources/webservice/jbws309/wstools-config.xml
===================================================================
--- testsuite/src/resources/webservice/jbws309/wstools-config.xml	(revision 109713)
+++ testsuite/src/resources/webservice/jbws309/wstools-config.xml	(revision 109834)
@@ -36,10 +36,10 @@
 
   <service name="OrganizationService">
     <port name="BasicSecuredPort" binding="tns:OrganizationBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/BasicSecured"/>
+      <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/BasicSecured"/>
     </port>
     <port name="RoleSecuredPort" binding="tns:OrganizationBinding">
-      <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/RoleSecured"/>
+      <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/RoleSecured"/>
     </port>
   </service>
 
Index: testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml
===================================================================
--- testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml	(revision 109713)
+++ testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml	(revision 109834)
@@ -9,7 +9,8 @@
 
   <service-ref>
     <service-ref-name>service/HelloService</service-ref-name>
-    <wsdl-override>http://@jbosstest.host.name@:8080/admindevel?wsdl</wsdl-override>
+    <!-- JBAS-8540 -->
+    <wsdl-override>http://@jbosstest.host.nameforurl@:8080/admindevel?wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>
Index: testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
===================================================================
--- testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	(revision 109713)
+++ testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	(revision 109834)
@@ -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>
 
Index: testsuite/imports/sections/webservice.xml
===================================================================
--- testsuite/imports/sections/webservice.xml	(revision 109713)
+++ testsuite/imports/sections/webservice.xml	(revision 109834)
@@ -11,7 +11,8 @@
         <include name="**/*.xml"/>
       </fileset>
       <filterset>
-        <filter token="jbosstest.host.name" value="${node0}"/>
+      	<!-- JBAS-8540 -->
+        <filter token="jbosstest.host.nameforurl" value="${node0.url}"/>
       </filterset>
     </copy>
     <!-- Copy binary files -->
Index: testsuite/imports/server-config.xml
===================================================================
--- testsuite/imports/server-config.xml	(revision 109713)
+++ testsuite/imports/server-config.xml	(revision 109834)
@@ -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" />
@@ -905,6 +908,8 @@
             <jvmarg line="@{jvmargs}" />
      	    <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
             <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+            <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+            <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
             <arg value="-c"/>
             <arg value="@{conf}"/>
             <arg value="-b"/>
Index: testsuite/build.xml
===================================================================
--- testsuite/build.xml	(revision 109713)
+++ testsuite/build.xml	(revision 109834)
@@ -198,6 +198,24 @@
    <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>	
+	
+	<!-- this mcast address is used by JChannelFactoryClassLoaderLeakTestCase and must vary depending on IP stack -->
+	<!-- JBAS-8540 -->
+	<condition property="jbosstest.jgroups.mcast_addr" value="230.111.111.111" else="ff0e::111:111:111">
+	  <and>
+ 	    <isset property="java.net.preferIPv4Stack"/>
+ 	    <istrue value="${java.net.preferIPv4Stack}"/>
+	  </and>	
+	</condition>	
+	
    <!-- =================== -->
    <!-- Basic Configuration -->
    <!-- =================== -->
@@ -1713,6 +1731,8 @@
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="jbosstest.useJBM" value="true"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
       	 <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
@@ -1776,6 +1796,10 @@
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="jbosstest.useJBM" value="true"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+      	 <!-- used by NamingRestartUnitTestcase -->
+         <sysproperty key="jbosstest.naming.autodiscovery.mcast_adddr" value="${jbosstest.naming.autodiscovery.mcast_addr}"/>
 
       	 <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
@@ -1821,7 +1845,9 @@
          <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -1876,6 +1902,8 @@
          <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />    	
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -1976,6 +2004,8 @@
             value="${build.resources}/security/auth.conf"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <classpath>
             <pathelement location="${build.resources}"/>
@@ -2222,6 +2252,8 @@
       <sysproperty key="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+      <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+      <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
@@ -2274,7 +2306,10 @@
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
          <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -2336,6 +2371,8 @@
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
          <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -2382,7 +2419,10 @@
          <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -2428,6 +2468,8 @@
 
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <classpath>
             <pathelement location="${build.classes}"/>
@@ -2474,6 +2516,8 @@
 
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <classpath>
             <pathelement location="${build.classes}"/>
@@ -2519,6 +2563,8 @@
 
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <classpath>
             <pathelement location="${build.classes}"/>
@@ -2578,7 +2624,10 @@
          <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -2624,6 +2673,8 @@
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+      <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+      <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -2669,6 +2720,8 @@
        <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
        <sysproperty key="build.testlog" value="${build.testlog}"/>
        <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+       <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+       <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
        <!-- Pass along any jbosstest.* system properties -->
        <syspropertyset>
           <propertyref prefix="jbosstest."/>
@@ -2725,7 +2778,10 @@
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+      	
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -2786,7 +2842,9 @@
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+      	<!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
          </syspropertyset>
@@ -2861,6 +2919,8 @@
          <sysproperty key="jndi.bind.name" value="JAXR"/>
          <sysproperty key="jaxr.debug" value="true"/>
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />    	
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -3034,8 +3094,10 @@
       <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}"/>
-      
 
+      <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+      <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+    	    	
         <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -3108,6 +3170,8 @@
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
       <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="jbosstest.useJBM" value="true"/>
+      <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+      <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
         <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
@@ -3177,6 +3241,8 @@
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
       <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+      <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+      <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3339,6 +3405,8 @@
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
          <sysproperty key="jbosstest.iterationcount" value="2"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <classpath>
             <pathelement location="${build.classes}"/>
@@ -3406,6 +3474,8 @@
          <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
          <sysproperty key="jbosstest.server.host" value="${node0}"/>
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -3459,6 +3529,8 @@
          <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
          <sysproperty key="build.testlog" value="${build.testlog}"/>
          <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
          <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
          <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
@@ -3625,6 +3697,8 @@
         <sysproperty key="build.testlog" value="${build.testlog}"/>
         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
         <sysproperty key="jbosstest.secure" value="true"/>
+        <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+        <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
         <!-- Pass along any jbosstest.* system properties -->
         <syspropertyset>
            <propertyref prefix="jbosstest."/>
@@ -3706,6 +3780,8 @@
          <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
          <sysproperty key="jbosstest.resource1.server.host" value="${node2}"/>
          <sysproperty key="jbosstest.resource2.server.host" value="${node3}"/>
+         <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+         <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
          <!-- Pass along any jbosstest.* system properties -->
          <syspropertyset>
             <propertyref prefix="jbosstest."/>
@@ -4024,6 +4100,8 @@
        <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
        <sysproperty key="jbosstest.server.host" value="${node0}"/>
        <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+       <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+       <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
        <!-- Pass along any jbosstest.* system properties -->
        <syspropertyset>
          <propertyref prefix="jbosstest."/>