[jboss-cvs] JBossAS SVN: r109975 - in trunk: connector/src/etc/example-config and 55 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 16 15:22:12 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-12-16 15:21:59 -0500 (Thu, 16 Dec 2010)
New Revision: 109975
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/etc/example-config/hsqldb-ds.xml
trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml
trunk/console/src/main/java/org/jboss/console/twiddle/Twiddle.java
trunk/ejb3/pom.xml
trunk/server/src/etc/deploy/remoting-jboss-beans.xml
trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java
trunk/server/src/main/java/org/jboss/invocation/http/server/HttpInvoker.java
trunk/server/src/main/java/org/jboss/invocation/http/server/HttpProxyFactory.java
trunk/server/src/main/java/org/jboss/web/WebService.java
trunk/testsuite/build.xml
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/sections/webservice.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/BulkOperationsUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EmbeddedIdClassloaderTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityClassloaderTestBase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityQueryRedeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PreferredMasterElectionPolicyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredservice/unit/HttpUtils.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/unit/ClusteredCacheCleanStartUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentSessionTestUtil.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentStoreSetupDelegate.java
trunk/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
trunk/testsuite/src/main/org/jboss/test/jaxr/scout/basic/JaxrJNDIConnectionTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java
trunk/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainTolerateUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/WebJASPIFormUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/mapping/RoleMappingWebTestCase.java
trunk/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
trunk/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/ssl/ClientCertJaspiWebUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/WebServiceTestCase.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java
trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml
trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml
trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
trunk/testsuite/src/resources/cluster/persistent/httpsession-ds.xml
trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
trunk/testsuite/src/resources/naming/services/jboss-service.xml
trunk/testsuite/src/resources/security-srp/service-inf/jboss-service.xml
trunk/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml
trunk/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl
trunk/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml
trunk/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl
trunk/testsuite/src/resources/webservice/jbws309/wstools-config.xml
trunk/varia/src/main/java/org/jboss/jdbc/HypersonicDatabase.java
trunk/varia/src/resources/services/invoker/http/jboss-service.xml
trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
Log:
[JBAS-8540] AS and testsuite fixes for IPv6 support
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/component-matrix/pom.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -316,7 +316,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1-jbossorg-1</version>
<scope>test</scope>
</dependency>
@@ -754,7 +754,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.8-brew</version>
+ <version>1.8.0.8-jbossorg-1</version>
</dependency>
<dependency>
@@ -2124,7 +2124,7 @@
<dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.1.9.GA</version>
+ <version>1.2.0.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
@@ -2144,7 +2144,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-server-manager</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.0.4.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/connector/src/etc/example-config/hsqldb-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/hsqldb-ds.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/connector/src/etc/example-config/hsqldb-ds.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -14,7 +14,12 @@
<!-- For server mode db, allowing other processes to use hsqldb over tcp.
This requires the org.jboss.jdbc.HypersonicDatabase mbean.
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url>
+ <connection-url>
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>Hypersonic</parameter>
+ <parameter>jdbc:hsqldb:hsql://${hostforurl}:${port}</parameter>
+ </value-factory>
+ </connection-url>
-->
<!-- For totally in-memory db, not saved when jboss stops.
The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
Modified: trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -16,7 +16,12 @@
<!-- For server mode db, allowing other processes to use hsqldb over tcp.
This requires the org.jboss.jdbc.HypersonicDatabase mbean.
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url>
+ <connection-url>
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>Hypersonic</parameter>
+ <parameter>jdbc:hsqldb:hsql://${hostforurl}:${port}</parameter>
+ </value-factory>
+ </connection-url>
-->
<!-- For totally in-memory db, not saved when jboss stops.
The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
@@ -130,8 +135,14 @@
<!-- Uncomment if you want hsqldb accessed over tcp (server mode)
<mbean code="org.jboss.jdbc.HypersonicDatabase"
name="jboss:service=Hypersonic">
- <attribute name="Port">1701</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <attribute name="Port">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding"
+ parameter="jboss:service=Hypersonic"/>
+ </attribute>
+ <attribute name="BindAddress">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding"
+ parameter="jboss:service=Hypersonic"/>
+ </attribute>
<attribute name="Silent">true</attribute>
<attribute name="Database">default</attribute>
<attribute name="Trace">false</attribute>
Modified: trunk/console/src/main/java/org/jboss/console/twiddle/Twiddle.java
===================================================================
--- trunk/console/src/main/java/org/jboss/console/twiddle/Twiddle.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/console/src/main/java/org/jboss/console/twiddle/Twiddle.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -99,14 +99,27 @@
// build JMXServiceURL, should look like "service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi";
private String buildJMXServiceUrl()
{
+ // JBAS-8540
return
DEFAULT_BASEURL +
- (hostname != null ? hostname : DEFAULT_HOSTNAME) +
+ fixHostnameForURL(hostname != null ? hostname : DEFAULT_HOSTNAME) +
":" +
(port != null ? port : DEFAULT_PORT) +
DEFAULT_RMIOBJECTNAME;
}
+
+ // would ordinarily use ServerConfigUtil.fixHostnameForURL() but not on client classpath
+ private String fixHostnameForURL(String host) {
+ if (host == null)
+ return host ;
+ // if the hostname is an IPv6 literal, enclose it in brackets
+ if (host.indexOf(':') != -1)
+ return "[" + host + "]" ;
+ else
+ return host ;
+ }
+
public String getUsername() {
return username;
}
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/ejb3/pom.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -80,13 +80,16 @@
<patternset>
<include name="*.xml" />
<include name="META-INF/ejb3-deployers-jboss-beans.xml" />
- <exclude name="META-INF/jpa-deployers-jboss-beans.xml" />
+ <exclude name="META-INF/jpa-deployers-jboss-beans.xml" />
<include name="META-INF/*.properties" />
</patternset>
</unjar>
+
+ <!-- JBAS-4850 -->
+ <replace file="target/resources/ejb3-connectors-jboss-beans.xml" token="jboss.bind.address" value="hostforurl"/>
- <mkdir dir="target/resources/deployers"/>
- <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-deployers.jar.path}" dest="target/resources/deployers">
+ <mkdir dir="target/resources/deployers"/>
+ <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-deployers.jar.path}" dest="target/resources/deployers">
<patternset>
<include name="META-INF/ejb3-deployers-jboss-beans.xml" />
</patternset>
Modified: trunk/server/src/etc/deploy/remoting-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/remoting-jboss-beans.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/server/src/etc/deploy/remoting-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -133,7 +133,7 @@
<parameter class="java.lang.String">
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>UnifiedInvokerConnector:bindingHome1</parameter>
- <parameter>${host}:${port}</parameter>
+ <parameter>${hostforurl}:${port}</parameter>
</value-factory>
</parameter>
</constructor>
@@ -145,7 +145,7 @@
<parameter>
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>UnifiedInvokerConnector:bindingHome2</parameter>
- <parameter>!${host}:${port}</parameter>
+ <parameter>!${hostforurl}:${port}</parameter>
</value-factory>
</parameter>
</constructor>
Modified: trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java
===================================================================
--- trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/server/src/main/java/org/jboss/config/ServerConfigUtil.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -36,6 +36,7 @@
*
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a> Maintain only
+ * @author <a href="mailto:rachmatowicz at jboss.org">Richard Achmatowicz</a>
* @version $Revision: $
*/
public final class ServerConfigUtil
@@ -128,4 +129,23 @@
return longUrl;
}
}
+
+ /**
+ * Utility to check if a hostname is an IPv6 literal and is so, add surrounding brackets
+ * for use in URLs (see JBAS-8540)
+ *
+ * @param hostname
+ * @return hostname suitable for use in URLs
+ */
+ public static String fixHostnameForURL(String host)
+ {
+ if (host == null)
+ return host ;
+
+ // if the hostname is an IPv6 literal, enclose it in brackets
+ if (host.indexOf(':') != -1)
+ return "[" + host + "]" ;
+ else
+ return host ;
+ }
}
Modified: trunk/server/src/main/java/org/jboss/invocation/http/server/HttpInvoker.java
===================================================================
--- trunk/server/src/main/java/org/jboss/invocation/http/server/HttpInvoker.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/server/src/main/java/org/jboss/invocation/http/server/HttpInvoker.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -208,7 +208,7 @@
{
host = useHostName ? addr.getHostName() : addr.getHostAddress();
}
- String url = invokerURLPrefix + host + invokerURLSuffix;
+ String url = invokerURLPrefix + ServerConfigUtil.fixHostnameForURL(host) + invokerURLSuffix;
setInvokerURL(url);
}
}
Modified: trunk/server/src/main/java/org/jboss/invocation/http/server/HttpProxyFactory.java
===================================================================
--- trunk/server/src/main/java/org/jboss/invocation/http/server/HttpProxyFactory.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/server/src/main/java/org/jboss/invocation/http/server/HttpProxyFactory.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -274,7 +274,8 @@
InetAddress addr = InetAddress.getLocalHost();
host = useHostName ? addr.getHostName() : addr.getHostAddress();
}
- String url = invokerURLPrefix + host + invokerURLSuffix;
+ // JBAS-8540
+ String url = invokerURLPrefix + ServerConfigUtil.fixHostnameForURL(host) + invokerURLSuffix;
setInvokerURL(url);
}
}
Modified: trunk/server/src/main/java/org/jboss/web/WebService.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/WebService.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/server/src/main/java/org/jboss/web/WebService.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -303,7 +303,8 @@
String codebase = getCodebase();
if (codebase == null)
{
- codebase = "http://" + getHost() + ":" + getPort() + "/";
+ // JBAS-8540
+ codebase = "http://" + ServerConfigUtil.fixHostnameForURL(getHost()) + ":" + getPort() + "/";
System.setProperty("java.rmi.server.codebase", codebase);
}
log.info("Using RMI server codebase: " + codebase);
@@ -320,13 +321,15 @@
{
// Start the WebServer running
server.start();
- log.debug("Started WebServer with address: " + server.getBindAddress() + ":" + getPort());
+ // JBAS-8540
+ log.debug("Started WebServer with address: " + ServerConfigUtil.fixHostnameForURL(getBindAddress()) + ":" + getPort());
}
protected void stopService() throws Exception
{
server.stop();
- log.debug("Stopped WebServer with address: " + server.getBindAddress() + ":" + getPort());
+ // JBAS-8540
+ log.debug("Stopped WebServer with address: " + ServerConfigUtil.fixHostnameForURL(getBindAddress()) + ":" + getPort());
}
/**
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/build.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -136,18 +136,28 @@
<!-- Cluster node0 defaults -->
<property name="node0" value="localhost" />
- <property name="node0.http.url" value="http://${node0}:8080" />
- <property name="node0.jndi.url" value="jnp://${node0}:1099" />
- <property name="node0.hajndi.url" value="jnp://${node0}:1100" />
- <property name="node0.jndi.http.url" value="http://${node0}:8080/invoker/JNDIFactory" />
+ <!-- node0.url is a hostname or IP literal suitable for embedding in URLs -->
+ <condition property="node0.url" value="[${node0}]" else="${node0}">
+ <contains string="${node0}" substring=":"/>
+ </condition>
+ <property name="node0.http.url" value="http://${node0.url}:8080" />
+ <property name="node0.jndi.url" value="jnp://${node0.url}:1099" />
+ <property name="node0.hajndi.url" value="jnp://${node0.url}:1100" />
+ <property name="node0.jndi.http.url" value="http://${node0.url}:8080/invoker/JNDIFactory" />
<property name="node0.jgroups.bind_addr" value="${node0}" />
<!-- Cluster node1 defaults -->
<property name="node1" value="${hostname}" />
- <property name="node1.http.url" value="http://${node1}:8080" />
- <property name="node1.jndi.url" value="jnp://${node1}:1099" />
- <property name="node1.hajndi.url" value="jnp://${node1}:1100" />
- <property name="node1.jndi.http.url" value="http://${node1}:8080/invoker/JNDIFactory" />
+ <!-- node1.url is a hostname or IP literal suitable for embedding in URLs -->
+ <condition property="node1.url" value="[${node1}]" else="${node1}">
+ <contains string="${node1}" substring=":"/>
+ </condition>
+ <property name="node1.http.url" value="http://${node1.url}:8080" />
+ <property name="node1.jndi.url" value="jnp://${node1.url}:1099" />
+ <property name="node1.hajndi.url" value="jnp://${node1.url}:1100" />
+ <property name="node1.jndi.http.url" value="http://${node1.url}:8080/invoker/JNDIFactory" />
<property name="node1.jgroups.bind_addr" value="${node1}" />
+ <echo message="Using node0=${node0},node0.http.url=${node0.http.url},node0.jndi.url=${node0.jndi.url}"/>
+ <echo message="Using node1=${node1},node1.http.url=${node1.http.url},node1.jndi.url=${node1.jndi.url}"/>
<!-- UDP Group -->
<!-- The value of the -u option passed to jboss -->
@@ -164,6 +174,58 @@
<!-- Same thing, but passed to the client -->
<property name="jbosstest.partitionName" value="${partitionName}"/>
+ <!-- IP stack preference -->
+ <!-- The value of java.net.preferIPv4Stack determines which IP version to test against. -->
+ <!-- Setting the system property to true, or not setting at all, forces use of IPv4 IP stack in the JVM. -->
+ <!-- Setting the system property to false forces use of IPv6 stack -->
+ <!-- This ant property is used in server-config.xml when starting all server configurations -->
+ <!-- It is also used on the client side targets to make sure that client and server are using the same stack -->
+ <condition property="java.net.preferIPv4Stack" value="true" else="false">
+ <or>
+ <not>
+ <isset property="java.net.preferIPv4Stack"/>
+ </not>
+ <and>
+ <isset property="java.net.preferIPv4Stack"/>
+ <istrue value="${java.net.preferIPv4Stack}"/>
+ </and>
+ </or>
+ </condition>
+ <!-- IP address preference -->
+ <!-- The value of java.net.preferIPv6Addresses determines which version of an IP address to return -->
+ <!-- when a single hostname maps to both an IPv4 and an IPv6 address -->
+ <!-- Setting the system property to true indicates a preference for IPv6 addresses. -->
+ <condition property="java.net.preferIPv6Addresses" value="true" else="false">
+ <or>
+ <not>
+ <isset property="java.net.preferIPv6Addresses"/>
+ </not>
+ <and>
+ <isset property="java.net.preferIPv6Addresses"/>
+ <istrue value="${java.net.preferIPv6Addresses}"/>
+ </and>
+ </or>
+ </condition>
+ <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 -->
<!-- =================== -->
@@ -888,11 +950,12 @@
<macrodef name="wait-on-host">
<attribute name="seconds" default="120"/>
<attribute name="host" default="${node0}"/>
+ <attribute name="hostforurl" default="${node0.url}"/>
<sequential>
<echo message="Waiting for @{host} to start..."/>
<waitfor maxwait="@{seconds}" maxwaitunit="second"
checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
- <http url="http://@{host}:8080/"/>
+ <http url="http://@{hostforurl}:8080/"/>
</waitfor>
<fail message="Timeout waiting for nodes to start" if="startup.timeout"/>
</sequential>
@@ -1591,8 +1654,10 @@
<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="jbosstest.useJBM" value="true"/>
- <sysproperty key="java.net.preferIPv4Stack" 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>
@@ -1674,7 +1739,10 @@
<sysproperty key="java.naming.factory.initial" value="org.jboss.naming.HttpNamingContextFactory"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.http.url}"/>
<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>
@@ -1736,7 +1804,12 @@
<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="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>
@@ -1781,7 +1854,10 @@
<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}"/>
- <!-- Pass along any jbosstest.* system properties -->
+ <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."/>
</syspropertyset>
@@ -1835,6 +1911,9 @@
<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="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."/>
@@ -1925,6 +2004,7 @@
<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.home" file="${project.root}"/>
<sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/>
<sysproperty key="jboss.tools.dir" file="${project.root}/tools"/>
@@ -1934,6 +2014,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}"/>
@@ -2180,6 +2262,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>
@@ -2232,7 +2316,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>
@@ -2294,6 +2381,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."/>
@@ -2340,7 +2429,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>
@@ -2386,6 +2478,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}"/>
@@ -2432,6 +2526,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}"/>
@@ -2477,6 +2573,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}"/>
@@ -2531,11 +2629,15 @@
<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}/iiop/client.policy"/>
<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>
@@ -2581,6 +2683,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."/>
@@ -2626,6 +2730,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."/>
@@ -2679,9 +2785,13 @@
<!-- Prevent IOException: unknown protocol: vfs -->
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<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"/>
- <!-- 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>
@@ -2739,9 +2849,12 @@
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<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"/>
- <!-- 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>
@@ -2803,17 +2916,21 @@
<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"/>
<sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <sysproperty key="jaxr.query.url" value="http://${node0}:8080/juddi/inquiry"/>
- <sysproperty key="jaxr.publish.url" value="http://${node0}:8080/juddi/publish"/>
+ <sysproperty key="jaxr.query.url" value="http://${node0.url}:8080/juddi/inquiry"/>
+ <sysproperty key="jaxr.publish.url" value="http://${node0.url}:8080/juddi/publish"/>
<sysproperty key="scout.proxy.transportClass" value="org.jboss.jaxr.scout.transport.SaajTransport"/>
<sysproperty key="host.name" value="${node0}"/>
+ <sysproperty key="host.name.url" value="${node0.url}"/>
<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."/>
@@ -2976,6 +3093,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="jbosstest.useJBM" value="true"/>
<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
@@ -2986,8 +3104,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."/>
@@ -3058,7 +3178,10 @@
<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="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>
@@ -3127,6 +3250,9 @@
<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="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."/>
@@ -3289,6 +3415,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}"/>
@@ -3355,6 +3483,9 @@
<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="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."/>
@@ -3408,6 +3539,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"/>
@@ -3453,9 +3586,9 @@
<target name="test-with-server" if="server" depends="init"
description="Execute a single test group with specified server config startup/shutdown">
<echo message="starting server ${server}"/>
- <server:start name="generic"/>
+ <server:start name="${server}"/>
<antcall target="test" inheritRefs="true"/>
- <server:stop name="generic"/>
+ <server:stop name="${server}"/>
</target>
<!-- run a specific test using the specified server e.g.
@@ -3463,9 +3596,9 @@
<target name="one-test-with-server" if="server" depends="init"
description="Execute a single test with specified server config startup/shutdown">
<echo message="starting server ${server}"/>
- <server:start name="generic"/>
+ <server:start name="${server}"/>
<antcall target="one-test" inheritRefs="true"/>
- <server:stop name="generic"/>
+ <server:stop name="${server}"/>
</target>
<!--
@@ -3507,9 +3640,11 @@
<sysproperty key="jbosstest.secure" value="true"/>
<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.resource1.server.host" value="${node2}"/>
<sysproperty key="jbosstest.resource2.server.host" value="${node3}"/>
- <sysproperty key="java.net.preferIPv4Stack" 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>
@@ -3568,11 +3703,12 @@
<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}"/>
+ <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."/>
@@ -3651,8 +3787,11 @@
<sysproperty key="jbosstest.secure" value="true"/>
<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.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."/>
@@ -3970,6 +4109,9 @@
<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="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."/>
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -389,21 +389,23 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}"
failureProperty="tests.failure">
-
- <sysproperty key="java.net.preferIPv4Stack" value="true"/>
<sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+ <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
<sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
<sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
<sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+ <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
<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="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -451,6 +453,80 @@
</junit>
</target>
+ <!--
+ Executes a single test in a clustered environment
+ where test specifies the fully qualified test and package name
+ -->
+ <target name="one-test-clustering-unit" depends="init">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}"
+ failureProperty="tests.failure">
+
+ <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+ <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
+ <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+ <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
+ <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="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+
+ <!--Lets pass some parameters from local.properties file as system properties-->
+ <syspropertyset>
+ <propertyref prefix="org.apache."/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="apache"/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="node"/>
+ </syspropertyset>
+
+ <!--jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=y"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/-->
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!-- definition of the property for keeping results between configuration -->
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" />
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+
<!-- Launches a test assuming the AS instances are already running -->
<target name="one-cluster-test-nostart" if="test">
@@ -458,7 +534,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
@@ -479,7 +555,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
@@ -502,7 +578,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
Modified: trunk/testsuite/imports/sections/webservice.xml
===================================================================
--- trunk/testsuite/imports/sections/webservice.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/imports/sections/webservice.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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 -->
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/imports/server-config.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -112,9 +112,12 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-Xmx512m" />
-->
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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
-->
@@ -124,9 +127,11 @@
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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" />
@@ -134,7 +139,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -149,7 +155,7 @@
<jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy=${build.resources}/securitymgr/server.policy"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
<jvmarg value="-Djava.security.debug=failure"/>
<!-- jvmarg value="-Djboss.boot.server.log.level=TRACE"/ -->
<!-- jvmarg value="-Djboss.boot.server.log.file.level=TRACE"/ -->
@@ -158,8 +164,8 @@
<!-- Replace for security manager debug verbose info
<jvmarg value="-Djava.security.debug=access,failure,policy"/>
-->
-
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="scoped-aop-jdk50" host="${node0}">
@@ -171,7 +177,8 @@
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -183,7 +190,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -199,9 +207,10 @@
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
<jvmarg value="-Djava.security.debug=access,failure"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
</server>
<server name="jacc" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -209,7 +218,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="${jpda.cmdline}" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="jacc-security-allstarrole" host="${node0}">
@@ -218,7 +228,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="${jpda.cmdline}" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="jaspi" host="${node0}"/>
@@ -228,7 +239,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="password-mask" host="${node0}">
@@ -237,7 +249,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="${jpda.cmdline}" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="jts" host="${node0}">
@@ -245,7 +258,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -255,7 +269,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="${jpda.cmdline}" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="opends" host="${node0}">
@@ -264,7 +279,8 @@
<jvmarg value="-Xmx256m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="tomcat-webctx" host="${node0}">
@@ -273,7 +289,8 @@
<jvmarg value="-Xmx256m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="tomcat-federation" host="${node0}">
@@ -282,7 +299,8 @@
<jvmarg value="-Xmx256m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="node0" host="${node0}">
@@ -290,7 +308,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -301,7 +320,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -312,7 +332,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -323,7 +344,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -334,7 +356,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -346,7 +369,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -359,11 +383,13 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -373,11 +399,13 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -387,13 +415,15 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-SYNC-1" host="${node1}">
<jvmarg value="-Xms128m" />
@@ -401,13 +431,15 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-DIST-0" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -415,13 +447,15 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-DIST-1" host="${node1}">
<jvmarg value="-Xms128m" />
@@ -429,13 +463,15 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-tcp-0" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -443,12 +479,14 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -458,12 +496,14 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -473,7 +513,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
@@ -486,7 +527,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
@@ -499,7 +541,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
@@ -512,7 +555,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
@@ -550,7 +594,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -562,7 +607,8 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -575,8 +621,9 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<sysproperty key="jboss.service.binding.set" value="ports-01" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -586,8 +633,9 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<sysproperty key="jboss.service.binding.set" value="ports-02" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -595,34 +643,40 @@
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=128m" />
- <jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="minimal" host="${node0}" hasWebServer="false">
<sysproperty key="jboss.vfs.forceNoReaper" value="true" />
<sysproperty key="jboss.boot.server.log.level" value="DEBUG" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="deployment-service" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="jbpm-bpel" host="${node0}">
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="classloader-leak" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=256m" />
- <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <!-- Use -D to set ${jboss.profiler.cmdline} to "-agentlib:jbossAgent" or
- "-agentlib:jbossAgent -d64" to use JBoss Profiler to analyze heap
- The default value is "" turning the following into a no-op -->
- <jvmarg value="${jboss.profiler.cmdline}"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <!-- Use -D to set ${jboss.profiler.cmdline} to "-agentlib:jbossAgent" or
+ "-agentlib:jbossAgent -d64" to use JBoss Profiler to analyze heap
+ The default value is "" turning the following into a no-op -->
+ <jvmarg value="${jboss.profiler.cmdline}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -636,11 +690,13 @@
"-agentlib:jbossAgent -d64" to use JBoss Profiler to analyze heap
The default value is "" turning the following into a no-op -->
<jvmarg value="${jboss.profiler.cmdline}"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -651,11 +707,13 @@
<jvmarg value="-XX:MaxPermSize=256m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -665,7 +723,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -675,7 +734,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -688,7 +748,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -701,7 +762,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -713,7 +775,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -725,7 +788,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -736,31 +800,34 @@
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"/>
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
<server name="jbm-cluster1" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:-UseGCOverheadLimit" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
<server name="jbm-cluster2" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="jbossnode0" value="${node0}"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
+ <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <sysproperty key="jbossnode0" value="${node0}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
<server name="web" host="${node0}" serverUrl="${node0.jndi.http.url}">
@@ -769,7 +836,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -780,10 +848,11 @@
<jvmarg value="-Xmx256m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <!-- Disable on-demand war deployment -->
- <sysproperty key="jboss.as.deployment.ondemand" value="false" />
+ <!-- Disable on-demand war deployment -->
+ <sysproperty key="jboss.as.deployment.ondemand" value="false" />
</server>
<server name="scripts" host="${node0}" partition="ScriptsTestPartition">
@@ -792,8 +861,9 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
@@ -836,6 +906,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"/>
@@ -853,7 +925,7 @@
<attribute name="jboss.dist" default="${jboss.dist}"
description="The jboss dist root directory" />
<attribute name="java.exec" default="${java.exec}"
- description="Path to the java ececutable" />
+ description="Path to the java executable" />
<sequential>
<echo message="Will stop the jboss instance @{targethost}"/>
<java classname="org.jboss.Shutdown" fork="true" dir="@{jboss.dist}/bin"
@@ -932,7 +1004,8 @@
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <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}" />
</server>
@@ -1152,6 +1225,8 @@
<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="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<syspropertyset>
<propertyref prefix="jbosstest"/>
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -81,7 +81,7 @@
for (int i = 0; i < ejbs.length; i++)
removeClassLoader(ejbs[i]);
- baseURL = "http://" + getServerHost() + ":8080/" + getWarContextPath() + "/";
+ baseURL = "http://" + getServerHostForURL() + ":8080/" + getWarContextPath() + "/";
}
protected void tearDown() throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -116,14 +116,14 @@
try
{
deploy("log4j113.war");
- URL log4jServletURL = new URL("http://" + getServerHost() + ":8080/log4j113/Log4jServlet/");
+ URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/log4j113/Log4jServlet/");
InputStream reply = (InputStream) log4jServletURL.getContent();
- getLog().debug("Accessed http://" + getServerHost() + ":8080/log4j113/Log4jServlet/");
+ getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/log4j113/Log4jServlet/");
logReply(reply);
- URL encServletURL = new URL("http://" + getServerHost() + ":8080/log4j113/ENCServlet/");
+ URL encServletURL = new URL("http://" + getServerHostForURL() + ":8080/log4j113/ENCServlet/");
reply = (InputStream) encServletURL.getContent();
- getLog().debug("Accessed http://" + getServerHost() + ":8080/log4j113/ENCServlet/");
+ getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/log4j113/ENCServlet/");
logReply(reply);
}
catch(Exception e)
@@ -146,9 +146,9 @@
try
{
deploy("common-logging.war");
- URL log4jServletURL = new URL("http://" + getServerHost() + ":8080/common-logging/Log4jServlet/");
+ URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/common-logging/Log4jServlet/");
InputStream reply = (InputStream) log4jServletURL.getContent();
- getLog().debug("Accessed http://" + getServerHost() + ":8080/common-logging/Log4jServlet/");
+ getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/common-logging/Log4jServlet/");
logReply(reply);
}
catch(Exception e)
@@ -173,9 +173,9 @@
try
{
deploy("oldxerces.war");
- URL servletURL = new URL("http://" + getServerHost() + ":8080/oldxerces/");
+ URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/oldxerces/");
InputStream reply = (InputStream) servletURL.getContent();
- getLog().debug("Accessed http://" + getServerHost() + ":8080/oldxerces/");
+ getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/oldxerces/");
logReply(reply);
}
catch(Exception e)
@@ -332,7 +332,7 @@
{
deploy("shared-jndi1.sar");
deploy("shared-jndi2.war");
- URL servletURL = new URL("http://" + getServerHost() + ":8080/shared-jndi2/LookupServlet");
+ URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/shared-jndi2/LookupServlet");
InputStream reply = (InputStream) servletURL.getContent();
getLog().debug("Accessed: "+servletURL);
logReply(reply);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/BulkOperationsUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/BulkOperationsUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/BulkOperationsUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -49,12 +49,13 @@
public void testBulkOperations() throws Exception
{
System.out.println("*** testBulkOperations()");
- String node0 = System.getProperty("jbosstest.cluster.node0");
+
+ String[] namingURLs = getNamingURLs() ;
Properties prop0 = new Properties();
prop0.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
prop0.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- prop0.put("java.naming.provider.url", "jnp://" + node0 + ":1099");
+ prop0.put("java.naming.provider.url", namingURLs[0]);
System.out.println("===== Node0 properties: ");
System.out.println(prop0);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EmbeddedIdClassloaderTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EmbeddedIdClassloaderTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EmbeddedIdClassloaderTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -32,6 +32,7 @@
import org.jboss.test.cluster.clusteredentity.embeddedid.EmbeddedIdTest;
import org.jboss.test.cluster.clusteredentity.embeddedid.MusicianPK;
import org.jboss.test.cluster.testutil.DBSetup;
+import org.jboss.test.JBossTestUtil;
/**
* Simple test of replication of entities and related queries with @EmbeddedId
@@ -59,8 +60,10 @@
{
super.setUp();
- sfsb0 = getUserTest(System.getProperty("jbosstest.cluster.node0"));
- sfsb1 = getUserTest(System.getProperty("jbosstest.cluster.node1"));
+ String[] servers = getServers() ;
+
+ sfsb0 = getUserTest(servers[0]);
+ sfsb1 = getUserTest(servers[1]);
sfsb0.cleanup();
sfsb1.cleanup();
}
@@ -92,7 +95,7 @@
Properties prop1 = new Properties();
prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- prop1.put("java.naming.provider.url", "jnp://" + nodeJNDIAddress + ":1099");
+ prop1.put("java.naming.provider.url", "jnp://" + JBossTestUtil.fixHostnameForURL(nodeJNDIAddress) + ":1099");
log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
log.info(prop1);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityClassloaderTestBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityClassloaderTestBase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityClassloaderTestBase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -27,6 +27,7 @@
import org.jboss.test.cluster.clusteredentity.classloader.AccountHolderPK;
import org.jboss.test.cluster.clusteredentity.classloader.EntityQueryTest;
import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.JBossTestUtil;
/**
* Base class for tests involving clustered entities with a scoped classloader.
@@ -72,8 +73,10 @@
{
super.setUp();
- sfsb0 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node0"));
- sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));
+ String[] servers = getServers() ;
+
+ sfsb0 = getEntityQueryTest(servers[0]);
+ sfsb1 = getEntityQueryTest(servers[1]);
sfsb0.cleanup();
sfsb1.cleanup();
}
@@ -83,7 +86,8 @@
Properties prop = new Properties();
prop.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
prop.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- prop.put("java.naming.provider.url", "jnp://" + nodeJNDIAddress + ":1099");
+ // JBAS-8540
+ prop.put("java.naming.provider.url", "jnp://" + JBossTestUtil.fixHostnameForURL(nodeJNDIAddress) + ":1099");
log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
log.info(prop);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityQueryRedeployUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityQueryRedeployUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityQueryRedeployUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -72,7 +72,8 @@
sleep(2000);
// Get the SFSB again
- sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));
+ String[] servers = getServers() ;
+ sfsb1 = getEntityQueryTest(servers[1]);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/clusteredentity/test/EntityUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -89,13 +89,12 @@
public void testAll() throws Exception
{
System.out.println("*** testServerFound()");
- String node0 = System.getProperty("jbosstest.cluster.node0");
- String node1 = System.getProperty("jbosstest.cluster.node1");
+ String[] namingURLs = getNamingURLs();
Properties prop0 = new Properties();
prop0.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
prop0.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- prop0.put("java.naming.provider.url", "jnp://" + node0 + ":1099");
+ prop0.put("java.naming.provider.url", namingURLs[0]);
System.out.println("===== Node0 properties: ");
System.out.println(prop0);
@@ -103,7 +102,7 @@
Properties prop1 = new Properties();
prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- prop1.put("java.naming.provider.url", "jnp://" + node1 + ":1099");
+ prop1.put("java.naming.provider.url", namingURLs[1]);
System.out.println("===== Node1 properties: ");
System.out.println(prop1);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -20,6 +20,8 @@
import org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore;
import org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase;
+import org.jboss.test.JBossTestUtil;
+
/**
* Unit tests for {@link DriverManagerPersistentStore}, although really more of
* a test of its abstract superclass RDBMSStoreBase where we use the
@@ -32,9 +34,9 @@
public class DriverManagerPersistentStoreUnitTestCase extends TestCase
{
private static final String DB_ADDRESS = System.getProperty(DBSetupDelegate.DBADDRESS_PROPERTY, DBSetupDelegate.DEFAULT_ADDRESS);
+ // JBAS-8540
+ private static final String CONNECTION_URL = "jdbc:hsqldb:hsql://" + JBossTestUtil.fixHostnameForURL(DB_ADDRESS) + ":" + DBSetupDelegate.DEFAULT_PORT;
- private static final String CONNECTION_URL = "jdbc:hsqldb:hsql://" + DB_ADDRESS + ":" + DBSetupDelegate.DEFAULT_PORT;
-
private static final String CONTEXT_PATH = "localhost/test";
private static AtomicInteger id = new AtomicInteger();
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -523,7 +523,7 @@
log.info("DRMTestCase.testIsMasterReplica() - starting GossipRouter");
// router characteristics here must match the definition in the stack configuration
- router = new GossipRouter(12001, "127.0.0.1");
+ router = new GossipRouter(12001, "localhost");
router.start();
Thread.sleep(10000);
log.info("router routing table = " + router.dumpRoutingTable());
@@ -713,7 +713,7 @@
MBeanServer mbeanServer =
MBeanServerFactory.createMBeanServer("mockPartition");
try {
- ClusterNode localAddress = factory.getClusterNode(new IpAddress("127.0.0.1", 12345));
+ ClusterNode localAddress = factory.getClusterNode(new IpAddress("localhost", 12345));
MockHAPartition partition = new MockHAPartition(localAddress);
DistributedReplicantManagerImpl drm = new DistributedReplicantManagerImpl(partition);
@@ -724,7 +724,7 @@
Vector<ClusterNode> remoteAddresses = new Vector<ClusterNode>();
for (int i = 1; i < 5; i++)
- remoteAddresses.add(factory.getClusterNode(new IpAddress("127.0.0.1", 12340 + i)));
+ remoteAddresses.add(factory.getClusterNode(new IpAddress("localhost", 12340 + i)));
Vector<ClusterNode> allNodes = new Vector<ClusterNode>(remoteAddresses);
allNodes.add(localAddress);
@@ -817,7 +817,7 @@
MBeanServer mbeanServer =
MBeanServerFactory.createMBeanServer("mockPartition");
try {
- ClusterNode localAddress = factory.getClusterNode(new IpAddress("127.0.0.1", 12345));
+ ClusterNode localAddress = factory.getClusterNode(new IpAddress("localhost", 12345));
MockHAPartition partition = new MockHAPartition(localAddress);
DistributedReplicantManagerImpl drm = new DistributedReplicantManagerImpl(partition);
@@ -828,7 +828,7 @@
Vector<ClusterNode> remoteAddresses = new Vector<ClusterNode>();
for (int i = 1; i < 5; i++)
- remoteAddresses.add(factory.getClusterNode(new IpAddress("127.0.0.1", 12340 + i)));
+ remoteAddresses.add(factory.getClusterNode(new IpAddress("localhost", 12340 + i)));
Vector<ClusterNode> allNodes = new Vector<ClusterNode>(remoteAddresses);
allNodes.add(localAddress);
@@ -936,7 +936,7 @@
MBeanServerFactory.createMBeanServer("mockPartition");
try {
- ClusterNode localAddress = factory.getClusterNode(new IpAddress("127.0.0.1", 12345));
+ ClusterNode localAddress = factory.getClusterNode(new IpAddress("localhost", 12345));
MockHAPartition partition = new MockHAPartition(localAddress);
DistributedReplicantManagerImpl drm = new DistributedReplicantManagerImpl(partition);
@@ -946,7 +946,7 @@
// Create a fake view for the MockHAPartition
Vector<ClusterNode> remoteAddresses = new Vector<ClusterNode>();
- ClusterNode remote = factory.getClusterNode(new IpAddress("127.0.0.1", 12341));
+ ClusterNode remote = factory.getClusterNode(new IpAddress("localhost", 12341));
remoteAddresses.add(remote);
Vector<ClusterNode> allNodes = new Vector<ClusterNode>(remoteAddresses);
@@ -1118,7 +1118,7 @@
Vector<ClusterNode> allNodes = new Vector<ClusterNode>();
for (int i = 0; i < nodes.length; i++)
{
- nodes[i] = factory.getClusterNode(new IpAddress("127.0.0.1", 12340 + i));
+ nodes[i] = factory.getClusterNode(new IpAddress("localhost", 12340 + i));
allNodes.add(nodes[i]);
names[i] = nodes[i].getName();
replicants[i] = new Integer(i);
@@ -1195,7 +1195,7 @@
Vector<ClusterNode> allNodes = new Vector<ClusterNode>();
for (int i = 0; i < nodes.length; i++)
{
- nodes[i] = factory.getClusterNode(new IpAddress("127.0.0.1", 12340 + i));
+ nodes[i] = factory.getClusterNode(new IpAddress("localhost", 12340 + i));
allNodes.add(nodes[i]);
// names[i] = nodes[i].getName();
replicants[i] = new Integer(i);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PreferredMasterElectionPolicyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PreferredMasterElectionPolicyUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PreferredMasterElectionPolicyUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -85,7 +85,13 @@
public void testUsePreferredMasterViaAddress()
{
- this.policy.setPreferredMaster("127.0.0.1:10002");
+ // JBAS-8540
+ String hostport = "[::1]:10002" ;
+ // check for IPv4 stack and use correct address literal
+ if (System.getProperty("java.net.preferIPv4Stack").equals("true"))
+ hostport = "127.0.0.1:10002" ;
+
+ this.policy.setPreferredMaster(hostport);
ClusterNode master = this.policy.elect(this.candidates);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ClusteringDefaultsTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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",
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -31,6 +31,7 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.jboss.test.JBossTestUtil;
import org.jboss.test.cluster.testutil.DBSetupDelegate;
import org.jboss.test.cluster.testutil.DelegatingClusteredTestCase;
import org.jboss.test.cluster.testutil.TestSetupDelegate;
@@ -55,7 +56,10 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080);
+ // JBAS-8540 + getServerHost() is really for non-clustered test cases
+ // baseURLNoAuth = "http://" + getServerHost + ":" + Integer.getInteger("web.port", 8080);
+ baseURLNoAuth = "http://" + JBossTestUtil.fixHostnameForURL(getServers()[0]) + ":" + Integer.getInteger("web.port", 8080);
+
}
protected String getContextPath()
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredservice/unit/HttpUtils.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredservice/unit/HttpUtils.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredservice/unit/HttpUtils.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -37,6 +37,7 @@
import org.apache.commons.httpclient.methods.DeleteMethod;
import org.apache.commons.httpclient.methods.TraceMethod;
import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestUtil;
/** Utilities for client http requests
*
@@ -46,8 +47,8 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@localhost:" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://localhost:" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURL = "http://jduke:theduke@" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -57,13 +58,36 @@
public static final int DELETE = 6;
public static final int TRACE = 7;
+ // JBAS-8540
+ private static String getServerHost() {
+ String hostname = System.getProperty("jboss.bind.address", "localhost") ;
+ if (log.isDebugEnabled())
+ log.debug("getServerHost(): using hostname = " + hostname) ;
+ return hostname;
+ }
+
+ // JBAS-8540
+ private static String getServerHostForURL()
+ {
+ String hostname = getServerHost() ;
+
+ if (hostname == null)
+ return hostname;
+
+ String hostnameForURL = JBossTestUtil.fixHostnameForURL(hostname) ;
+ if (log.isDebugEnabled())
+ log.debug("getServerHostForURL(): using hostname for url = " + hostnameForURL) ;
+
+ return hostnameForURL;
+ }
+
public static String getBaseURL()
{
return baseURL;
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+ String url = "http://"+username+":"+password+"@"+ getServerHostForURL() + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/unit/ClusteredCacheCleanStartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/unit/ClusteredCacheCleanStartUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/unit/ClusteredCacheCleanStartUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -27,7 +27,7 @@
import junit.framework.Test;
import org.jboss.test.cluster.ejb3.clusteredsession.ejbthree1136.SFSBCacheManipulator;
-import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossClusteredTestCase;
/**
* Tests that StatefulTreeCache properly cleans up state when initializing.
@@ -35,7 +35,7 @@
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
* @version $Revision: 1.1 $
*/
-public class ClusteredCacheCleanStartUnitTestCase extends JBossTestCase
+public class ClusteredCacheCleanStartUnitTestCase extends JBossClusteredTestCase
{
/**
* Create a new ClusteredCacheCleanupTestCase.
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -28,6 +28,7 @@
import java.sql.Statement;
import org.jboss.test.JBossTestServices;
+import org.jboss.test.JBossTestUtil;
/** A TestSetup that starts hypersonic before the testcase with a tcp
* listening port at 1701.
@@ -110,7 +111,8 @@
public void tearDown() throws Exception
{
Class.forName("org.hsqldb.jdbcDriver");
- String dbURL = "jdbc:hsqldb:hsql://" + address + ":" + port;
+ // JBAS-8540
+ String dbURL = "jdbc:hsqldb:hsql://" + JBossTestUtil.fixHostnameForURL(address) + ":" + port;
Connection conn = DriverManager.getConnection(dbURL, "sa", "");
Statement statement = conn.createStatement();
statement.executeQuery("SHUTDOWN COMPACT");
@@ -153,8 +155,15 @@
"-no_system_exit",
"true",
};
- System.out.println("Starting hsqldb");
+ // JBAS-8540
+ System.out.println("Starting hsqldb with command:");
+ System.out.print("org.hsqldb.Server.main ") ;
+ for (int i = 0; i < args.length; i++)
+ System.out.print(args[i] + " ") ;
+ System.out.println("") ;
+
org.hsqldb.Server.main(args);
+
System.out.println("Done");
}
catch (Exception e)
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentSessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentSessionTestUtil.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentSessionTestUtil.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -41,6 +41,8 @@
import org.jboss.web.tomcat.service.session.persistent.DataSourcePersistentManager;
import org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase;
+import org.jboss.test.JBossTestUtil ;
+
/**
* Utilities for session testing.
*
@@ -60,7 +62,8 @@
{
Driver driver = org.hsqldb.jdbcDriver.class.newInstance();
String host = System.getProperty(DBSetupDelegate.DBADDRESS_PROPERTY, DBSetupDelegate.DEFAULT_ADDRESS);
- String jdbcURL = "jdbc:hsqldb:hsql://" + host + ":" + DBSetupDelegate.DEFAULT_PORT;
+ // JBAS-8540
+ String jdbcURL = "jdbc:hsqldb:hsql://" + JBossTestUtil.fixHostnameForURL(host) + ":" + DBSetupDelegate.DEFAULT_PORT;
datasource = new MockDataSource(driver, jdbcURL, "sa", null);
}
catch (InstantiationException e)
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentStoreSetupDelegate.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentStoreSetupDelegate.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/persistent/PersistentStoreSetupDelegate.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -4,6 +4,7 @@
package org.jboss.test.cluster.web.persistent;
import org.jboss.test.JBossTestServices;
+import org.jboss.test.JBossTestUtil;
import org.jboss.test.cluster.testutil.DBSetupDelegate;
import org.jboss.test.cluster.testutil.TestSetupDelegate;
import org.jboss.web.tomcat.service.session.persistent.PersistentStore;
@@ -46,7 +47,8 @@
{
PersistentStoreTableSetup tableSetup = new PersistentStoreTableSetup();
- tableSetup.setJdbcURL("jdbc:hsqldb:hsql://" + address + ":" + port);
+ // JBAS-8540
+ tableSetup.setJdbcURL("jdbc:hsqldb:hsql://" + JBossTestUtil.fixHostnameForURL(address) + ":" + port);
tableSetup.start();
}
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -38,13 +38,14 @@
*/
public class ServletAndEJBUnitTestCase extends JBossTestCase
{
- private String baseURL = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jbas7526/calculator";
+ // JBAS-8540
+ private String baseURL = "http://" + System.getProperty("jbosstest.server.host.url","localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jbas7526/calculator";;
public ServletAndEJBUnitTestCase(String name)
{
super(name);
}
-
+
private String accessURL(String url) throws Exception
{
HttpClient httpConn = new HttpClient();
Modified: trunk/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -59,18 +59,19 @@
{
super(name);
URL url;
- String host = System.getProperty("jbosstest.server.host", "localhost");
+ // JBAS-8540
+ String hostForURL = System.getProperty("jbosstest.server.host.url","localhost");
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: trunk/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -504,13 +504,14 @@
protected InitialContext getClientContext() throws NamingException
{
- String hostname = System.getProperty("host.name", "localhost");
- if (hostname == null)
- throw new IllegalStateException("host.name system property not present");
+ // JBAS-8540
+ String hostnameForURL = System.getProperty("host.name.url", "localhost");
+ if (hostnameForURL == null)
+ throw new IllegalStateException("host.name.url system property not present");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + hostname + ":1099");
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + hostnameForURL + ":1099");
return new InitialContext(env);
}
Modified: trunk/testsuite/src/main/org/jboss/test/jaxr/scout/basic/JaxrJNDIConnectionTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jaxr/scout/basic/JaxrJNDIConnectionTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/jaxr/scout/basic/JaxrJNDIConnectionTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -53,11 +53,14 @@
protected InitialContext getClientContext() throws NamingException
{
- String hostname = System.getProperty("host.name");
+ // JBAS-8540
+ String hostnameForURL = System.getProperty("host.name.url", "localhost");
+ if (hostnameForURL == null)
+ throw new IllegalStateException("host.name.url system property not present");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + hostname + ":1099");
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + hostnameForURL + ":1099");
return new InitialContext(env);
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -79,7 +79,8 @@
public void setUp() throws Exception
{
super.setUp();
- String surl = "service:jmx:rmi://" + getServerHost() + "/jndi/rmi://" + getServerHost() + ":1090/jmxrmi";
+ // JBAS-8540
+ String surl = "service:jmx:rmi://" + getServerHostForURL() + "/jndi/rmi://" + getServerHostForURL() + ":1090/jmxrmi";
log.info("setup for JMXServiceURL = " + surl);
JMXServiceURL url = new JMXServiceURL(surl);
connector = JMXConnectorFactory.connect(url);
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/SecureJMXInvokerUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -76,8 +76,9 @@
{
return new ObjectName("jboss.test:service=InvokerTest,secured=true");
}
-
- static final String TARGET_SERVER = System.getProperty("jbosstest.server.host", "localhost");
+ // JBAS-8540
+ // 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+":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;
Modified: trunk/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -36,13 +36,14 @@
*/
public abstract class AbstractWebJPATest extends JBossTestCase
{
- private String baseURL = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jpa-test/Test?mode=";
+ // JBAS-8540
+ private String baseURL = "http://" + System.getProperty("jbosstest.server.host.url","localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jpa-test/Test?mode=";;
public AbstractWebJPATest(String name)
{
super(name);
}
-
+
public void testWebJPA() throws Exception
{
accessURL("Write");
Modified: trunk/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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";
@@ -426,7 +427,8 @@
private Properties createNamingEnvironment(String port)
{
- String namingURL = getServerHost() + ":" + port;
+ // JBAS-8540
+ String namingURL = getServerHostForURL() + ":" + port;
Properties env = new Properties();
env.setProperty(Context.PROVIDER_URL, namingURL);
env.setProperty(NamingContext.JNP_DISABLE_DISCOVERY, "true");
Modified: trunk/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -72,8 +72,9 @@
protected void setUp() throws Exception
{
super.setUp();
- JNDI_URL = "jnp://" + getServerHost() + ":1099/";
- INVOKER_BASE = "http://"+ getServerHost() + ":8080/invoker/";
+ // JBAS-8540
+ JNDI_URL = "jnp://" + getServerHostForURL() + ":1099/";
+ INVOKER_BASE = "http://"+ getServerHostForURL() + ":8080/invoker/";
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -113,7 +113,8 @@
{
getLog().debug("+++ testNameChanges");
InitialContext ctx = getInitialContext();
- Name name = ctx.getNameParser("").parse("jnp://" + getServerHost() + "/jmx");
+ // JBAS-8540
+ Name name = ctx.getNameParser("").parse("jnp://" + getServerHostForURL() + "/jmx");
Name copy = (Name) name.clone();
Object obj = ctx.lookup(name);
getLog().debug("lookup("+name+") = "+obj);
@@ -142,7 +143,7 @@
// Do a lookup on a server port that does not exist
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.disableDiscovery", "true");
getLog().debug("Creating InitialContext with env="+env);
try
@@ -161,7 +162,7 @@
{
getLog().debug("+++ testHaInvoker");
Properties env = new Properties();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1100/");
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new InitialContext(env);
getLog().debug("Created InitialContext");
@@ -188,7 +189,7 @@
// Lookup 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");
- env.setProperty(javax.naming.Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1100/");
+ env.setProperty(javax.naming.Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new javax.naming.InitialContext(env);
@@ -234,9 +235,9 @@
{
getLog().debug("+++ testHaPartitionName");
Properties env = new Properties();
- String serverHost = getServerHost();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
- env.setProperty("jnp.localAddress", serverHost);
+ // JBAS-8540
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
+ env.setProperty("jnp.localAddress", getServerHost());
env.setProperty("jnp.partitionName", "DefaultPartition");
// Don't let the discovery packet off the test server so we don't
// get spurious responses from other servers on the network
@@ -262,7 +263,7 @@
ctx.close();
// Now test discovery with a non-existent partition name
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.partitionName", "__NotTheDefaultPartition__");
try
{
@@ -285,9 +286,9 @@
{
getLog().debug("+++ testDiscoveryPort");
Properties env = new Properties();
- String serverHost = getServerHost();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
- env.setProperty("jnp.localAddress", serverHost);
+ // JBAS-8540
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
+ env.setProperty("jnp.localAddress", getServerHost());
env.setProperty("jnp.discoveryPort", "1102");
// Don't let the discovery packet off the test server so we don't
// get spurious responses from other servers on the network
@@ -318,7 +319,7 @@
getLog().debug("+++ testHttpInvoker");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new InitialContext(env);
getLog().debug("Created InitialContext");
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -145,7 +145,8 @@
// Statistic
int requests = (Integer)((SimpleValue)comp.getProperty("requestCount").getValue()).getValue();
- new URL("http://" + getServerHost() + ":8080/jmx-console/HtmlAdaptor").openStream().close();
+ // JBAS-8540
+ new URL("http://" + getServerHostForURL() + ":8080/jmx-console/HtmlAdaptor").openStream().close();
assertEquals(requests + 1, ((SimpleValue)comp.getProperty("requestCount").getValue()).getValue());
return;
}
@@ -201,7 +202,8 @@
{
// Statistic
int requests = (Integer)((SimpleValue)comp.getProperty("requestCount").getValue()).getValue();
- new URL("http://" + getServerHost() + ":8080/").openStream().close();
+ // JBAS-8540
+ new URL("http://" + getServerHostForURL() + ":8080/").openStream().close();
assertEquals(requests + 1, ((SimpleValue)comp.getProperty("requestCount").getValue()).getValue());
return;
}
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -97,7 +97,8 @@
*/
public void testCustomPrincipalTransmissionInVM() throws Exception
{
- String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBAS-8540
+ String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
HttpClient httpConn = new HttpClient();
GetMethod indexGet = new GetMethod(baseURLNoAuth + "custom-principal/");
int responseCode = httpConn.executeMethod(indexGet);
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainTolerateUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainTolerateUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainTolerateUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -104,7 +104,7 @@
public void testWeb() throws Exception
{
- String baseURLNoAuth = "http://" + getServerHost() +
+ String baseURLNoAuth = "http://" + getServerHostForURL() +
":" + Integer.getInteger("web.port", 8080) + "/";
HttpClient httpConn = new HttpClient();
GetMethod indexGet = new GetMethod(baseURLNoAuth + "sdtolerate/");
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/WebJASPIFormUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/WebJASPIFormUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/WebJASPIFormUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -58,7 +58,7 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
}
public void testFormAuthSuccess() throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/mapping/RoleMappingWebTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/mapping/RoleMappingWebTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/mapping/RoleMappingWebTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -57,7 +57,7 @@
*/
public void testWebAccess() throws Exception
{
- baseURLNoAuth = "http://" + getServerHost()
+ baseURLNoAuth = "http://" + getServerHostForURL()
+ ":" + Integer.getInteger("web.port", 8080) + "/";
GetMethod indexGet = new GetMethod(baseURLNoAuth+"web-role-map/Secured.jsp");
int responseCode = httpConn.executeMethod(indexGet);
Modified: trunk/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -36,6 +36,7 @@
import org.apache.commons.httpclient.methods.DeleteMethod;
import org.apache.commons.httpclient.methods.TraceMethod;
import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestUtil;
/** Utilities for client http requests
*
@@ -45,8 +46,8 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String baseURL = "http://jduke:theduke@" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURL = "http://jduke:theduke@" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -56,13 +57,36 @@
public static final int DELETE = 6;
public static final int TRACE = 7;
+ // JBAS-8540
+ private static String getServerHost() {
+ String hostname = System.getProperty("jbosstest.server.host", "localhost") ;
+ if (log.isDebugEnabled())
+ log.debug("getServerHost(): using hostname = " + hostname) ;
+ return hostname;
+ }
+
+ // JBAS-8540
+ private static String getServerHostForURL()
+ {
+ String hostname = getServerHost() ;
+
+ if (hostname == null)
+ return hostname;
+
+ String hostnameForURL = JBossTestUtil.fixHostnameForURL(hostname) ;
+ if (log.isDebugEnabled())
+ log.debug("getServerHostForURL(): using hostname for url = " + hostnameForURL) ;
+
+ return hostnameForURL;
+ }
+
public static String getBaseURL()
{
return baseURL;
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@" + System.getProperty("jbosstest.server.host", "localhost") + ":"
+ String url = "http://"+username+":"+password+"@" + getServerHostForURL() + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: trunk/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -50,7 +50,7 @@
public void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
this.serverFound();
this.deploy("auth-ext-header-web.ear");
server = getServer();
Modified: trunk/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -58,7 +58,8 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBAS-8540
+ baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -84,7 +84,8 @@
protected void setUp() throws Exception
{
super.setUp();
- this.testAppBaseURL = "http://" + super.getServerHost() + ":" + Integer.getInteger("web.port", 8080)
+ // JBAS-8540
+ this.testAppBaseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080)
+ "/generic-header-auth/";
}
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -58,7 +58,8 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBAS-8540
+ baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
}
/** Test form authentication of a secured servlet
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -37,13 +37,14 @@
*/
public class RemoteClassloadingServiceUnitTestCase extends JBossTestCase
{
- static final String baseURL = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":8083/";
+ //JBAS-8540
+ String baseURL = "http://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":8083/";
public RemoteClassloadingServiceUnitTestCase(String name)
{
super(name);
}
-
+
/**
* JBAS-4540, don't leak installation directory info
* through the classloading service.
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -234,7 +234,11 @@
{
targetServer = targetServer.substring(index + 3);
}
- index = targetServer.indexOf(":");
+ // JBAS-8540
+ // need to be able to parse IPv6 URLs which have enclosing brackets
+ // HttpClient 3.1 creates cookies which oinclude the square brackets
+ // index = targetServer.indexOf(":");
+ index = targetServer.lastIndexOf(":");
if (index > -1)
{
targetServer = targetServer.substring(0, index);
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -43,7 +43,8 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080);
+ // JBAS-8540
+ baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080);
}
/** Test single sign-on across two web apps using form based auth
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -227,7 +227,7 @@
URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
getLog().info("Accessing SecureServlet with valid login");
HttpUtils.accessURL(url);
- String baseURL2 = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL2 = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url2 = new URL(baseURL2+"jbosstest/restricted/UnsecureEJBServlet");
getLog().info("Accessing SecureServlet with no login");
HttpUtils.accessURL(url2, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
@@ -236,7 +236,7 @@
*/
public void testSecureServletWithBadPass() throws Exception
{
- String baseURL = "http://jduke:badpass@" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://jduke:badpass@" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
}
@@ -244,7 +244,7 @@
*/
public void testSecureServletWithNoLogin() throws Exception
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
}
@@ -252,7 +252,7 @@
*/
public void testNotJbosstest() throws Exception
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"jbosstest-not/unrestricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -351,7 +351,7 @@
try
{
deploy("jbosstest-web2.ear");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"jbosstest-not2/unrestricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -383,7 +383,7 @@
try
{
deploy("good-web.war");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"redeploy/index.html");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -401,7 +401,7 @@
deploy("manifest-web.ear");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"manifest/classpath.jsp");
HttpMethodBase request = HttpUtils.accessURL(url);
Header errors = request.getResponseHeader("X-Exception");
@@ -432,7 +432,7 @@
try
{
deploy("jbosstest-good.ear");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
URL url = new URL(baseURL+"redeploy/index.html");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -455,7 +455,7 @@
deploy("class-loading.war");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
// Load a log4j class
URL url = new URL(baseURL+"class-loading/ClasspathServlet2?class=org.apache.log4j.net.SocketAppender");
HttpMethodBase request = HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -478,7 +478,7 @@
deploy("servlet-classes.war");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ String baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + '/';
// Load a servlet class
URL url = new URL(baseURL+"servlet-classes/ClasspathServlet2?class=javax.servlet.http.HttpServletResponse");
HttpMethodBase request = HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -59,7 +59,7 @@
*/
public void testUnsuccessfulLogin() throws Exception
{
- String baseURLNoAuth = "http://" + getServerHost()
+ String baseURLNoAuth = "http://" + getServerHostForURL()
+ ":" + Integer.getInteger("web.port", 8080) + "/";
String path = "war1/TestServlet";
// try to perform programmatic auth without supplying login information.
@@ -108,7 +108,7 @@
*/
public void testSuccessfulLogin() throws Exception
{
- String baseURLNoAuth = "http://" + getServerHost()
+ String baseURLNoAuth = "http://" + getServerHostForURL()
+ ":" + Integer.getInteger("web.port", 8080) + "/";
String path1 = "war1/TestServlet?operation=login&username=jduke&pass=theduke";
HttpMethod indexGet = null;
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/ssl/ClientCertJaspiWebUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/ssl/ClientCertJaspiWebUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/ssl/ClientCertJaspiWebUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -54,7 +54,7 @@
protected void setUp() throws Exception
{
super.setUp();
- baseHttpsNoAuth = "https://" + getServerHost() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
+ baseHttpsNoAuth = "https://" + getServerHostForURL() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
}
/** Test CLIENT-CERT
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -49,8 +49,9 @@
protected void setUp() throws Exception
{
super.setUp();
- baseHttpNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
- baseHttpsNoAuth = "https://" + getServerHost() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
+ // JBAS-8540
+ baseHttpNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ baseHttpsNoAuth = "https://" + getServerHostForURL() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
}
/** Test that access of the transport constrained redirects to the ssl connector
@@ -72,7 +73,8 @@
log.info("+++ testHttpRedirectSecurityDomain");
int port = Integer.getInteger("web.port", 8080).intValue();
port += 1000;
- String httpNoAuth = "http://" + getServerHost() + ":" + port + "/";
+ // JBAS-8540
+ String httpNoAuth = "http://" + getServerHostForURL() + ":" + port + "/";
doHttpRedirect(httpNoAuth);
}
@@ -91,7 +93,7 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1000;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
@@ -104,7 +106,7 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1500;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
Modified: trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -24,6 +24,10 @@
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;
import junit.framework.Test;
import org.jboss.test.webservice.WebserviceTestBase;
@@ -55,9 +59,35 @@
{
InitialContext iniCtx = getClientContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+
+ // JBAS-8540 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: trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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());
Modified: trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -153,6 +153,25 @@
String hostName = System.getProperty("jbosstest.server.host", "localhost");
return hostName;
}
+
+ /**
+ * Returns the JBoss server host from system property "jbosstest.server.host"
+ * in a form suitable for inclusion in URLs (see RFC 2732).
+ * JBAS-8540
+ */
+ public String getServerHostForURL()
+ {
+ String hostName = getServerHost() ;
+
+ if (hostName == null)
+ return hostName;
+
+ // check for IPv6 literal
+ if (hostName.indexOf(":") != -1)
+ return "[" + hostName + "]" ;
+ else
+ return hostName ;
+ }
public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
{
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/WebServiceTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/WebServiceTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/WebServiceTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -62,8 +62,9 @@
*/
public void testWebService() throws Exception
{
+ // JBAS-8540
Service service = Service.create(
- new URL("http://"+getServerHost()+":8080/webservices-ejb3/SimpleEndpoint?wsdl"),
+ new URL("http://"+getServerHostForURL()+":8080/webservices-ejb3/SimpleEndpoint?wsdl"),
new QName("http://ejb3Integration.jaxws.ws.test.jboss.org/","SimpleEndpointService")
);
@@ -79,8 +80,9 @@
*/
public void testWebServiceContext() throws Exception
{
+ // JBAS-8540
Service service = Service.create(
- new URL("http://"+getServerHost()+":8080/webservices-ejb3/WebServiceContextEndpoint?wsdl"),
+ new URL("http://"+getServerHostForURL()+":8080/webservices-ejb3/WebServiceContextEndpoint?wsdl"),
new QName("http://ejb3Integration.jaxws.ws.test.jboss.org/","WebServiceContextEndpointService")
);
@@ -93,6 +95,7 @@
public void testWebServiceRef() throws Exception
{
InitialContext iniCtx = getInitialContext();
+ // JBAS-8540 FIX-ME
if ("localhost".equals(getServerHost())) //requires AS bound to localhost, as this uses @WebServiceRef(wsdlLocation = "http://localhost..")
{
BusinessInterface ejb3Remote = (BusinessInterface)iniCtx.lookup("/test-webservices/WebServiceRefBean");
@@ -109,8 +112,9 @@
*/
public void testHandlerContext() throws Exception
{
+ // JBAS-8540
Service service = Service.create(
- new URL("http://"+getServerHost()+":8080/webservices-ejb3/HandlerContextEndpoint?wsdl"),
+ new URL("http://"+getServerHostForURL()+":8080/webservices-ejb3/HandlerContextEndpoint?wsdl"),
new QName("http://ejb3Integration.jaxws.ws.test.jboss.org/","HandlerContextEndpointService")
);
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -40,7 +40,8 @@
*/
public class WebServiceRefClientTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref";
+ // JBAS-8540
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHostForURL() + ":8080/jaxws-webserviceref";
public static Test suite()
{
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -40,7 +40,8 @@
*/
public class WebServiceRefEJB3TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref";
+ // JBAS-8540
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHostForURL() + ":8080/jaxws-webserviceref";
public static Test suite()
{
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -41,7 +41,8 @@
*/
public class WebServiceRefServletTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref";
+ // JBAS-8540
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHostForURL() + ":8080/jaxws-webserviceref";
public static Test suite()
{
Modified: trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -7,11 +7,11 @@
<stack name="tunnel1"
description="Used with a GossipRouter">
<config>
- <TUNNEL bind_addr="127.0.0.1" router_port="12001" router_host="127.0.0.1"/>
+ <TUNNEL bind_addr="localhost" router_port="12001" router_host="localhost"/>
<PING timeout="2000"
num_initial_members="3"
gossip_refresh="10000"
- gossip_host="127.0.0.1"
+ gossip_host="localhost"
gossip_port="12001"/>
<MERGE2 max_interval="20000" min_interval="5000"/>
<FD_SOCK/>
@@ -38,11 +38,11 @@
<stack name="tunnel2"
description="Used with a GossipRouter">
<config>
- <TUNNEL bind_addr="127.0.0.1" router_port="12001" router_host="127.0.0.1"/>
+ <TUNNEL bind_addr="localhost" router_port="12001" router_host="localhost"/>
<PING timeout="2000"
num_initial_members="3"
gossip_refresh="10000"
- gossip_host="127.0.0.1"
+ gossip_host="localhost"
gossip_port="12001"/>
<MERGE2 max_interval="20000" min_interval="5000"/>
<FD_SOCK/>
Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -128,9 +128,40 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.remoting:service=PassExpConnector,transport=socket", exposedInterface=org.jboss.remoting.transport.ConnectorMBean.class, registerDirectly=true)</annotation>
<constructor>
<!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
- <!-- otherwise, parser will complain. -->
- <parameter><![CDATA[socket://${jboss.bind.address:localhost}:24446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+ <!-- otherwise, parser will complain. -->
+ <!-- JBAS-8540
+ NOTE: In order to handle both IPv4 and IPv6 address literals in URLs (see rfc2732), the value of
+ the InvokerURL attribute is now constructed using the ServiceBindingManger, using the following format:
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>servicename</parameter>
+ <parameter>bindingname</parameter>
+ <parameter>URL string</parameter>
+ <parameter>actual host</parameter>
+ <parameter>actual port</parameter>
+ </value-factory>
+ where 'URL string' is a string which may contain the substitution variables host, hostforurl and port.
+ The value-factory element will return a string with the variables ${host}, ${hostforurl} and ${port}
+ replaced with the values for host, hostforurl and port in the metadata for the ServiceBindingManager's
+ entry for that servicename/bindingname pair.
+ In order to ensure that the values 'actual host' and 'actual port' are used in the variable substitution,
+ you must ensure that servicename and bindingname are unique to your bean deployment on the AS
+ and do not match any existing ServiceBindingManager metadata entries. A safe approach is to use the
+ following practice:
+ servicename = the JMX ObjectName of your bean deployment
+ bindingname = any identifier unique among all beans deployed with the same servicename
+ If these values are not unique, you may instead pick up the host and port of an existing ServiceBindingManager
+ metadata entry which is probably not what you want.
+ -->
<parameter>
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>PassExpConnector</parameter>
+ <parameter><null/></parameter>
+ <parameter><![CDATA[socket://${hostforurl}:${port}/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>24446</parameter>
+ </value-factory>
+ </parameter>
+ <parameter>
<map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>dataType</key><value>invocation</value></entry>
<entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
@@ -142,6 +173,8 @@
</parameter>
</constructor>
</bean>
+
+
<bean name="PassExpHAJNDI" class="org.jboss.ha.jndi.HANamingService">
<!-- The partition used for group RPCs to find locally bound objects on other nodes -->
Modified: trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -105,7 +105,8 @@
<bean class="org.jboss.ha.singleton.PreferredMasterElectionPolicy"
name="PreferredMasterElectionPolicy_1">
<property name="position">0</property>
- <property name="preferredMaster">${node0.bind.address:127.0.0.1}:1099</property>
+ <!-- JBAS-8540 -->
+ <property name="preferredMaster">${node0.bind.address.url:localhost}:1099</property>
</bean>
<bean class="org.jboss.ha.singleton.HASingletonController"
@@ -130,7 +131,8 @@
<bean class="org.jboss.ha.singleton.PreferredMasterElectionPolicy"
name="PreferredMasterElectionPolicy_2">
<property name="position">-1</property>
- <property name="preferredMaster">${node0.bind.address:127.0.0.1}:1099</property>
+ <!-- JBAS-8540 -->
+ <property name="preferredMaster">${node0.bind.address.url:localhost}:1099</property>
</bean>
<bean class="org.jboss.ha.singleton.HASingletonController"
Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -124,8 +124,39 @@
<constructor>
<!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
<!-- otherwise, parser will complain. -->
- <parameter><![CDATA[socket://${jboss.bind.address:localhost}:14446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+ <!-- JBAS-8540
+ NOTE: In order to handle both IPv4 and IPv6 address literals in URLs (see rfc2732), the value of
+ the InvokerURL attribute is now constructed using the ServiceBindingManger, using the following format:
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>servicename</parameter>
+ <parameter>bindingname</parameter>
+ <parameter>URL string</parameter>
+ <parameter>actual host</parameter>
+ <parameter>actual port</parameter>
+ </value-factory>
+ where 'URL string' is a string which may contain the substitution variables host, hostforurl and port.
+ The value-factory element will return a string with the variables ${host}, ${hostforurl} and ${port}
+ replaced with the values for host, hostforurl and port in the metadata for the ServiceBindingManager's
+ entry for that servicename/bindingname pair.
+ In order to ensure that the values 'actual host' and 'actual port' are used in the variable substitution,
+ you must ensure that servicename and bindingname are unique to your bean deployment on the AS
+ and do not match any existing ServiceBindingManager metadata entries. A safe approach is to use the
+ following practice:
+ servicename = the JMX ObjectName of your bean deployment
+ bindingname = any identifier unique among all beans deployed with the same servicename
+ If these values are not unique, you may instead pick up the host and port of an existing ServiceBindingManager
+ metadata entry which is probably not what you want.
+ -->
<parameter>
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>RestartConnector</parameter>
+ <parameter><null/></parameter>
+ <parameter><![CDATA[socket://${hostforurl}:${port}/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>14446</parameter>
+ </value-factory>
+ </parameter>
+ <parameter>
<map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>dataType</key><value>invocation</value></entry>
<entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
Modified: trunk/testsuite/src/resources/cluster/persistent/httpsession-ds.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/persistent/httpsession-ds.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/cluster/persistent/httpsession-ds.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -14,7 +14,9 @@
<!-- For server mode db, allowing other processes to use hsqldb over tcp.
This requires the org.jboss.jdbc.HypersonicDatabase mbean.-->
- <connection-url>jdbc:hsqldb:hsql://${node0.bind.address:localhost}:1701</connection-url>
+ <!-- JBAS-8540 -->
+ <!-- would prefer use of SBM here, but need to assign to one specific host -->
+ <connection-url>jdbc:hsqldb:hsql://${node0.bind.address.url:localhost}:1701</connection-url>
<!-- For totally in-memory db, not saved when jboss stops.
The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
Modified: trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/testsuite/src/resources/naming/services/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/naming/services/jboss-service.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/naming/services/jboss-service.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -34,9 +34,40 @@
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:test=invoker,type=http,target=Naming,readonly=true">
<attribute name="InvokerName">jboss.test:service=Naming,test=readonly</attribute>
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">:8080/invoker/readonly/JMXInvokerServlet</attribute>
- <attribute name="UseHostName">true</attribute>
+
+ <!-- JBAS-8540
+ NOTE: In order to handle both IPv4 and IPv6 address literals in URLs (see rfc2732), the value of
+ the InvokerURL attribute is now constructed using the ServiceBindingManger, using the following format:
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>servicename</parameter>
+ <parameter>bindingname</parameter>
+ <parameter>URL string</parameter>
+ <parameter>actual host</parameter>
+ <parameter>actual port</parameter>
+ </value-factory>
+ where 'URL string' is a string which may contain the substitution variables host, hostforurl and port.
+ The value-factory element will return a string with the variables ${host}, ${hostforurl} and ${port}
+ replaced with the values for host, hostforurl and port in the metadata for the ServiceBindingManager's
+ entry for that servicename/bindingname pair.
+ In order to ensure that the values 'actual host' and 'actual port' are used in the variable substitution,
+ you must ensure that servicename and bindingname are unique to your bean deployment on the AS
+ and do not match any existing ServiceBindingManager metadata entries. A safe approach is to use the
+ following practice:
+ servicename = the JMX ObjectName of your bean deployment
+ bindingname = any identifier unique among all beans deployed with the same servicename
+ If these values are not unique, you may instead pick up the host and port of an existing ServiceBindingManager
+ metadata entry which is probably not what you want.
+ -->
+
+ <attribute name="InvokerURL">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:test=invoker,type=http,target=Naming,readonly=true</parameter>
+ <parameter>anynamehere</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/readonly/JMXInvokerServlet</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8080</parameter>
+ </value-factory>
+ </attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName">naming/ReadOnlyNaming</attribute>
<attribute name="ClientInterceptors">
Modified: trunk/testsuite/src/resources/security-srp/service-inf/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/security-srp/service-inf/jboss-service.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/security-srp/service-inf/jboss-service.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -30,7 +30,39 @@
<!-- Expose the SRP service interface via HTTP -->
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss.security.tests:service=SRP/HTTP">
- <attribute name="InvokerURL">http://${jboss.bind.address}:8080/invoker/JMXInvokerServlet</attribute>
+
+ <!-- JBAS-8540
+ NOTE: In order to handle both IPv4 and IPv6 address literals in URLs (see rfc2732), the value of
+ the InvokerURL attribute is now constructed using the ServiceBindingManger, using the following format:
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>servicename</parameter>
+ <parameter>bindingname</parameter>
+ <parameter>URL string</parameter>
+ <parameter>actual host</parameter>
+ <parameter>actual port</parameter>
+ </value-factory>
+ where 'URL string' is a string which may contain the substitution variables host, hostforurl and port.
+ The value-factory element will return a string with the variables ${host}, ${hostforurl} and ${port}
+ replaced with the values for host, hostforurl and port in the metadata for the ServiceBindingManager's
+ entry for that servicename/bindingname pair.
+ In order to ensure that the values 'actual host' and 'actual port' are used in the variable substitution,
+ you must ensure that servicename and bindingname are unique to your bean deployment on the AS
+ and do not match any existing ServiceBindingManager metadata entries. A safe approach is to use the
+ following practice:
+ servicename = the JMX ObjectName of your bean deployment
+ bindingname = any identifier unique among all beans deployed with the same servicename
+ If these values are not unique, you may instead pick up the host and port of an existing ServiceBindingManager
+ metadata entry which is probably not what you want.
+ -->
+ <attribute name="InvokerURL">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss.security.tests:service=SRP/HTTP</parameter>
+ <parameter>anynamehere</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/JMXInvokerServlet</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8080</parameter>
+ </value-factory>
+ </attribute>
<attribute name="InvokerName">jboss.security.tests:service=SRPService</attribute>
<attribute name="ExportedInterface">org.jboss.security.srp.SRPRemoteServerInterface</attribute>
<attribute name="JndiName">srp-test-http/SRPServerInterface</attribute>
@@ -44,8 +76,16 @@
<attribute name="ExportedInterface">org.jboss.security.srp.SRPRemoteServerInterface</attribute>
<attribute name="JndiName">srp-test-http/SRPServerInterfaceHA</attribute>
<attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.FirstAvailable</attribute>
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">:8080/invoker/JMXInvokerHAServlet</attribute>
+ <attribute name="InvokerURL">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss.security.tests:service=SRP/HA-HTTP</parameter>
+ <parameter>anynamehere</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/JMXInvokerHAServlet</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8080</parameter>
+ </value-factory>
+ </attribute>
+
<attribute name="ClientInterceptors">
<interceptors>
<interceptor>org.jboss.invocation.http.interfaces.ClientMethodInterceptorHA</interceptor>
Modified: trunk/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml
===================================================================
--- trunk/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml
===================================================================
--- trunk/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl
===================================================================
--- trunk/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/testsuite/src/resources/webservice/jbws309/wstools-config.xml
===================================================================
--- trunk/testsuite/src/resources/webservice/jbws309/wstools-config.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/testsuite/src/resources/webservice/jbws309/wstools-config.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -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>
Modified: trunk/varia/src/main/java/org/jboss/jdbc/HypersonicDatabase.java
===================================================================
--- trunk/varia/src/main/java/org/jboss/jdbc/HypersonicDatabase.java 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/varia/src/main/java/org/jboss/jdbc/HypersonicDatabase.java 2010-12-16 20:21:59 UTC (rev 109975)
@@ -31,6 +31,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.config.ServerConfigUtil;
/**
* Integration with <a href="http://sourceforge.net/projects/hsqldb">HSQLDB</a>
@@ -487,11 +488,12 @@
String[] args;
if (!inProcessMode)
{
+ // JBAS-8540
args =
new String[] {
"-noexit",
"-driver", driver,
- "-url", JDBC_URL_PREFIX + "hsql://" + connectHost + ":" + port,
+ "-url", JDBC_URL_PREFIX + "hsql://" + ServerConfigUtil.fixHostnameForURL(connectHost) + ":" + port,
"-user", user,
"-password", password,
"-dir", getDatabasePath()
@@ -743,7 +745,8 @@
{
// If bind address is the default 0.0.0.0, use localhost
String connectHost = DEFAULT_ADDRESS.equals(address) ? "localhost" : address;
- String dbURL = JDBC_URL_PREFIX + "hsql://" + connectHost + ":" + port;
+ // JBAS-8540
+ String dbURL = JDBC_URL_PREFIX + "hsql://" + ServerConfigUtil.fixHostnameForURL(connectHost) + ":" + port;
Connection connection = getConnection(dbURL);
Statement statement = connection.createStatement();
Modified: trunk/varia/src/resources/services/invoker/http/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/varia/src/resources/services/invoker/http/jboss-service.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -12,17 +12,16 @@
where <hostname> is InetAddress.getHostname value on which the server
is running.
-->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
- <!-- To get value, ask the ServiceBindingManager to do a string
- replacement operation using the HTTP connector port -->
+ <attribute name="InvokerURL">
+ <!-- To get value, ask the ServiceBindingManager to do a host and string
+ replacement operation using the HTTP connector port
+ see JBAS-8540 -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/EJBInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/EJBInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
</mbean>
<!-- Expose the Naming service interface via HTTP -->
@@ -31,17 +30,15 @@
<!-- The Naming service we are proxying -->
<attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<!-- Compose the invoker URL from the cluster node address -->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/JMXInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName"></attribute>
<attribute name="ClientInterceptors">
@@ -60,17 +57,15 @@
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming,readonly=true">
<attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/readonly/JMXInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/readonly/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName"></attribute>
<attribute name="ClientInterceptors">
Modified: trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2010-12-16 19:16:28 UTC (rev 109974)
+++ trunk/varia/src/resources/services/invoker/httpha/jboss-service.xml 2010-12-16 20:21:59 UTC (rev 109975)
@@ -12,17 +12,16 @@
where <hostname> is InetAddress.getHostname value on which the server
is running.
-->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
- replacement operation using the HTTP connector port -->
+ replacement operation using the HTTP connector host and port
+ see JBAS-8540 -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/EJBInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/EJBInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
</mbean>
<mbean code="org.jboss.invocation.http.server.HttpInvokerHA"
@@ -31,17 +30,15 @@
where <hostname> is InetAddress.getHostname value on which the server
is running.
-->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/EJBInvokerHAServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/EJBInvokerHAServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
</mbean>
<!-- Expose the Naming service interface via HTTP -->
@@ -50,17 +47,15 @@
<!-- The Naming service we are proxying -->
<attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
<!-- Compose the invoker URL from the cluster node address -->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/JMXInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName"></attribute>
<attribute name="ClientInterceptors">
@@ -79,17 +74,15 @@
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss:service=invoker,type=http,target=Naming,readonly=true">
<attribute name="InvokerName">jboss:service=NamingBeanImpl</attribute>
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/readonly/JMXInvokerServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/readonly/JMXInvokerServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName"></attribute>
<attribute name="ClientInterceptors">
@@ -108,17 +101,15 @@
<!-- The Naming service we are proxying -->
<attribute name="InvokerName">jboss:service=HAJNDI</attribute>
<!-- Compose the invoker URL from the cluster node address -->
- <attribute name="InvokerURLPrefix">http://</attribute>
- <attribute name="InvokerURLSuffix">
+ <attribute name="InvokerURL">
<!-- To get value, ask the ServiceBindingManager to do a string
replacement operation using the HTTP connector port -->
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>jboss.web:service=WebServer</parameter>
<parameter>HttpConnector</parameter>
- <parameter>:${port}/invoker/JMXInvokerHAServlet</parameter>
+ <parameter>http://${hostforurl}:${port}/invoker/JMXInvokerHAServlet</parameter>
</value-factory>
</attribute>
- <attribute name="UseHostName">true</attribute>
<attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
<attribute name="JndiName"></attribute>
<attribute name="ClientInterceptors">
More information about the jboss-cvs-commits
mailing list