[jboss-cvs] JBossAS SVN: r97056 - in branches/JBPAPP_4_2_0_GA_CP_IPV6: ejb3/src/test/org/jboss/ejb3/test/iiop/unit and 25 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Nov 26 19:52:16 EST 2009


Author: rachmatowicz at jboss.com
Date: 2009-11-26 19:52:15 -0500 (Thu, 26 Nov 2009)
New Revision: 97056

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build-integration.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java
Log:
Review of fixes to jbosstest.server.host and JBossTestcase.getServerHost() (JBPAPP-2997) 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -123,7 +123,8 @@
       Properties env = new Properties();
       env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
       env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
-      env.put(Context.PROVIDER_URL, getServerHost() + ":1100");
+      // JBPAPP-2997
+      env.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100");
       
       return new InitialContext(env);
    }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -68,7 +68,8 @@
    {
       Properties props = new Properties();
       props.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
-      props.put("java.naming.provider.url", "corbaloc::"+ getServerHost() + ":3528/NameService");
+      // JBPAPP-2997
+      props.put("java.naming.provider.url", "corbaloc::"+ getServerHostForURL() + ":3528/NameService");
       props.put("java.naming.factory.object", "org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory");
       props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client:org.jnp.interfaces");
       props.put("j2ee.clientName", "iiop-unit-test");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -50,7 +50,8 @@
    {
  //     Properties props = new Properties();
  //     props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
- //     props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ //     JBPAPP-2997
+ //     props.put("java.naming.provider.url", "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
  //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
  //     InitialContext jndiContext = new InitialContext(props);
       InitialContext jndiContext = new InitialContext();
@@ -66,8 +67,9 @@
 	   setHostNameVerifier();
 	  
  //     Properties props = new Properties();
- //     props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
- //     props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ //     props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
+ //     JBPAPP-2997
+ //     props.put("java.naming.provider.url", "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
  //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
  //     InitialContext jndiContext = new InitialContext(props);
       InitialContext jndiContext = new InitialContext();

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -54,6 +54,7 @@
          jndiProps = new java.util.Properties();
          jndiProps.load(url.openStream());
          // String host = System.getProperty("jbosstest.server.host", "localhost");
+         // JBPAPP-2997
          String corbaloc = "corbaloc::"+getServerHostForURL()+":3528/JBoss/Naming/root";
          jndiProps.setProperty("java.naming.provider.url", corbaloc);
       }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -375,6 +375,7 @@
     * Get the JBoss server host from system property "jbosstest.server.host"
     * in a form suitable for use in URLs (IPv6 literals must be enclosed in
     * square brackets). This defaults to localhost.
+    * JBPAPP-2997
     */
    public String getServerHostForURL()
    {

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -456,6 +456,7 @@
    /**
     * Returns the JBoss server host from system property "jbosstest.server.host"
     * in a form suitable for includion in URLs.This defaults to "localhost"
+    * JBPAPP-2997
     */
    public String getServerHostForURL()
    {

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build-integration.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build-integration.xml	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build-integration.xml	2009-11-27 00:52:15 UTC (rev 97056)
@@ -25,18 +25,19 @@
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
 
-    <property name="build.testlog" value="${build.testlog}"/>
-    <property name="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-    <property name="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
-    <property name="java.naming.provider.url" value="${node0.jndi.url}"/>
-    <property name="jbosstest.server.host" value="${node0}"/>
+    <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.naming.provider.url" value="${node0.jndi.url}"/>
+    <sysproperty key="jbosstest.server.host" value="${node0}"/>
+    <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
 
-    <propertyset id="wsrp-tests-props">
+    <syspropertyset id="wsrp-tests-props">
       <propertyref name="build.testlog"/> 
       <propertyref name="log4j.configuration"/> 
       <propertyref prefix="java."/>
       <propertyref name="jbosstest.server.host"/>
-    </propertyset>
+    </syspropertyset>
 	
     <run-junit junit.patternset="wsrp.includes"
        junit.configuration="WSRP-Integration"

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml	2009-11-27 00:52:15 UTC (rev 97056)
@@ -1889,6 +1889,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -1935,6 +1936,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -2019,6 +2021,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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="jboss-junit-configuration" value="tests-cc-unit"/>
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
@@ -2062,6 +2065,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -2214,6 +2218,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -2403,6 +2408,7 @@
       <jvmarg value="-Xms256m"/>
       <jvmarg value="-Xmx256m"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="jboss.dist" file="${jboss.dist}"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2444,6 +2450,7 @@
 
       <jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -2496,6 +2503,7 @@
     <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
       timeout="${junit.timeout}" jvm="${junit.jvm}">
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -2530,6 +2538,7 @@
     <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
       timeout="${junit.timeout}" jvm="${junit.jvm}">
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
       <sysproperty key="jboss.aop.path" file="${source.resources}/aop/META-INF/jboss-aop.xml"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
@@ -2573,6 +2582,7 @@
 
       <jvmarg value="-Djava.security.manager"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
       <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2613,6 +2623,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <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"/>
 
@@ -2649,6 +2660,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <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"/>
 
@@ -2684,6 +2696,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <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"/>
 
@@ -2730,6 +2743,7 @@
       <jvmarg value="-Djava.security.manager"/>
       <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.security.policy" value="${build.resources}/security/tst.policy"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2769,6 +2783,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -2813,6 +2828,7 @@
 
       <jvmarg value="-Djava.security.manager"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
       <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2866,6 +2882,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -2986,6 +3003,7 @@
       <jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/>
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -3041,6 +3059,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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}"/>
 
       <classpath>
         <pathelement location="${build.classes}"/>
@@ -3087,6 +3106,7 @@
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <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 -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3125,6 +3145,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -3178,11 +3199,11 @@
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <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="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <sysproperty key="jbosstest.secure" value="true"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
-      <sysproperty key="jbosstest.server.host" value="${node0}"/>
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3230,6 +3251,7 @@
 
       <jvmarg value="${junit.jvm.options}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <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"/>
@@ -3292,11 +3314,11 @@
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <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="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <sysproperty key="jbosstest.secure" value="true"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
-      <sysproperty key="jbosstest.server.host" value="${node0}"/>
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3348,11 +3370,11 @@
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <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="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <sysproperty key="jbosstest.secure" value="true"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
-      <sysproperty key="jbosstest.server.host" value="${node0}"/>
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3392,6 +3414,7 @@
       <!-- Used for JGroups -->
       <jvmarg value="-Dbind.address=${node0}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+      <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -3711,6 +3734,7 @@
       <sysproperty key="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/>
       <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="jbosstest.secure" value="false"/>
       <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml	2009-11-27 00:52:15 UTC (rev 97056)
@@ -843,6 +843,7 @@
             <sysproperty key="jboss-junit-configuration" value="@{junit.configuration}"/>
             <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.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
 
             <syspropertyset>

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -48,8 +48,9 @@
 public class BindingServiceUnitTestCase
    extends JBossTestCase
 {
-   static final String SERVER0_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1199";
-   static final String SERVER1_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1299";
+   // JBPAPP-2997
+   static final String SERVER0_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url","localhost") + ":1199";
+   static final String SERVER1_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url","localhost") + ":1299";
    static HashSet VALID_STATES = new HashSet();
 
    static

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -68,6 +68,7 @@
 
       p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
       p_.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
+      // JBPAPP-2997
       p_.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       obj = new InitialContext(p_).lookup(TreeCacheMBeanTesterHome.JNDI_NAME);
       cache_home = (TreeCacheMBeanTesterHome) PortableRemoteObject.narrow(obj, TreeCacheMBeanTesterHome.class);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -56,7 +56,8 @@
    {
       Hashtable props = new Hashtable();
       props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      props.put(Context.PROVIDER_URL, getServerHost() + ":1099");
+      // JBPAPP-2997
+      props.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       Context ctx = new InitialContext(props);
       CacheObjectMeanTesterHome home = (CacheObjectMeanTesterHome)ctx.lookup(
               CacheObjectMeanTesterHome.JNDI_NAME);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -70,7 +70,8 @@
 
       p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
       p_.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
-      p_.put(Context.PROVIDER_URL, getServerHost() + ":1099");
+      // JBPAPP-2997
+      p_.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       obj = new InitialContext(p_).lookup(TreeCacheAopMBeanTesterHome.JNDI_NAME);
       cache_home = (TreeCacheAopMBeanTesterHome) PortableRemoteObject.narrow(obj, TreeCacheAopMBeanTesterHome.class);
    }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -75,6 +75,7 @@
       for (int i = 0; i < ejbs.length; i++)
          removeClassLoader(ejbs[i]);
       
+      // JBPAPP-2997
       baseURL = "http://" + getServerHostForURL() + ":8080/" + getWarContextPath() + "/";
    }
    

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -113,6 +113,7 @@
       try
       {
          deploy("log4j113.war");
+         // JBPAPP-2997
          URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/log4j113/Log4jServlet/");
          InputStream reply = (InputStream) log4jServletURL.getContent();
          getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/log4j113/Log4jServlet/");
@@ -143,6 +144,7 @@
       try
       {
          deploy("common-logging.war");
+         // JBPAPP-2997
          URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/common-logging/Log4jServlet/");
          InputStream reply = (InputStream) log4jServletURL.getContent();
          getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/common-logging/Log4jServlet/");
@@ -169,6 +171,7 @@
       try
       {
          deploy("cl11-withjar.war");
+         // JBPAPP-2997
          URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/cl11-withjar/Log4jServlet/?log-name=cl11-withjar.log");
          InputStream reply = (InputStream) log4jServletURL.getContent();
          getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/cl11-withjar/Log4jServlet/");
@@ -196,6 +199,7 @@
       try
       {
          deploy("oldxerces.war");
+         // JBPAPP-2997
          URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/oldxerces/");
          InputStream reply = (InputStream) servletURL.getContent();
          getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/oldxerces/");
@@ -314,6 +318,7 @@
       {
          deploy("shared-jndi.sar");
          deploy("shared-jndi.war");
+         // JBPAPP-2997
          URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/shared-jndi/LookupServlet");
          InputStream reply = (InputStream) servletURL.getContent();
          getLog().debug("Accessed: "+servletURL);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -106,7 +106,8 @@
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
          "org.jnp.interfaces.NamingContextFactory");
       env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
-      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099");
+      // JBPAPP-2997
+      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       env.setProperty("j2ee.clientName", "test-client");
       InitialContext ctx = new InitialContext(env);
       Context enc = (Context) ctx.lookup("java:comp/env");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -48,7 +48,8 @@
     /**
      * The Servernames should be configurable.
      */
-	private String[] servernames= {"jnp://" + getServerHost() + ":1099", "jnp://" + getServerHost() + ":1199"};
+    // JBPAPP-2997
+	private String[] servernames= {"jnp://" + getServerHostForURL() + ":1099", "jnp://" + getServerHostForURL() + ":1199"};
 	
 	/**
 	 * The main properties file that should be under src/resources/cluster

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -55,10 +55,12 @@
     */ 
    public void testWithInvalidDefaultJndiContext() throws Exception
    {
-      System.setProperty(Context.PROVIDER_URL, getServerHost() + ":65535");
+	  // JBPAPP-2997
+      System.setProperty(Context.PROVIDER_URL, getServerHostForURL() + ":65535");
       Properties env = new Properties(System.getProperties());
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.NamingContextFactory");
-      env.setProperty(Context.PROVIDER_URL, getServerHost() + ":1099");
+      // JBPAPP-2997
+      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       env.setProperty("jnp.disableDiscovery", "true");
       InitialContext ctx = new InitialContext(env);
       UserTransaction ut = (UserTransaction) ctx.lookup("UserTransaction");
@@ -85,7 +87,8 @@
    public void testWithDefaultJndiContext() throws Exception
    {
       log.info("+++ testWithDefaultJndiContext");
-      System.setProperty(Context.PROVIDER_URL, getServerHost() + ":1099");
+      // JBPAPP-2997
+      System.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       InitialContext ctx = new InitialContext();
       UserTransaction ut = (UserTransaction) ctx.lookup("UserTransaction");
       ut.getStatus();

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -340,7 +340,8 @@
    private void assertServletAccess(String context) throws IOException
    {
       // Check that we can access the servlet
-      URL servletURL = new URL("http://" + getServerHost() + ":8080/" + context);
+	  // JBPAPP-2997
+      URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/" + context);
       BufferedReader br = new BufferedReader(new InputStreamReader(servletURL.openStream()));
       String message = br.readLine();
       assertEquals("Hello World!", message);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -89,7 +89,8 @@
          // Prepare the template properties
          HashMap props = new HashMap();
          props.put("jndi-name", "TestNoTxDataSource");
-         props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHost() + ":1701");
+         // JBPAPP-2997
+         props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHostForURL() + ":1701");
          props.put("driver-class", "org.hsqldb.jdbcDriver");
          
          // Add some fake connection properties
@@ -190,7 +191,8 @@
          HashMap props = new HashMap();
          props.put("jndi-name", jndiName);   // use a name other than default
          props.put("use-java-context", new Boolean(false)); // set this to false to allow remote lookup
-         props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHost() + ":1701"); // using hsqldb
+         // JBPAPP-2997
+         props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHostForURL() + ":1701"); // using hsqldb
          props.put("driver-class", "org.hsqldb.jdbcDriver");
          props.put("user-name", "sa");
          props.put("password", "");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -58,18 +58,19 @@
       super(name);
       URL url;
       // String host = System.getProperty("jbosstest.server.host", "localhost");
-      String host = getServerHostForURL() ; 
+      // JBPAPP-2997
+      String hostForURL = getServerHostForURL() ; 
       
       url = ClassLoader.getSystemResource("iiop.jndi.properties");
       iiopJndiProps = new java.util.Properties();
       iiopJndiProps.load(url.openStream());
-      String jnp = "jnp://"+host+":1099/iiop";
+      String jnp = "jnp://"+hostForURL+":1099/iiop";
       iiopJndiProps.setProperty("java.naming.provider.url", jnp);
 
       url = ClassLoader.getSystemResource("cosnaming.jndi.properties");
       cosnamingJndiProps = new java.util.Properties();
       cosnamingJndiProps.load(url.openStream());
-      String corbaloc = "corbaloc::"+host+":3528/JBoss/Naming/root";
+      String corbaloc = "corbaloc::"+hostForURL+":3528/JBoss/Naming/root";
       cosnamingJndiProps.setProperty("java.naming.provider.url", corbaloc);
    }
    

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -101,6 +101,7 @@
       Properties props = new Properties();
       props.setProperty(HTTPServerILFactory.SERVER_IL_FACTORY_KEY, HTTPServerILFactory.SERVER_IL_FACTORY);
       props.setProperty(HTTPServerILFactory.CLIENT_IL_SERVICE_KEY, HTTPServerILFactory.CLIENT_IL_SERVICE);
+      // JBPAPP-2997
       props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHostForURL() + ":8080/jbossmq-httpil/HTTPServerILServlet");
       props.setProperty(HTTPServerILFactory.PING_PERIOD_KEY, "0");
       props.setProperty(HTTPServerILFactory.TIMEOUT_KEY, "60");
@@ -129,6 +130,7 @@
       Properties props = new Properties();
       props.setProperty(HTTPServerILFactory.SERVER_IL_FACTORY_KEY, HTTPServerILFactory.SERVER_IL_FACTORY);
       props.setProperty(HTTPServerILFactory.CLIENT_IL_SERVICE_KEY, HTTPServerILFactory.CLIENT_IL_SERVICE);
+      // JBPAPP-2997
       props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHostForURL() + ":8080/jbossmq-httpil/restricted/HTTPServerILServlet");
       props.setProperty(HTTPServerILFactory.PING_PERIOD_KEY, "0");
       props.setProperty(HTTPServerILFactory.TIMEOUT_KEY, "60");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -444,6 +444,7 @@
 
    private Properties createNamingEnvironment(String port)
    {
+	  // JBPAPP-2997
       String namingURL = getServerHostForURL() + ":" + port;
       Properties env = new Properties();
       env.setProperty(Context.PROVIDER_URL, namingURL);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -60,6 +60,7 @@
       getLog().debug("+++ testCreateSubcontext");
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
       env.setProperty("jnp.disableDiscovery", "true");
       InitialContext ctx = new InitialContext(env);
@@ -87,6 +88,7 @@
       getLog().debug("+++ testLookup");
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
       env.setProperty("jnp.disableDiscovery", "true");
       InitialContext ctx = new InitialContext(env);
@@ -123,6 +125,7 @@
       getLog().info("+++ testSharedLookup");
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
       env.setProperty("jnp.disableDiscovery", "true");
       InitialContext ctx = new InitialContext(env);
@@ -141,6 +144,7 @@
       // Look a name that does not exist
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
       env.setProperty("jnp.disableDiscovery", "true");
       InitialContext ctx = new InitialContext(env);
@@ -156,6 +160,7 @@
 
       // Do a lookup on an server port that does not exist
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
       env.setProperty("jnp.disableDiscovery", "true");
       log.debug("Creating InitialContext with env="+env);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -86,6 +86,7 @@
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
 
       // Test the secured JNDI factory
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/restricted/JNDIFactory");
       getLog().debug("Creating InitialContext with env="+env);
 
@@ -123,6 +124,7 @@
       lc.login();
 
       // Test the secured JNDI factory
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/restricted/JNDIFactory");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);
@@ -173,6 +175,7 @@
 
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/ReadOnlyJNDIFactory");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);
@@ -229,6 +232,7 @@
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
          "org.jboss.test.naming.test.BootstrapNamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
       env.setProperty("bootstrap-binding", "naming/Naming");
       getLog().debug("Creating bootstrap InitialContext with env="+env);
@@ -307,6 +311,7 @@
       Properties env = new Properties();
       // Try with a login that should succeed
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.LoginInitialContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
       env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
       env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
@@ -354,6 +359,7 @@
       Properties env = new Properties();
       // Try with a login that should succeed
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.LoginInitialContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
       env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
       env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
@@ -396,6 +402,7 @@
       Properties env = new Properties();
       // Try with a login that should succeed
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
       env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
       env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
@@ -433,6 +440,7 @@
       Properties env = new Properties();
       // Try with a login that should succeed
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
       env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
       env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -114,6 +114,7 @@
    {
       getLog().debug("+++ testLookup");
       InitialContext ctx = getInitialContext();
+      // JBPAPP-2997
       Name name = ctx.getNameParser("").parse("jnp://" + getServerHostForURL() + "/jmx");
       Name copy = (Name) name.clone();
       Object obj = ctx.lookup(name);
@@ -143,6 +144,7 @@
 
       // Do a lookup on an server port that does not exist
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
       env.setProperty("jnp.disableDiscovery", "true");
       getLog().debug("Creating InitialContext with env="+env);
@@ -162,6 +164,7 @@
    {
       getLog().debug("+++ testHaInvoker");
       Properties env = new Properties();
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);
@@ -189,6 +192,7 @@
       // Look a name that does not exist
       java.util.Properties env = new java.util.Properties();
       env.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(javax.naming.Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
       getLog().debug("Creating InitialContext with env="+env);
 
@@ -236,6 +240,7 @@
       getLog().debug("+++ testHjnp.localAddressaParitionName");
       Properties env = new Properties();
       String serverHost = getServerHost();
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
       env.setProperty("jnp.localAddress", serverHost);      
       env.setProperty("jnp.partitionName", "DefaultPartition");
@@ -263,6 +268,7 @@
       ctx.close();
 
       // Now test discovery with a non-existent parition name
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
       env.setProperty("jnp.partitionName", "__NotTheDefaultPartition__");
       try
@@ -287,6 +293,7 @@
       getLog().debug("+++ testDiscoveryPort");
       Properties env = new Properties();
       String serverHost = getServerHost();
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
       env.setProperty("jnp.localAddress", serverHost);      
       env.setProperty("jnp.discoveryPort", "1102");
@@ -319,6 +326,7 @@
       getLog().debug("+++ testHttpInvoker");
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
+      // JBPAPP-2997
       env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -97,6 +97,7 @@
     */
    public void testCustomPrincipalTransmissionInVM() throws Exception
    { 
+	  // JBPAPP-2997
       String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
       HttpClient httpConn = new HttpClient();
       GetMethod indexGet = new GetMethod(baseURLNoAuth + "custom-principal/");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -141,6 +141,7 @@
       getLog().debug("Created serverSocket: "+serverSocket);
       int port = serverSocket.getLocalPort();
       InetAddress addr = serverSocket.getInetAddress();
+      // JBPAPP-2997
       httpsURL = "https://" + getServerHostForURL() + ":" + port + '/';
       AcceptThread thread = new AcceptThread(serverSocket, getLog(), httpsURL);
       synchronized( httpsURL )

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -371,7 +371,8 @@
 			String jdbcURL = "";
 			try
          {
-         	jdbcURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+			// JBPAPP-2997
+         	jdbcURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1701";
          	con = DriverManager.getConnection(jdbcURL, user, pass);
 			}
          catch(java.sql.SQLException sqle)

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -83,7 +83,8 @@
    protected void tearDown() throws Exception
    {
       Class.forName("org.hsqldb.jdbcDriver");
-      String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+	  // JBPAPP-2997
+      String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1701";
       Connection conn = DriverManager.getConnection(dbURL, "sa", "");
       Statement statement = conn.createStatement();      
       statement.executeQuery("SHUTDOWN COMPACT");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -45,7 +45,8 @@
 public class HttpUtils
 {
    private static Logger log = Logger.getLogger(HttpUtils.class);
-   private static String hostForURL = fixHostnameForURL(System.getProperty("jbosstest.server.host", "localhost")) ;
+   // JBPAPP-2997
+   private static String hostForURL = System.getProperty("jbosstest.server.host.url", "localhost") ;
    private static String baseURL = "http://jduke:theduke@" + hostForURL + ":" + Integer.getInteger("web.port", 8080) + "/"; 
    private static String baseURLNoAuth = "http://" + hostForURL + ":" + Integer.getInteger("web.port", 8080) + "/"; 
 
@@ -174,18 +175,4 @@
       }
       return request;
    }
-   
-   /*
-    * This method generates a hostname suitable for inclusion in URLs,
-    * taking into account required treatnment of IPv6 literals (RFC2732).
-    */
-   public static String fixHostnameForURL(String host) {
-	   if (host == null)
-		   return host ;
-	   
-	   if (host.indexOf(":") != -1) 
-		   return "[" + host + "]" ;
-	   else 
-		   return host ;
-   }
 }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -37,6 +37,7 @@
 public class AuthenticatorsExternalizationTestCase extends JBossTestCase
 { 
    MBeanServerConnection server = null;
+   // JBPAPP-2997
    private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/"; 
    
    

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -45,6 +45,7 @@
  */
 public class CustomHeaderAuthTestCase extends JBossTestCase
 { 
+   // JBPAPP-2997
    private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/"; 
    private HttpClient httpConn = new HttpClient();
    

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -49,6 +49,7 @@
 public class FormAuthUnitTestCase extends JBossTestCase
 {
    // private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/"; 
+   // JBPAPP-2997
    private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth() ;
    private HttpClient httpConn = new HttpClient();
 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -37,7 +37,7 @@
  */
 public class RemoteClassloadingServiceUnitTestCase extends JBossTestCase
 {
-   static final String baseURL = "http://" + HttpUtils.fixHostnameForURL(System.getProperty("jbosstest.server.host", "localhost")) + ":8083/";
+   static final String baseURL = "http://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":8083/";
    
    public RemoteClassloadingServiceUnitTestCase(String name)
    {

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -33,6 +33,7 @@
  */
 public class SingleSignOnUnitTestCase extends JBossTestCase
 {
+   // JBPAPP-2997
    private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080); 
 
    public SingleSignOnUnitTestCase(String name)

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -227,6 +227,7 @@
       getLog().info("Accessing SecureServlet with valid login");
       HttpUtils.accessURL(url);
       // String baseURL2 = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+      // JBPAPP-2997
       String baseURL2 = HttpUtils.getBaseURLNoAuth() ;
       URL url2 = new URL(baseURL2+"jbosstest/restricted/UnsecureEJBServlet");
       getLog().info("Accessing SecureServlet with no login");
@@ -237,6 +238,7 @@
    public void testSecureServletWithBadPass() throws Exception
    {
       // String baseURL = "http://jduke:badpass@" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+	  // JBPAPP-2997
       String baseURL = HttpUtils.getBaseURL("jduke", "badpass") ;
       URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
       HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
@@ -246,6 +248,7 @@
    public void testSecureServletWithNoLogin() throws Exception
    {
       // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+	  // JBPAPP-2997
       String baseURL = HttpUtils.getBaseURLNoAuth() ;
       URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
       HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
@@ -255,6 +258,7 @@
    public void testNotJbosstest() throws Exception
    {
       // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+	  // JBPAPP-2997
 	  String baseURL = HttpUtils.getBaseURLNoAuth() ;
       URL url = new URL(baseURL+"jbosstest-not/unrestricted/SecureServlet");
       HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -341,6 +345,7 @@
       {
          deploy("jbosstest-web2.ear");
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          URL url = new URL(baseURL+"jbosstest-not2/unrestricted/SecureServlet");
          HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -375,6 +380,7 @@
       {
          deploy("good-web.war");
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          URL url = new URL(baseURL+"redeploy/index.html");
          HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -396,6 +402,7 @@
       try
       {
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          URL url = new URL(baseURL+"manifest/classpath.jsp");
          HttpMethodBase request = HttpUtils.accessURL(url);
@@ -429,6 +436,7 @@
       {
          deploy("jbosstest-good.ear");
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          URL url = new URL(baseURL+"redeploy/index.html");
          HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -456,6 +464,7 @@
       try
       {
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          // Load a log4j class
          URL url = new URL(baseURL+"class-loading/ClasspathServlet2?class=org.apache.log4j.net.SocketAppender");
@@ -487,6 +496,7 @@
       try
       {
          // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+         // JBPAPP-2997
          String baseURL = HttpUtils.getBaseURLNoAuth() ;
          // Load a log4j class
          URL url = new URL(baseURL+"class-loading-ulr/ClasspathServlet2?class=org.apache.log4j.net.SocketAppender");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -40,6 +40,7 @@
  */
 public class WebProgrammaticLoginTestCase extends JBossTestCase
 { 
+   // JBPAPP-2997
    private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/"; 
    private HttpClient httpConn = new HttpClient();
 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -37,6 +37,7 @@
  */
 public class SSLUnitTestCase extends JBossTestCase
 {
+   // JBPAPP-2997
    private String baseHttpNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/"; 
    private String baseHttpsNoAuth = "https://" + getServerHostForURL() + ":" + Integer.getInteger("secureweb.port", 8443) + "/"; 
 
@@ -64,6 +65,7 @@
       log.info("+++ testHttpRedirectSecurityDomain");
       int port = Integer.getInteger("web.port", 8080).intValue();
       port += 1000;
+      // JBPAPP-2997
       String httpNoAuth = "http://" + getServerHostForURL() + ":" + port + "/";
       doHttpRedirect(httpNoAuth);
    }
@@ -83,6 +85,7 @@
       log.info("+++ testHttps");
       int port = Integer.getInteger("secureweb.port", 8443).intValue();
       port += 1000;
+      // JBPAPP-2997
       String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
       doHttps(httpsNoAuth);
    }
@@ -96,6 +99,7 @@
       log.info("+++ testHttps");
       int port = Integer.getInteger("secureweb.port", 8443).intValue();
       port += 1500;
+      // JBPAPP-2997
       String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
       doHttps(httpsNoAuth);
    }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -27,6 +27,11 @@
 import javax.naming.InitialContext;
 import javax.xml.rpc.Service;
 
+import java.net.URL ;
+import java.io.BufferedReader ;
+import java.io.InputStreamReader ;
+import java.io.IOException ;
+
 /** A test for the examples from the JBoss Admin Devel book.
  *
  * @author Thomas.Diesler at jboss.org
@@ -54,10 +59,35 @@
       {
          InitialContext iniCtx = getClientContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+         // debugging
+         URL wsdl = service.getWSDLDocumentLocation() ;
+         printURLContents(wsdl) ;
+         
          helloPort = (Hello)service.getPort(Hello.class);
       }
    }
 
+   private void printURLContents(URL url) {
+	   BufferedReader in = null ;
+	   String inputLine = null ;
+	   
+	   // the WSDL URL is correct
+	   // the WSDL contents are incorrect, carrying an invalid soap:address location=
+	   log.debug("URL = " + url + ": contents: START") ;
+	   
+	   try {
+	   in = new BufferedReader(new InputStreamReader(url.openStream())) ;
+	   
+	   while ((inputLine = in.readLine()) != null)
+	    log.debug(inputLine);
+	   
+	   in.close();
+	   } catch(IOException e) {
+		   e.printStackTrace() ;
+	   }
+	   log.debug("URL contents: END") ;
+   }
+   
    public void testHelloString() throws Exception
    {
 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -66,8 +66,9 @@
  */
 public class MarkupTestCase extends WebserviceTestBase
 { 
+    // JBPAPP-2997
    private String url = "http://" 
-                 + getServerHost() + ":" 
+                 + getServerHostForURL() + ":" 
                  + Integer.getInteger("web.port", 8080) + "/wsrp/MarkupService"; 
    
    public MarkupTestCase(String name)

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -84,10 +84,11 @@
    public void testGetPortletDescriptionDynamicEndpoint() throws Exception
    {
       Service service = getService();
+      // JBPAPP-2997
       WSRP_v1_PortletManagement_PortType endpoint =
          (WSRP_v1_PortletManagement_PortType)service.getPort(WSRP_v1_PortletManagement_PortType.class);
       ((javax.xml.rpc.Stub)endpoint)._setProperty("javax.xml.rpc.service.endpoint.address",
-                 "http://" + getServerHost() +":8080/wsrp/PortletManagementService"); 
+                 "http://" + getServerHostForURL() +":8080/wsrp/PortletManagementService"); 
       
       GetPortletDescription ic = new GetPortletDescription(new RegistrationContext(), 
                     new PortletContext("portletHandle", "portletState".getBytes(), new Extension[]{}), 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java	2009-11-27 00:15:10 UTC (rev 97055)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java	2009-11-27 00:52:15 UTC (rev 97056)
@@ -71,7 +71,8 @@
    
    public void testEndpointGrab() throws Exception
    {
-      String wsdl_url = "http://" + this.getServerHost() + ":8080/wsrp/MarkupService?wsdl";
+	  // JBPAPP-2997
+      String wsdl_url = "http://" + this.getServerHostForURL() + ":8080/wsrp/MarkupService?wsdl";
       Definition def = getWSDLDefinition(new URL(wsdl_url));
       Service serve = def.getService(new QName("urn:oasis:names:tc:wsrp:v1:wsdl","WSRPService"));
       assertMarkupService(serve);




More information about the jboss-cvs-commits mailing list