[jboss-cvs] JBossAS SVN: r99079 - in branches/JBPAPP_4_2_0_GA_CP: ejb3 and 63 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 6 18:11:10 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-01-06 18:11:07 -0500 (Wed, 06 Jan 2010)
New Revision: 99079
Modified:
branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hajndi-jms-ds.xml
branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hsqldb-ds.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/ejb3-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/ejb3-connectors-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/DBSetup.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/BulkOperationsUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jaccpropagation/unit/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jbpapp584/unit/DynamicSecurityUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java
branches/JBPAPP_4_2_0_GA_CP/naming/src/main/org/jnp/interfaces/NamingContext.java
branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/web/WebService.java
branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh
branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java
branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/system/server/ServerConfigUtil.java
branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossIIOPTestCase.java
branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestCase.java
branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestClusteredServices.java
branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestServices.java
branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/util/server/Server.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/build-integration.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/old-test-jars.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/webservice.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security-srp/service-inf/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml
branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java
branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/services/binding/sample-bindings.xml
Log:
Update CP release for IPv6: merge --dry-run -r96316:99071 https://svn.jboss.org/repos/jbossas/branches/JBPAPP_4_2_0_GA_CP_IPV6 /home/nrla/eclipse-IPv6/JBPAPP_4_2_0_GA_CP
Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hajndi-jms-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hajndi-jms-ds.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hajndi-jms-ds.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -23,7 +23,7 @@
<attribute name="Properties">
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
- java.naming.provider.url=${jboss.bind.address:localhost}:1100
+ java.naming.provider.url=${jboss.bind.url.address:localhost}:1100
jnp.disableDiscovery=false
jnp.partitionName=${jboss.partition.name:DefaultPartition}
jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hsqldb-ds.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/etc/example-config/hsqldb-ds.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -13,7 +13,7 @@
<!-- 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>jdbc:hsqldb:hsql://${jboss.bind.url.address}: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: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -87,14 +87,23 @@
<!-- Cluster node 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.jndi.port1.url" value="jnp://${node0}:1199" />
- <property name="node0.http.port1.url" value="http://${node0}:8180" />
+ <!-- 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.jndi.port1.url" value="jnp://${node0.url}:1199" />
+ <property name="node0.http.port1.url" value="http://${node0.url}:8180" />
<property name="node0.jgroups.bind_addr" value="${node0}" />
+
<property name="node1" value="${hostname}" />
- <property name="node1.http.url" value="http://${node1}:8080" />
- <property name="node1.jndi.url" value="jnp://${node1}:1099" />
+ <!-- node0.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.jgroups.bind_addr" value="${node1}" />
@@ -115,11 +124,12 @@
<macrodef name="wait-on-host">
<attribute name="seconds" default="${jboss.startup.timeout}"/>
<attribute name="host" default="${node0}"/>
+ <attribute name="hostforurl" default="${node0.url}"/>
<sequential>
<echo>Waiting for @{host} to start (max wait @{seconds} seconds)...</echo>
<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>
@@ -4037,6 +4047,10 @@
timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
localcall, interceptors, interceptors2, interceptors3, iiop, clientinterceptor, jbpapp1307"/>
+
+ <!-- ================================================================== -->
+ <!-- Test cases -->
+ <!-- ================================================================== -->
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
@@ -4053,7 +4067,7 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
+ <!-- <delete file="${build.testlog}/test.log"/> -->
<!-- These tests need extra stuff on classpath -->
<condition property="client.run.classpath" value="security.client.classpath">
@@ -4112,13 +4126,15 @@
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
-
<!-- properties needed for clustering -->
<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.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="java.naming.provider.url" value="${test.jndi.url}"/>
@@ -4129,6 +4145,7 @@
<!-- MultiUnitBindTestCase needs to know the bind address to correctly
test the assertion -->
<sysproperty key="jboss.bind.address" value="${node0}"/>
+ <sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
<jvmarg line="${jvmargs}" />
@@ -4212,13 +4229,15 @@
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
-
<!-- properties needed for clustering -->
<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.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="java.naming.provider.url" value="${node0.jndi.url}"/>
@@ -4229,6 +4248,7 @@
<!-- MultiUnitBindTestCase needs to know the bind address to correctly
test the assertion -->
<sysproperty key="jboss.bind.address" value="${node0}"/>
+ <sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
<jvmarg line="${ejb3.jboss.jvmargs}" />
@@ -4274,6 +4294,7 @@
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<classpath>
<pathelement location="${build.classes}"/>
@@ -4364,14 +4385,23 @@
<target name="ejb-tests" depends="init" description="Execute all tests">
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="ejb" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <start-jboss conf="ejb" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="ejb"/>
</target>
@@ -4690,14 +4720,23 @@
</target>
<target name="entity-tests" depends="init" description="Execute all tests">
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="entity" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <start-jboss conf="entity" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="entity"/>
</target>
<target name="no-start-jboss-entity-tests" depends="init" description="Execute all tests">
@@ -5317,6 +5356,9 @@
description="Executes the default target (most)."
depends="jars"/>
+ <target name="reports"
+ description="Produces test reports in html and text."
+ depends="tests-report-html, tests-report-text"/>
<target name="tests-report-html" depends="compile-stylesheets">
<mkdir dir="${build.reports}/html"/>
@@ -5370,7 +5412,7 @@
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="${test}"/>
<param name="test.extension" value="jacorb"/>
- <param name="test.jndi.url" value="corbaloc::${node0}:3528/JBoss/Naming/root"/>
+ <param name="test.jndi.url" value="corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
<!-- using jacorb -->
<param name="jvmargs" value="${debugFlags}
-Djava.security.manager
@@ -5379,7 +5421,7 @@
-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
- -DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root
+ -DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root
-Djacorb.log.default.verbosity=10
-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
</antcall>
@@ -5394,18 +5436,31 @@
<param name="test" value="${test}"/>
<param name="test.extension" value="sunorb"/>
<!-- using sun jdk -->
- <param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
+ <param name="jvmargs" value="-Djava.security.manager
+ -Djava.security.policy=${resources}/security/tst.policy
+ -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer
+ -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
</antcall>
</target>
<target name="iiop-tests" depends="init" description="Execute all tests">
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="iiop" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
+
+ <start-jboss conf="iiop" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="iiop"/>
</target>
<target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/ejb3-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/ejb3-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/ejb3-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -8,7 +8,7 @@
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/jboss-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/META-INF/jboss-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -10,7 +10,7 @@
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<!-- Setting invokerDestructionDelay can help to preserve connections for reuse. -->
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873/?invokerDestructionDelay=5000</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873/?invokerDestructionDelay=5000</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/ejb3-connectors-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/ejb3-connectors-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/ejb3-connectors-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -8,7 +8,7 @@
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/ejbthree994/ejbthree994-connectors-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -8,7 +8,7 @@
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.remoting:type=Connector,name=Ejbthree994Ejb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3874/?invokerDestructionDelay=5000</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3874/?invokerDestructionDelay=5000</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
@@ -18,7 +18,7 @@
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.remoting.test:type=Connector,name=Ejbthree994TestEjb3Connector,handler=ejb3">
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3875/?invokerDestructionDelay=5000</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3875/?invokerDestructionDelay=5000</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -9,7 +9,7 @@
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
@@ -284,7 +284,7 @@
display-name="Servlet transport Connector">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">
- servlet://${jboss.bind.address}:8080/servlet-invoker/ServerInvokerServlet
+ servlet://${jboss.bind.url.address}:8080/servlet-invoker/ServerInvokerServlet
</attribute>
<attribute name="Configuration">
@@ -298,7 +298,7 @@
name="jboss.remoting:service=Connector,transport=SSLServlet"
display-name="Servlet ssl transport Connector">
<depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="InvokerLocator">sslservlet://${jboss.bind.address}:8443/servlet-invoker/SSLServerInvokerServlet</attribute>
+ <attribute name="InvokerLocator">sslservlet://${jboss.bind.url.address}:8443/servlet-invoker/SSLServerInvokerServlet</attribute>
<attribute name="Configuration">
<handlers>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -30,7 +30,7 @@
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
<init-param>
<param-name>locatorUrl</param-name>
- <param-value>sslservlet://localhost:8443/servlet-invoker/SSLServerInvokerServlet</param-value>
+ <param-value>sslservlet://${jboss.bind.url.address}:8443/servlet-invoker/SSLServerInvokerServlet</param-value>
<description>The ssl servlet server invoker locator url</description>
</init-param>
<load-on-startup>1</load-on-startup>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/localfromremote2/conf/jndi.properties 2010-01-06 23:11:07 UTC (rev 99079)
@@ -1,5 +1,5 @@
# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
#
-java.naming.provider.url=localhost:1199
+#java.naming.provider.url=jnp://localhost:1199
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/DBSetup.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/DBSetup.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/DBSetup.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -84,7 +84,8 @@
protected void tearDown() throws Exception
{
Class.forName("org.hsqldb.jdbcDriver");
- String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+ // JBPAPP-2997
+ String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1701";
Connection conn = DriverManager.getConnection(dbURL, "sa", "");
Statement statement = conn.createStatement();
statement.executeQuery("SHUTDOWN COMPACT");
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/BulkOperationsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/BulkOperationsUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/BulkOperationsUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -49,12 +49,13 @@
public void testBulkOperations() throws Exception
{
System.out.println("*** testBulkOperations()");
- String node0 = System.getProperty("jbosstest.cluster.node0");
+ // JBPAPP-2997
+ String node0ForURL = System.getProperty("jbosstest.cluster.node0.url");
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", "jnp://" + node0ForURL + ":1099");
System.out.println("===== Node0 properties: ");
System.out.println(prop0);
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -60,8 +60,14 @@
{
super.setUp();
- sfsb0 = getUserTest(System.getProperty("jbosstest.cluster.node0"));
- sfsb1 = getUserTest(System.getProperty("jbosstest.cluster.node1"));
+ // JBPAPP-2997
+ String host0 = System.getProperty("jbosstest.cluster.node0") ;
+ String hostForURL0 = System.getProperty("jbosstest.cluster.node0.url") ;
+ String host1 = System.getProperty("jbosstest.cluster.node1") ;
+ String hostForURL1 = System.getProperty("jbosstest.cluster.node1.url") ;
+
+ sfsb0 = getUserTest(host0, hostForURL0);
+ sfsb1 = getUserTest(host1, hostForURL1);
sfsb0.cleanup();
sfsb1.cleanup();
}
@@ -88,19 +94,19 @@
sfsb0 = sfsb1 = null;
}
- protected EmbeddedIdTest getUserTest(String nodeJNDIAddress) throws Exception
+ protected EmbeddedIdTest getUserTest(String nodeAddress, String nodeAddressForURL) throws Exception
{
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://" + nodeAddressForURL + ":1099");
- log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
+ log.info("===== Naming properties for " + nodeAddress + ": ");
log.info(prop1);
- log.info("Create InitialContext for " + nodeJNDIAddress);
+ log.info("Create InitialContext for " + nodeAddress);
InitialContext ctx1 = new InitialContext(prop1);
- log.info("Lookup sfsb from " + nodeJNDIAddress);
+ log.info("Lookup sfsb from " + nodeAddress);
return (EmbeddedIdTest) ctx1.lookup(getEarName() + "/EmbeddedIdTestBean/remote");
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -73,25 +73,31 @@
{
super.setUp();
- sfsb0 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node0"));
- sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));
+ // JBPAPP-2997
+ String host0 = System.getProperty("jbosstest.cluster.node0") ;
+ String hostForURL0 = System.getProperty("jbosstest.cluster.node0.url") ;
+ String host1 = System.getProperty("jbosstest.cluster.node1") ;
+ String hostForURL1 = System.getProperty("jbosstest.cluster.node1.url") ;
+
+ sfsb0 = getEntityQueryTest(host0, hostForURL0);
+ sfsb1 = getEntityQueryTest(host1, hostForURL1);
sfsb0.cleanup();
sfsb1.cleanup();
}
- protected EntityQueryTest getEntityQueryTest(String nodeJNDIAddress) throws Exception
+ protected EntityQueryTest getEntityQueryTest(String nodeAddress, String nodeAddressForURL) throws Exception
{
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://" + nodeAddressForURL + ":1099");
- log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
+ log.info("===== Naming properties for " + nodeAddress + ": ");
log.info(prop1);
- log.info("Create InitialContext for " + nodeJNDIAddress);
+ log.info("Create InitialContext for " + nodeAddress);
InitialContext ctx1 = new InitialContext(prop1);
- log.info("Lookup sfsb from " + nodeJNDIAddress);
+ log.info("Lookup sfsb from " + nodeAddress);
EntityQueryTest eqt = (EntityQueryTest)ctx1.lookup(getEarName() + "/EntityQueryTestBean/remote");
eqt.getCache(isOptimistic());
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -70,7 +70,10 @@
sleep(2000);
// Get the SFSB again
- sfsb1 = getEntityQueryTest(System.getProperty("jbosstest.cluster.node1"));
+ // JBPAPP-2997
+ String host = System.getProperty("jbosstest.cluster.node1") ;
+ String hostForURL = System.getProperty("jbosstest.cluster.node1.url") ;
+ sfsb1 = getEntityQueryTest(host, hostForURL);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -55,13 +55,13 @@
public void testAll() throws Exception
{
System.out.println("*** testServerFound()");
- String node0 = System.getProperty("jbosstest.cluster.node0");
- String node1 = System.getProperty("jbosstest.cluster.node1");
+ String nodeForURL0 = System.getProperty("jbosstest.cluster.node0.url");
+ String nodeForURL1 = System.getProperty("jbosstest.cluster.node1.url");
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", "jnp://" + nodeForURL0 + ":1099");
System.out.println("===== Node0 properties: ");
System.out.println(prop0);
@@ -69,7 +69,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", "jnp://" + nodeForURL1 + ":1099");
System.out.println("===== Node1 properties: ");
System.out.println(prop1);
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -123,7 +123,8 @@
Properties env = new Properties();
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- env.put(Context.PROVIDER_URL, getServerHost() + ":1100");
+ // JBPAPP-2997
+ env.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100");
return new InitialContext(env);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/dd/web/util/HttpUtils.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -46,9 +46,10 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
- private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ private static String serverHostForURL = System.getProperty("jbosstest.server.host.url", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -64,7 +65,8 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+ // JBPAPP-2997
+ String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.url.address") + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -55,9 +55,10 @@
return locator.getOriginalURI();
}
- private static String getBindingName()
+ // JBPAPP-2997
+ private static String getBindingNameForURL()
{
- String bindingName = System.getProperty("jboss.bind.address");
+ String bindingName = System.getProperty("jboss.bind.url.address");
if (bindingName == null)
{
bindingName = "127.0.0.1";
@@ -73,7 +74,7 @@
assertEquals(actual, "*** 123 ***");
String proxyUri = getProxyUri(bean);
- assertEquals(proxyUri, "socket://" + getBindingName() + ":3873/?invokerDestructionDelay=5000");
+ assertEquals(proxyUri, "socket://" + getBindingNameForURL() + ":3873/?invokerDestructionDelay=5000");
}
{
@@ -82,7 +83,7 @@
assertEquals(actual, "*** 456 ***");
String proxyUri = getProxyUri(bean);
- assertEquals(proxyUri, "socket://" + getBindingName() + ":3874/?invokerDestructionDelay=5000");
+ assertEquals(proxyUri, "socket://" + getBindingNameForURL() + ":3874/?invokerDestructionDelay=5000");
}
{
@@ -91,7 +92,7 @@
assertEquals(actual, "*** 789 ***");
String proxyUri = getProxyUri(bean);
- assertEquals(proxyUri, "socket://" + getBindingName() + ":3875/?invokerDestructionDelay=5000");
+ assertEquals(proxyUri, "socket://" + getBindingNameForURL() + ":3875/?invokerDestructionDelay=5000");
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -68,7 +68,8 @@
{
Properties props = new Properties();
props.put("java.naming.factory.initial", "com.sun.jndi.cosnaming.CNCtxFactory");
- props.put("java.naming.provider.url", "corbaloc::"+ getServerHost() + ":3528/NameService");
+ // JBPAPP-2997
+ props.put("java.naming.provider.url", "corbaloc::"+ getServerHostForURL() + ":3528/NameService");
props.put("java.naming.factory.object", "org.jboss.tm.iiop.client.IIOPClientUserTransactionObjectFactory");
props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client:org.jnp.interfaces");
props.put("j2ee.clientName", "iiop-unit-test");
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -50,7 +50,8 @@
{
// Properties props = new Properties();
// props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- // props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ // JBPAPP-2997
+ // props.put("java.naming.provider.url", "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
// props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
// InitialContext jndiContext = new InitialContext(props);
InitialContext jndiContext = new InitialContext();
@@ -66,8 +67,9 @@
setHostNameVerifier();
// Properties props = new Properties();
- // props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- // props.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ // props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
+ // JBPAPP-2997
+ // props.put("java.naming.provider.url", "http://" + getServerHostForURL() + ":8080/invoker/JNDIFactory");
// props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
// InitialContext jndiContext = new InitialContext(props);
InitialContext jndiContext = new InitialContext();
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jaccpropagation/unit/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jaccpropagation/unit/HttpUtils.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jaccpropagation/unit/HttpUtils.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -46,9 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
- private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHostForURL = System.getProperty("jbosstest.server.host.url", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -64,7 +64,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@" + serverHost + ":"
+ String url = "http://"+username+":"+password+"@" + serverHostForURL + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jbpapp584/unit/DynamicSecurityUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jbpapp584/unit/DynamicSecurityUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jbpapp584/unit/DynamicSecurityUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -51,8 +51,9 @@
{
HttpClient client = new HttpClient();
client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("Test", "jbpapp584"));
- String host = System.getProperty("jboss.bind.address", "localhost");
- GetMethod method = new GetMethod("http://" + host + ":8080/jbpapp584/MyServlet?option=A");
+ // JBPAPP-2997
+ String hostForURL = System.getProperty("jboss.bind.url.address", "localhost");
+ GetMethod method = new GetMethod("http://" + hostForURL + ":8080/jbpapp584/MyServlet?option=A");
int responseCode = client.executeMethod(method);
String actual = method.getResponseBodyAsString();
method.releaseConnection();
@@ -70,11 +71,12 @@
{
HttpClient client = new HttpClient();
client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("Bill", "jbpapp584"));
- String host = System.getProperty("jboss.bind.address", "localhost");
+ // JBPAPP-2997
+ String hostForURL = System.getProperty("jboss.bind.url.address", "localhost");
GetMethod method = new GetMethod();
// do work on company A
{
- method.setURI(new HttpURL("http://" + host + ":8080/jbpapp584/MyServlet?option=CompanyA"));
+ method.setURI(new HttpURL("http://" + hostForURL + ":8080/jbpapp584/MyServlet?option=CompanyA"));
int responseCode = client.executeMethod(method);
String actual = method.getResponseBodyAsString();
@@ -91,7 +93,7 @@
// do more work on company A
{
// do not specify the option, it must have been retained
- method.setURI(new HttpURL("http://" + host + ":8080/jbpapp584/MyServlet"));
+ method.setURI(new HttpURL("http://" + hostForURL + ":8080/jbpapp584/MyServlet"));
int responseCode = client.executeMethod(method);
String actual = method.getResponseBodyAsString();
@@ -110,11 +112,12 @@
{
HttpClient client = new HttpClient();
client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("Bill", "jbpapp584"));
- String host = System.getProperty("jboss.bind.address", "localhost");
+ // JBPAPP-2997
+ String hostForURL = System.getProperty("jboss.bind.url.address", "localhost");
GetMethod method = new GetMethod();
// do work on company A
{
- method.setURI(new HttpURL("http://" + host + ":8080/jbpapp584/MyServlet?option=CompanyA"));
+ method.setURI(new HttpURL("http://" + hostForURL + ":8080/jbpapp584/MyServlet?option=CompanyA"));
int responseCode = client.executeMethod(method);
String actual = method.getResponseBodyAsString();
@@ -130,7 +133,7 @@
assertEquals("JSESSIONID", cookie.getName());
// do work on company B
{
- method.setURI(new HttpURL("http://" + host + ":8080/jbpapp584/MyServlet?option=CompanyB"));
+ method.setURI(new HttpURL("http://" + hostForURL + ":8080/jbpapp584/MyServlet?option=CompanyB"));
int responseCode = client.executeMethod(method);
String actual = method.getResponseBodyAsString();
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/jsp/unit/HttpUtils.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -46,9 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
- private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHostForURL = System.getProperty("jbosstest.server.host.url", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -64,7 +64,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+ String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.url.address") + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -77,7 +77,8 @@
List<Entity1> result = manager1.createNamedQuery(Entity1.FIND_ALL).getResultList();
for (Entity1 e : result)
{
- log.info("*** testSharedEntity result=" + e.getData());
+ log.info("*** testSharedEntity result = (omit)") ;
+ // log.info("*** testSharedEntity result=" + e.getData());
}
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -56,7 +56,8 @@
List<Entity1> result = manager.createNamedQuery(Entity1.FIND_ALL).getResultList();
for (Entity1 e : result)
{
- log.info("*** testSharedEntity result=" + e.getData());
+ log.info("*** testSharedEntity result= (omit)");
+ // log.info("*** testSharedEntity result=" + e.getData());
}
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -46,9 +46,9 @@
public class HttpUtils
{
private static Logger log = Logger.getLogger(HttpUtils.class);
- private static String serverHost = System.getProperty("jbosstest.server.host", "localhost");
- private static String baseURL = "http://jduke:theduke@" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
- private static String baseURLNoAuth = "http://" + serverHost + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String serverHostForURL = System.getProperty("jbosstest.server.host.url", "localhost");
+ private static String baseURL = "http://jduke:theduke@" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + serverHostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -64,7 +64,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@" + serverHost + ":"
+ String url = "http://"+username+":"+password+"@" + serverHostForURL + ":"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -328,7 +328,7 @@
hostName = InetAddress.getLocalHost().getHostAddress();
}
}
- return this.urlPrefix + hostName + ":" + String.valueOf(this.urlPort)
+ return this.urlPrefix + ServerConfigUtil.fixHostnameForURL(hostName) + ":" + String.valueOf(this.urlPort)
+ "/" + this.urlSuffix;
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/naming/src/main/org/jnp/interfaces/NamingContext.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/naming/src/main/org/jnp/interfaces/NamingContext.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/naming/src/main/org/jnp/interfaces/NamingContext.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -334,34 +334,61 @@
try
{
- // Parse the url into a host:port form, stripping any protocol
- Name urlAsName = new NamingParser().parse(url);
- String server = parseNameForScheme(urlAsName, null);
- if (server != null)
- url = server;
- int colon = url.indexOf(':');
- if (colon < 0)
- {
- host = url.trim();
- }
- else
- {
- host = url.substring(0, colon).trim();
- try
- {
- port = Integer.parseInt(url.substring(colon + 1).trim());
- }
- catch (Exception ex)
- {
- // Use default;
- }
- }
+ // Parse the url into a host:port form, stripping any protocol
+ Name urlAsName = new NamingParser().parse(url);
+ String server = parseNameForScheme(urlAsName, null);
+ if (server != null)
+ url = server;
- // Remove server from map
- synchronized (NamingContext.class)
- {
- cachedServers.remove(host + ":" + port);
- }
+ // assume host port combinations <IPv4>, <IPv4>:port, [<IPv6>] or [<IPv6>]:port
+ int colon = url.indexOf(':');
+ int rightbracket = url.indexOf(']') ;
+ int lastcolon = url.lastIndexOf(':') ;
+
+ if (rightbracket < 0) {
+ // assume IPv4 host port combination
+ if (colon < 0)
+ {
+ host = url.trim();
+ }
+ else
+ {
+ host = url.substring(0, colon).trim();
+ try
+ {
+ port = Integer.parseInt(url.substring(colon + 1).trim());
+ }
+ catch (Exception ex)
+ {
+ // Use default;
+ }
+ }
+ }
+ else {
+ // assume IPv6 host port combination
+ if (lastcolon < rightbracket)
+ {
+ host = url.substring(0,rightbracket+1).trim() ;
+ }
+ else
+ {
+ host = url.substring(0,rightbracket+1).trim() ;
+ try
+ {
+ port = Integer.parseInt(url.substring(lastcolon + 1).trim());
+ }
+ catch (Exception ex)
+ {
+ // Use default;
+ }
+ }
+ }
+
+ // Remove server from map
+ synchronized (NamingContext.class)
+ {
+ cachedServers.remove(host + ":" + port);
+ }
}
catch (NamingException ignored)
{
@@ -1429,6 +1456,7 @@
s.send(packet);
// Look for a reply
// IP address + port number = 128.128.128.128:65535 => (12+3) + 1 + (5) = 21
+ // IP address + port number = ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:65535 => (8*4+7) + 1 + (5) = 45
buf = new byte[50];
packet = new DatagramPacket(buf, buf.length);
@@ -1449,7 +1477,8 @@
String serverHost;
int serverPort;
- int colon = myServer.indexOf(':');
+ // the last colon always precedes the port, whether IPv4 or IPv6
+ int colon = myServer.lastIndexOf(':');
if (colon >= 0)
{
serverHost = myServer.substring(0, colon);
@@ -1504,39 +1533,67 @@
while (naming == null && tokenizer.hasMoreElements())
{
- String url = tokenizer.nextToken();
- // Parse the url into a host:port form, stripping any protocol
- Name urlAsName = getNameParser("").parse(url);
- String server = parseNameForScheme(urlAsName, null);
- if (server != null)
- url = server;
- int colon = url.indexOf(':');
- if (colon < 0)
- {
- host = url;
- }
- else
- {
- host = url.substring(0, colon).trim();
- try
- {
- port = Integer.parseInt(url.substring(colon + 1).trim());
- }
- catch (Exception ex)
- {
- // Use default;
- }
- }
- try
- {
- // Get server from cache
- naming = getServer(host, port, refEnv);
- }
- catch (Exception e)
- {
- serverEx = e;
- log.debug("Failed to connect to " + host + ":" + port, e);
- }
+ String url = tokenizer.nextToken();
+ // Parse the url into a host:port form, stripping any protocol
+ Name urlAsName = getNameParser("").parse(url);
+ String server = parseNameForScheme(urlAsName, null);
+ if (server != null)
+ url = server;
+
+ // assume host port combinations <IPv4>, <IPv4>:port, [<IPv6>] or [<IPv6>]:port
+ int colon = url.indexOf(':');
+ int rightbracket = url.indexOf(']') ;
+ int lastcolon = url.lastIndexOf(':') ;
+
+ if (rightbracket < 0) {
+ // assume IPv4 host port combination
+ if (colon < 0)
+ {
+ host = url.trim();
+ }
+ else
+ {
+ host = url.substring(0, colon).trim();
+ try
+ {
+ port = Integer.parseInt(url.substring(colon + 1).trim());
+ }
+ catch (Exception ex)
+ {
+ // Use default;
+ }
+ }
+ }
+ else {
+ // assume IPv6 host port combination
+ if (lastcolon < rightbracket)
+ {
+ host = url.substring(0,rightbracket+1).trim() ;
+ }
+ else
+ {
+ host = url.substring(0,rightbracket+1).trim() ;
+ try
+ {
+ port = Integer.parseInt(url.substring(lastcolon + 1).trim());
+ }
+ catch (Exception ex)
+ {
+ // Use default;
+ }
+ }
+ }
+
+ try
+ {
+ // Get server from cache
+ naming = getServer(host, port, refEnv);
+ }
+ catch (Exception e)
+ {
+ serverEx = e;
+ log.debug("Failed to connect to " + host + ":" + port, e);
+ }
}
// If there is still no
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/jboss-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/etc/conf/default/jboss-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -488,7 +488,7 @@
<!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
<!-- otherwise, parser will complain. -->
- <!-- <attribute name="InvokerLocator"><![CDATA[socket://${jboss.bind.address}:4446/?datatype=invocation]]></attribute> -->
+ <!-- <attribute name="InvokerLocator"><![CDATA[socket://${jboss.bind.url.address}:4446/?datatype=invocation]]></attribute> -->
<attribute name="Configuration">
<!-- Using the following <invoker> element instead of the InvokerLocator above because specific attributes needed. -->
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -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: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -274,7 +274,7 @@
InetAddress addr = InetAddress.getLocalHost();
host = useHostName ? addr.getHostName() : addr.getHostAddress();
}
- String url = invokerURLPrefix + host + invokerURLSuffix;
+ String url = invokerURLPrefix + ServerConfigUtil.fixHostnameForURL(host) + invokerURLSuffix;
setInvokerURL(url);
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/web/WebService.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/web/WebService.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/web/WebService.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -303,12 +303,16 @@
String codebase = getCodebase();
if (codebase == null)
{
- codebase = "http://" + getHost() + ":" + getPort() + "/";
- System.setProperty("java.rmi.server.codebase", codebase);
+ // when forming URL, check for IPv6 literal address and add brackets
+ codebase = "http://" + ServerConfigUtil.fixHostnameForURL(getHost()) + ":" + getPort() + "/";
+
+ System.setProperty("java.rmi.server.codebase", codebase);
}
log.info("Using RMI server codebase: " + codebase);
}
+
+
/**
* Start the web server for dynamic downloading of classes and resources.
*
Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh 2010-01-06 23:11:07 UTC (rev 99079)
@@ -89,11 +89,6 @@
. "$RUN_CONF"
fi
-# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
-if [ "$linux" = "true" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-fi
-
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$JBOSS_HOME" ] &&
Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -456,7 +456,11 @@
rmiHost = ServerConfigUtil.fixRemoteAddress(arg);
System.setProperty("java.rmi.server.hostname", rmiHost);
}
- break;
+
+ // create a version of the bind address which can be used in URLs
+ System.setProperty("jboss.bind.url.address", ServerConfigUtil.fixHostnameForURL(arg)) ;
+
+ break;
case 'g':
arg = getopt.getOptarg();
props.put(ServerConfig.PARTITION_NAME_PROPERTY, arg);
Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/system/server/ServerConfigUtil.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/system/server/ServerConfigUtil.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/system/server/ServerConfigUtil.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -140,4 +140,24 @@
else
return longUrl;
}
+
+ /**
+ * Utility to check if a hostname is an IPv6 literal and is so, add surrounding brackets
+ * for use in URLs
+ *
+ * @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: branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossIIOPTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossIIOPTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossIIOPTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -53,8 +53,9 @@
URL url = ClassLoader.getSystemResource("cosnaming.jndi.properties");
jndiProps = new java.util.Properties();
jndiProps.load(url.openStream());
- String host = System.getProperty("jbosstest.server.host", "localhost");
- String corbaloc = "corbaloc::"+host+":3528/JBoss/Naming/root";
+ // String host = System.getProperty("jbosstest.server.host", "localhost");
+ // JBPAPP-2997
+ String corbaloc = "corbaloc::"+getServerHostForURL()+":3528/JBoss/Naming/root";
jndiProps.setProperty("java.naming.provider.url", corbaloc);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -371,6 +371,17 @@
return delegate.getServerHost();
}
+ /**
+ * Get the JBoss server host from system property "jbosstest.server.host"
+ * in a form suitable for use in URLs (IPv6 literals must be enclosed in
+ * square brackets). This defaults to localhost.
+ * JBPAPP-2997
+ */
+ public String getServerHostForURL()
+ {
+ return delegate.getServerHostForURL();
+ }
+
protected void flushAuthCache() throws Exception
{
flushAuthCache("other");
Modified: branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestClusteredServices.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestClusteredServices.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestClusteredServices.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -266,9 +266,17 @@
break;
log.info(prop + " = " + host);
servers.add(host);
+
+ // get the hostname to use in URLs
+ String hostForURLProp = prop + ".url" ;
+ String hostForURL = System.getProperty(hostForURLProp);
+ if (hostForURL == null)
+ break;
+ log.info(hostForURLProp + " = " + hostForURL);
+
// See if there is a jbosstest.cluster.nodeN.jndi.url
String urlProp = prop + ".jndi.url";
- String urlDefault = "jnp://" + host + ":1099";
+ String urlDefault = "jnp://" + hostForURL + ":1099";
String urlValue = System.getProperty(urlProp, urlDefault);
log.debug("JNDI Url for node=" + count + " is:" + urlValue);
namingURLs.add(urlValue);
@@ -280,14 +288,14 @@
// See if there is a jbosstest.cluster.nodeN.hajndi.url
urlProp = prop + ".hajndi.url";
- urlDefault = "jnp://" + host + ":1100";
+ urlDefault = "jnp://" + hostForURL + ":1100";
urlValue = System.getProperty(urlProp, urlDefault);
log.debug("HA-JNDI Url for node=" + count + " is:" + urlValue);
namingURLsHA.add(urlValue);
// See if there is a jbosstest.cluster.nodeN.http.url
urlProp = prop + ".http.url";
- urlDefault = "http://" + host + ":8080";
+ urlDefault = "http://" + hostForURL + ":8080";
urlValue = System.getProperty(urlProp, urlDefault);
log.debug("Http Url for node=" + count + " is:" + urlValue);
httpURLs.add(urlValue);
Modified: branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestServices.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/JBossTestServices.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -452,4 +452,24 @@
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 includion in URLs.This defaults to "localhost"
+ * JBPAPP-2997
+ */
+ public String getServerHostForURL()
+ {
+ String hostName = getServerHost() ;
+
+ if (hostName == null)
+ return hostName;
+
+ // check for IPv6 literal
+ if (hostName.indexOf(":") != -1)
+ return "[" + hostName + "]" ;
+ else
+ return hostName ;
+ }
+
}
Modified: branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/util/server/Server.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/util/server/Server.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/test/src/main/org/jboss/test/util/server/Server.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -243,7 +243,7 @@
*/
public URL getHttpUrl() throws MalformedURLException
{
- return new URL("http://" + host + ":" + httpPort);
+ return new URL("http://" + fixHostnameForURL(host) + ":" + httpPort);
}
/**
@@ -252,7 +252,7 @@
*/
public String getRmiUrl()
{
- return "jnp://" + host + ":" + rmiPort;
+ return "jnp://" + fixHostnameForURL(host) + ":" + rmiPort;
}
/**
@@ -424,5 +424,21 @@
{
this.hasWebServer = hasWebServer;
}
+
+ /**
+ * Check for IPv6 literal address and add enclosing square brackets.
+ *
+ * @return
+ */
+ private String fixHostnameForURL(String host)
+ {
+ if (host == null)
+ return host ;
+
+ if (host.indexOf(':') != -1)
+ return "[" + host + "]" ;
+ else
+ return host ;
+ }
}
\ No newline at end of file
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build-integration.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build-integration.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build-integration.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -25,18 +25,19 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
- <property name="build.testlog" value="${build.testlog}"/>
- <property name="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <property name="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
- <property name="java.naming.provider.url" value="${node0.jndi.url}"/>
- <property name="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
- <propertyset id="wsrp-tests-props">
+ <syspropertyset id="wsrp-tests-props">
<propertyref name="build.testlog"/>
<propertyref name="log4j.configuration"/>
<propertyref prefix="java."/>
<propertyref name="jbosstest.server.host"/>
- </propertyset>
+ </syspropertyset>
<run-junit junit.patternset="wsrp.includes"
junit.configuration="WSRP-Integration"
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -60,14 +60,22 @@
<!-- 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"/>
+ <!-- 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"/>
<!-- 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"/>
+ <!-- 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"/>
<!-- UDP Group -->
<!-- The value of the -u option passed to jboss -->
@@ -95,7 +103,12 @@
<istrue value="${java.net.preferIPv4Stack}"/>
</and>
</condition>
- <echo message="Using java.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/>
+ <!-- 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. -->
+ <property name="java.net.preferIPv6Addresses" value="true"/>
+ <echo message="Using java.net.preferIPv4Stack=${java.net.preferIPv4Stack},java.net.preferIPv6Addresses=${java.net.preferIPv6Addresses}"/>
<!-- =================== -->
@@ -523,10 +536,11 @@
<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>
@@ -1155,16 +1169,24 @@
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <!-- these values override any generation of defaults in JBossTestClusteredServices -->
<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.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="build.testlog" value="${build.testlog}"/>
<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."/>
@@ -1376,7 +1398,7 @@
<java classname="org.jboss.Main" fork="true" spawn="true" dir="${jboss.dist}/bin">
<classpath refid="jboss.boot.classpath"/>
<jvmarg line="-Xmx128m"/>
- <arg value="--netboot=http://${node0}:18080/"/>
+ <arg value="--netboot=http://${node0.url}:18080/"/>
<arg value="-b"/>
<arg value="${node0}"/>
</java>
@@ -1387,7 +1409,7 @@
<run-junit junit.patternset="netboot.includes"
/>
-->
- <stop-jboss url="jnp://${node0}:11099"/>
+ <stop-jboss url="jnp://${node0.url}:11099"/>
</target>
<target name="tests-apache-tomcat-clustering" description="Execute clustering tests requiring an apache load balanced two TC nodes.">
@@ -1875,6 +1897,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."/>
@@ -1921,6 +1946,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."/>
@@ -2005,7 +2033,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="jboss-junit-configuration" value="tests-cc-unit"/>
+ <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."/>
@@ -2048,7 +2079,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}"/>
- <!-- 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>
@@ -2094,16 +2127,22 @@
<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="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>
@@ -2153,7 +2192,9 @@
<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>
@@ -2196,6 +2237,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."/>
@@ -2346,7 +2390,7 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
- <http url="http://${node0}:8080/"/>
+ <http url="http://${node0.url}:8080/"/>
</waitfor>
<fail message="Timeout waiting for server to start" if="startup.timeout"/>
<property name="jbosstest.secure" value="true"/>
@@ -2385,11 +2429,14 @@
<jvmarg value="-Xms256m"/>
<jvmarg value="-Xmx256m"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jboss.dist" file="${jboss.dist}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<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."/>
@@ -2426,10 +2473,13 @@
<jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<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."/>
@@ -2478,10 +2528,13 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
timeout="${junit.timeout}" jvm="${junit.jvm}">
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<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."/>
@@ -2512,11 +2565,14 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
timeout="${junit.timeout}" jvm="${junit.jvm}">
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
<sysproperty key="jboss.aop.path" file="${source.resources}/aop/META-INF/jboss-aop.xml"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<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."/>
@@ -2555,10 +2611,13 @@
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<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."/>
@@ -2595,8 +2654,11 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -2631,8 +2693,11 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -2666,8 +2731,11 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -2707,15 +2775,18 @@
<jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
<jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
<jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
+ <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
<jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<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."/>
@@ -2751,9 +2822,12 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <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."/>
@@ -2795,10 +2869,13 @@
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<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."/>
@@ -2848,6 +2925,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."/>
@@ -2968,16 +3048,19 @@
<jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<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="juddi.proxy.transportClass" value="org.jboss.jaxr.juddi.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.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."/>
@@ -3023,6 +3106,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}" />
<classpath>
<pathelement location="${build.classes}"/>
@@ -3069,6 +3155,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."/>
@@ -3107,10 +3196,13 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<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}"/>
@@ -3160,11 +3252,13 @@
<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."/>
@@ -3212,9 +3306,12 @@
<jvmarg value="${junit.jvm.options}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <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"/>
@@ -3226,7 +3323,7 @@
<jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
+ <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
<jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
<sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/>
@@ -3274,11 +3371,13 @@
<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."/>
@@ -3330,11 +3429,13 @@
<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."/>
@@ -3374,11 +3475,14 @@
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="jbosstest.secure" value="true"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -3703,11 +3807,14 @@
<sysproperty key="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.secure" value="false"/>
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/security/tst.keystore"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" 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>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/old-test-jars.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/old-test-jars.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/old-test-jars.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -5383,7 +5383,7 @@
<include name="**/*"/>
</fileset>
<filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="jbosstest.host.name" value="${node0.url}"/>
</filterset>
</copy>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/webservice.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/webservice.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/webservice.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -12,7 +12,7 @@
<include name="**/*.xml"/>
</fileset>
<filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="jbosstest.host.name" value="${node0.url}"/>
</filterset>
</copy>
<!-- Copy binary files -->
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -83,6 +83,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="jbm-noncluster" host="${node0}">
@@ -92,6 +93,7 @@
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<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}" />
</server>
<server name="jbm-cluster1" host="${node0}">
@@ -101,6 +103,7 @@
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
<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}" />
</server>
<server name="jbm-cluster2" host="${node1}">
@@ -108,10 +111,12 @@
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="jbossnode0" value="${node0}"/>
+ <!-- used in Hypersonic JDBC URL -->
+ <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="securitymgr" config="default" host="${node0}">
@@ -125,18 +130,21 @@
<jvmarg value="-Djava.security.debug=policy"/>
<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}" />
</server>
<server name="scoped-aop-jdk14" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xbootclasspath/p:${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar${separator}${jboss.dist}/bin/woven-classloader"/>
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="scoped-aop-jdk50" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="jacc-securitymgr" host="${node0}" config="jacc-securitymgr">
<jvmarg value="${jpda.cmdline}" />
@@ -148,258 +156,313 @@
<jvmarg value="-Djava.security.debug="/>
<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}" />
</server>
<server name="jacc" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<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}" />
</server>
<server name="jacc-security-external" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="jacc-security-allstarrole" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="custom-securitymgr" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-ssl" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-sso" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-webctx" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-federation" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="unified-java" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xmx128m" />
<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}" />
</server>
<server name="unified-jboss" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xmx128m" />
<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}" />
</server>
<server name="node0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="node1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-UDP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-UDP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-UDP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-UDP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
</server>
<server name="cluster-field-UDP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-UDP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-USTXSTICKY-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-UDP-USTXSTICKY-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-field-TCP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-USTXSTICKY-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cluster-TCP-USTXSTICKY-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-sso-cluster0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-sso-cluster1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-sso-cluster-br0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="tomcat-sso-cluster-br1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="dtm0" host="${node0}">
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="dtm1" host="${node1}">
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="dtm2" host="${node2}">
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="dtm3" host="${node3}">
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="binding-manager2" host="${node0}" httpPort="8280" rmiPort="1299">
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="jrmp-invoker" host="${node0}">
<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="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="webservice-ssl" host="${node0}">
<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}">
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="classloader-leak" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
@@ -408,6 +471,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cc" host="${node0}" config="cc">
<jvmarg value="${jpda.cmdline}" />
@@ -416,6 +480,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
<server name="cc-sm" host="${node0}" config="cc">
<jvmarg value="${jpda.cmdline}" />
@@ -430,6 +495,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
</server>
</server:config>
@@ -473,7 +539,7 @@
<!-- A macro for stopping jboss with a jnp url
-->
<macrodef name="stop-jboss">
- <attribute name="url" default="jnp://${node0}:1099"
+ <attribute name="url" default="jnp://${node0.url}:1099"
description="The jndi provider url used to lookup the RMIAdaptor"/>
<attribute name="jvmargs" default=""
description="Addtional jvm args"/>
@@ -843,7 +909,10 @@
<sysproperty key="jboss-junit-configuration" value="@{junit.configuration}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
<syspropertyset>
<propertyref prefix="jbosstest"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/binding/BindingServiceUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -48,8 +48,9 @@
public class BindingServiceUnitTestCase
extends JBossTestCase
{
- static final String SERVER0_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host", "localhost") + ":1199";
- static final String SERVER1_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host", "localhost") + ":1299";
+ // JBPAPP-2997
+ static final String SERVER0_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url","localhost") + ":1199";
+ static final String SERVER1_JNDI_URL = "jnp://" + System.getProperty("jbosstest.server.host.url","localhost") + ":1299";
static HashSet VALID_STATES = new HashSet();
static
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/bean/MBeanUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -68,7 +68,8 @@
p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
p_.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
- p_.put(Context.PROVIDER_URL, getServerHost() + ":1099");
+ // JBPAPP-2997
+ p_.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
obj = new InitialContext(p_).lookup(TreeCacheMBeanTesterHome.JNDI_NAME);
cache_home = (TreeCacheMBeanTesterHome) PortableRemoteObject.narrow(obj, TreeCacheMBeanTesterHome.class);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/CacheObjectMBeanUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -56,7 +56,8 @@
{
Hashtable props = new Hashtable();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- props.put(Context.PROVIDER_URL, getServerHost() + ":1099");
+ // JBPAPP-2997
+ props.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
Context ctx = new InitialContext(props);
CacheObjectMeanTesterHome home = (CacheObjectMeanTesterHome)ctx.lookup(
CacheObjectMeanTesterHome.JNDI_NAME);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cache/test/aop/MBeanUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -70,7 +70,8 @@
p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
p_.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
- p_.put(Context.PROVIDER_URL, getServerHost() + ":1099");
+ // JBPAPP-2997
+ p_.put(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
obj = new InitialContext(p_).lookup(TreeCacheAopMBeanTesterHome.JNDI_NAME);
cache_home = (TreeCacheAopMBeanTesterHome) PortableRemoteObject.narrow(obj, TreeCacheAopMBeanTesterHome.class);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -75,7 +75,8 @@
for (int i = 0; i < ejbs.length; i++)
removeClassLoader(ejbs[i]);
- baseURL = "http://" + getServerHost() + ":8080/" + getWarContextPath() + "/";
+ // JBPAPP-2997
+ baseURL = "http://" + getServerHostForURL() + ":8080/" + getWarContextPath() + "/";
}
protected void tearDown() throws Exception
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -113,14 +113,15 @@
try
{
deploy("log4j113.war");
- URL log4jServletURL = new URL("http://" + getServerHost() + ":8080/log4j113/Log4jServlet/");
+ // JBPAPP-2997
+ 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)
@@ -143,9 +144,10 @@
try
{
deploy("common-logging.war");
- URL log4jServletURL = new URL("http://" + getServerHost() + ":8080/common-logging/Log4jServlet/");
+ // JBPAPP-2997
+ 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)
@@ -169,9 +171,10 @@
try
{
deploy("cl11-withjar.war");
- URL log4jServletURL = new URL("http://" + getServerHost() + ":8080/cl11-withjar/Log4jServlet/?log-name=cl11-withjar.log");
+ // JBPAPP-2997
+ URL log4jServletURL = new URL("http://" + getServerHostForURL() + ":8080/cl11-withjar/Log4jServlet/?log-name=cl11-withjar.log");
InputStream reply = (InputStream) log4jServletURL.getContent();
- getLog().debug("Accessed http://" + getServerHost() + ":8080/cl11-withjar/Log4jServlet/");
+ getLog().debug("Accessed http://" + getServerHostForURL() + ":8080/cl11-withjar/Log4jServlet/");
logReply(reply);
}
catch(Exception e)
@@ -196,9 +199,10 @@
try
{
deploy("oldxerces.war");
- URL servletURL = new URL("http://" + getServerHost() + ":8080/oldxerces/");
+ // JBPAPP-2997
+ 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)
@@ -314,7 +318,8 @@
{
deploy("shared-jndi.sar");
deploy("shared-jndi.war");
- URL servletURL = new URL("http://" + getServerHost() + ":8080/shared-jndi/LookupServlet");
+ // JBPAPP-2997
+ URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/shared-jndi/LookupServlet");
InputStream reply = (InputStream) servletURL.getContent();
getLog().debug("Accessed: "+servletURL);
logReply(reply);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -106,7 +106,8 @@
env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.jnp.interfaces.NamingContextFactory");
env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
env.setProperty("j2ee.clientName", "test-client");
InitialContext ctx = new InitialContext(env);
Context enc = (Context) ctx.lookup("java:comp/env");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/httpsessionreplication/HttpSessionReplicationUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -48,7 +48,8 @@
/**
* The Servernames should be configurable.
*/
- private String[] servernames= {"jnp://" + getServerHost() + ":1099", "jnp://" + getServerHost() + ":1199"};
+ // JBPAPP-2997
+ private String[] servernames= {"jnp://" + getServerHostForURL() + ":1099", "jnp://" + getServerHostForURL() + ":1199"};
/**
* The main properties file that should be under src/resources/cluster
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/test/BaseTest.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -69,6 +69,12 @@
{
baseURL1_ = httpURLs[1];
}
+
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("servers_[0] = " + servers_[0]) ;
+ if (servers_.length > 1)
+ getLog().debug("servers_[1] = " + servers_[1]) ;
+ }
}
/**
@@ -238,11 +244,17 @@
protected void setCookieDomainToThisServer(HttpClient client, String server)
{
+ if (getLog().isDebugEnabled())
+ logClientCookies(client, server) ;
+
// Get the session cookie
Cookie sessionID = getSessionCookie(client, server);
// Reset the domain so that the cookie will be sent to server1
sessionID.setDomain(server);
client.getState().addCookie(sessionID);
+
+ if (getLog().isDebugEnabled())
+ logClientCookies(client, server) ;
}
protected String getSessionID(HttpClient client, String server)
@@ -284,4 +296,20 @@
return id;
}
}
+
+ private void logClientCookies(HttpClient client, String server) {
+ HttpState state = client.getState();
+ Cookie[] cookies = state.getCookies();
+ getLog().debug("Client side cookies for server: " + server) ;
+ for(int c = 0; c < cookies.length; c ++)
+ {
+ Cookie k = cookies[c];
+ getLog().debug("Cookie[" + c + "]: path: " + k.getPath()) ;
+ getLog().debug("Cookie[" + c + "]: path specified(by server)?: " + k.isPathAttributeSpecified()) ;
+ getLog().debug("Cookie[" + c + "]: domain: " + k.getDomain()) ;
+ getLog().debug("Cookie[" + c + "]: domain specified(by server)?: " + k.isDomainAttributeSpecified()) ;
+ getLog().debug("Cookie[" + c + "]: expiry: " + k.getExpiryDate()) ;
+ getLog().debug("Cookie[" + c + "]: external form: " + k.toExternalForm()) ;
+ }
+ }
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -237,7 +237,8 @@
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
env.setProperty(Context.OBJECT_FACTORIES, "org.jboss.naming:org.jnp.interfaces");
- env.setProperty(Context.PROVIDER_URL, System.getProperty("jboss.bind.address", "localhost") + ":1099");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + System.getProperty("jboss.bind.url.address", "localhost") + ":1099");
InitialContext ctx = new InitialContext(env);
log.info("looking up: "+ejbName);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -55,10 +55,12 @@
*/
public void testWithInvalidDefaultJndiContext() throws Exception
{
- System.setProperty(Context.PROVIDER_URL, getServerHost() + ":65535");
+ // JBPAPP-2997
+ System.setProperty(Context.PROVIDER_URL, getServerHostForURL() + ":65535");
Properties env = new Properties(System.getProperties());
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, getServerHost() + ":1099");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
env.setProperty("jnp.disableDiscovery", "true");
InitialContext ctx = new InitialContext(env);
UserTransaction ut = (UserTransaction) ctx.lookup("UserTransaction");
@@ -85,7 +87,8 @@
public void testWithDefaultJndiContext() throws Exception
{
log.info("+++ testWithDefaultJndiContext");
- System.setProperty(Context.PROVIDER_URL, getServerHost() + ":1099");
+ // JBPAPP-2997
+ System.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
InitialContext ctx = new InitialContext();
UserTransaction ut = (UserTransaction) ctx.lookup("UserTransaction");
ut.getStatus();
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/DeploymentTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -340,7 +340,8 @@
private void assertServletAccess(String context) throws IOException
{
// Check that we can access the servlet
- URL servletURL = new URL("http://" + getServerHost() + ":8080/" + context);
+ // JBPAPP-2997
+ URL servletURL = new URL("http://" + getServerHostForURL() + ":8080/" + context);
BufferedReader br = new BufferedReader(new InputStreamReader(servletURL.openStream()));
String message = br.readLine();
assertEquals("Hello World!", message);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/deployment/test/DeploymentServiceUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -89,7 +89,8 @@
// Prepare the template properties
HashMap props = new HashMap();
props.put("jndi-name", "TestNoTxDataSource");
- props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHost() + ":1701");
+ // JBPAPP-2997
+ props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHostForURL() + ":1701");
props.put("driver-class", "org.hsqldb.jdbcDriver");
// Add some fake connection properties
@@ -190,7 +191,8 @@
HashMap props = new HashMap();
props.put("jndi-name", jndiName); // use a name other than default
props.put("use-java-context", new Boolean(false)); // set this to false to allow remote lookup
- props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHost() + ":1701"); // using hsqldb
+ // JBPAPP-2997
+ props.put("connection-url", "jdbc:hsqldb:hsql://" + getServerHostForURL() + ":1701"); // using hsqldb
props.put("driver-class", "org.hsqldb.jdbcDriver");
props.put("user-name", "sa");
props.put("password", "");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -57,18 +57,20 @@
{
super(name);
URL url;
- String host = System.getProperty("jbosstest.server.host", "localhost");
-
+ // String host = System.getProperty("jbosstest.server.host", "localhost");
+ // JBPAPP-2997
+ String hostForURL = getServerHostForURL() ;
+
url = ClassLoader.getSystemResource("iiop.jndi.properties");
iiopJndiProps = new java.util.Properties();
iiopJndiProps.load(url.openStream());
- String jnp = "jnp://"+host+":1099/iiop";
+ String jnp = "jnp://"+hostForURL+":1099/iiop";
iiopJndiProps.setProperty("java.naming.provider.url", jnp);
url = ClassLoader.getSystemResource("cosnaming.jndi.properties");
cosnamingJndiProps = new java.util.Properties();
cosnamingJndiProps.load(url.openStream());
- String corbaloc = "corbaloc::"+host+":3528/JBoss/Naming/root";
+ String corbaloc = "corbaloc::"+hostForURL+":3528/JBoss/Naming/root";
cosnamingJndiProps.setProperty("java.naming.provider.url", corbaloc);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -501,13 +501,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");
+ // JBPAPP-2997
+ 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: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmq/test/HTTPConnectionUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -101,7 +101,8 @@
Properties props = new Properties();
props.setProperty(HTTPServerILFactory.SERVER_IL_FACTORY_KEY, HTTPServerILFactory.SERVER_IL_FACTORY);
props.setProperty(HTTPServerILFactory.CLIENT_IL_SERVICE_KEY, HTTPServerILFactory.CLIENT_IL_SERVICE);
- props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHost() + ":8080/jbossmq-httpil/HTTPServerILServlet");
+ // JBPAPP-2997
+ props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHostForURL() + ":8080/jbossmq-httpil/HTTPServerILServlet");
props.setProperty(HTTPServerILFactory.PING_PERIOD_KEY, "0");
props.setProperty(HTTPServerILFactory.TIMEOUT_KEY, "60");
props.setProperty(HTTPServerILFactory.REST_INTERVAL_KEY, "1");
@@ -129,7 +130,8 @@
Properties props = new Properties();
props.setProperty(HTTPServerILFactory.SERVER_IL_FACTORY_KEY, HTTPServerILFactory.SERVER_IL_FACTORY);
props.setProperty(HTTPServerILFactory.CLIENT_IL_SERVICE_KEY, HTTPServerILFactory.CLIENT_IL_SERVICE);
- props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHost() + ":8080/jbossmq-httpil/restricted/HTTPServerILServlet");
+ // JBPAPP-2997
+ props.setProperty(HTTPServerILFactory.SERVER_URL_KEY, "http://" + getServerHostForURL() + ":8080/jbossmq-httpil/restricted/HTTPServerILServlet");
props.setProperty(HTTPServerILFactory.PING_PERIOD_KEY, "0");
props.setProperty(HTTPServerILFactory.TIMEOUT_KEY, "60");
props.setProperty(HTTPServerILFactory.REST_INTERVAL_KEY, "1");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -444,7 +444,8 @@
private Properties createNamingEnvironment(String port)
{
- String namingURL = getServerHost() + ":" + port;
+ // JBPAPP-2997
+ String namingURL = getServerHostForURL() + ":" + port;
Properties env = new Properties();
env.setProperty(Context.PROVIDER_URL, namingURL);
env.setProperty(NamingContext.JNP_DISABLE_DISCOVERY, "true");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -60,7 +60,8 @@
getLog().debug("+++ testCreateSubcontext");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":10999/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
env.setProperty("jnp.disableDiscovery", "true");
InitialContext ctx = new InitialContext(env);
ctx.createSubcontext("foo");
@@ -87,7 +88,8 @@
getLog().debug("+++ testLookup");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":10999/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
env.setProperty("jnp.disableDiscovery", "true");
InitialContext ctx = new InitialContext(env);
Object obj = ctx.lookup("");
@@ -123,7 +125,8 @@
getLog().info("+++ testSharedLookup");
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":10999/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
env.setProperty("jnp.disableDiscovery", "true");
InitialContext ctx = new InitialContext(env);
Object obj = ctx.lookup("jmx/rmi/RMIAdaptor");
@@ -141,7 +144,8 @@
// Look a name that does not exist
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":10999/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":10999/");
env.setProperty("jnp.disableDiscovery", "true");
InitialContext ctx = new InitialContext(env);
try
@@ -156,7 +160,8 @@
// Do a lookup on an server port that does not exist
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.disableDiscovery", "true");
log.debug("Creating InitialContext with env="+env);
try
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SecurityUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -86,7 +86,8 @@
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
// Test the secured JNDI factory
- env.setProperty(Context.PROVIDER_URL, "http://" + getServerHost() + ":8080/invoker/restricted/JNDIFactory");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/restricted/JNDIFactory");
getLog().debug("Creating InitialContext with env="+env);
// Try without a login to ensure the lookup fails
@@ -123,7 +124,8 @@
lc.login();
// Test the secured JNDI factory
- env.setProperty(Context.PROVIDER_URL, "http://" + getServerHost() + ":8080/invoker/restricted/JNDIFactory");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/restricted/JNDIFactory");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new InitialContext(env);
getLog().debug("Created InitialContext");
@@ -173,7 +175,8 @@
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.HttpNamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "http://" + getServerHost() + ":8080/invoker/ReadOnlyJNDIFactory");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "http://" + getServerHostForURL() + ":8080/invoker/ReadOnlyJNDIFactory");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new InitialContext(env);
Object data = ctx.lookup("readonly/data");
@@ -229,7 +232,8 @@
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.jboss.test.naming.test.BootstrapNamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099");
env.setProperty("bootstrap-binding", "naming/Naming");
getLog().debug("Creating bootstrap InitialContext with env="+env);
InitialContext bootCtx = new InitialContext(env);
@@ -307,7 +311,8 @@
Properties env = new Properties();
// Try with a login that should succeed
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.LoginInitialContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
env.setProperty(Context.SECURITY_PROTOCOL, "testLoginInitialContext");
@@ -354,7 +359,8 @@
Properties env = new Properties();
// Try with a login that should succeed
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.LoginInitialContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
env.setProperty(Context.SECURITY_PROTOCOL, "testLoginInitialContext");
@@ -396,7 +402,8 @@
Properties env = new Properties();
// Try with a login that should succeed
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
@@ -433,7 +440,8 @@
Properties env = new Properties();
// Try with a login that should succeed
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.security.jndi.JndiLoginInitialContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1099/");
env.setProperty(Context.SECURITY_CREDENTIALS, "theduke");
env.setProperty(Context.SECURITY_PRINCIPAL, "jduke");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -114,7 +114,8 @@
{
getLog().debug("+++ testLookup");
InitialContext ctx = getInitialContext();
- Name name = ctx.getNameParser("").parse("jnp://" + getServerHost() + "/jmx");
+ // JBPAPP-2997
+ Name name = ctx.getNameParser("").parse("jnp://" + getServerHostForURL() + "/jmx");
Name copy = (Name) name.clone();
Object obj = ctx.lookup(name);
getLog().debug("lookup("+name+") = "+obj);
@@ -143,7 +144,8 @@
// Do a lookup on an server port that does not exist
env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.disableDiscovery", "true");
getLog().debug("Creating InitialContext with env="+env);
try
@@ -162,7 +164,8 @@
{
getLog().debug("+++ testHaInvoker");
Properties env = new Properties();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1100/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new InitialContext(env);
getLog().debug("Created InitialContext");
@@ -189,7 +192,8 @@
// Look a name that does not exist
java.util.Properties env = new java.util.Properties();
env.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- env.setProperty(javax.naming.Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1100/");
+ // JBPAPP-2997
+ env.setProperty(javax.naming.Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":1100/");
getLog().debug("Creating InitialContext with env="+env);
InitialContext ctx = new javax.naming.InitialContext(env);
@@ -236,7 +240,8 @@
getLog().debug("+++ testHjnp.localAddressaParitionName");
Properties env = new Properties();
String serverHost = getServerHost();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.localAddress", serverHost);
env.setProperty("jnp.partitionName", "DefaultPartition");
// Don't let the discovery packet off the test server so we don't
@@ -263,7 +268,8 @@
ctx.close();
// Now test discovery with a non-existent parition name
- env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.partitionName", "__NotTheDefaultPartition__");
try
{
@@ -287,7 +293,8 @@
getLog().debug("+++ testDiscoveryPort");
Properties env = new Properties();
String serverHost = getServerHost();
- env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
+ // JBPAPP-2997
+ env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHostForURL() + ":65535/");
env.setProperty("jnp.localAddress", serverHost);
env.setProperty("jnp.discoveryPort", "1102");
// Don't let the discovery packet off the test server so we don't
@@ -319,7 +326,8 @@
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");
+ // JBPAPP-2997
+ 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: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -97,7 +97,8 @@
*/
public void testCustomPrincipalTransmissionInVM() throws Exception
{
- String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ 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: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -141,7 +141,8 @@
getLog().debug("Created serverSocket: "+serverSocket);
int port = serverSocket.getLocalPort();
InetAddress addr = serverSocket.getInetAddress();
- httpsURL = "https://" + getServerHost() + ":" + port + '/';
+ // JBPAPP-2997
+ httpsURL = "https://" + getServerHostForURL() + ":" + port + '/';
AcceptThread thread = new AcceptThread(serverSocket, getLog(), httpsURL);
synchronized( httpsURL )
{
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -371,7 +371,8 @@
String jdbcURL = "";
try
{
- jdbcURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+ // JBPAPP-2997
+ jdbcURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1701";
con = DriverManager.getConnection(jdbcURL, user, pass);
}
catch(java.sql.SQLException sqle)
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/DBSetup.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -83,7 +83,9 @@
protected void tearDown() throws Exception
{
Class.forName("org.hsqldb.jdbcDriver");
- String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host", "localhost") + ":1701";
+ // JBPAPP-2997
+ String dbURL = "jdbc:hsqldb:hsql://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":1701";
+ System.out.println("Connecting to dbURL " + dbURL + " for database shutdown..");
Connection conn = DriverManager.getConnection(dbURL, "sa", "");
Statement statement = conn.createStatement();
statement.executeQuery("SHUTDOWN COMPACT");
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/util/web/HttpUtils.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -45,8 +45,10 @@
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) + "/";
+ // JBPAPP-2997
+ private static String hostForURL = System.getProperty("jbosstest.server.host.url", "localhost") ;
+ private static String baseURL = "http://jduke:theduke@" + hostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private static String baseURLNoAuth = "http://" + hostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
public static final int GET = 1;
public static final int POST = 2;
@@ -62,8 +64,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@" + System.getProperty("jbosstest.server.host", "localhost") + ":"
- + Integer.getInteger("web.port", 8080) + "/";
+ String url = "http://"+username+":"+password+"@" + hostForURL + ":" + Integer.getInteger("web.port", 8080) + "/";
return url;
}
public static String getBaseURLNoAuth()
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/AuthenticatorsExternalizationTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -37,7 +37,8 @@
public class AuthenticatorsExternalizationTestCase extends JBossTestCase
{
MBeanServerConnection server = null;
- private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
public AuthenticatorsExternalizationTestCase(String name)
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/security/CustomHeaderAuthTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -45,7 +45,8 @@
*/
public class CustomHeaderAuthTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
private HttpClient httpConn = new HttpClient();
private String path = "header-form-auth/restricted/SecuredServlet";
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/FormAuthUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -36,6 +36,7 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.web.HttpUtils ;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -47,7 +48,9 @@
*/
public class FormAuthUnitTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth() ;
private HttpClient httpConn = new HttpClient();
public FormAuthUnitTestCase(String name)
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -37,7 +37,7 @@
*/
public class RemoteClassloadingServiceUnitTestCase extends JBossTestCase
{
- static final String baseURL = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":8083/";
+ static final String baseURL = "http://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":8083/";
public RemoteClassloadingServiceUnitTestCase(String name)
{
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/SingleSignOnUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -33,7 +33,8 @@
*/
public class SingleSignOnUnitTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080);
+ // JBPAPP-2997
+ private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080);
public SingleSignOnUnitTestCase(String name)
{
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -226,7 +226,9 @@
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://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL2 = HttpUtils.getBaseURLNoAuth() ;
URL url2 = new URL(baseURL2+"jbosstest/restricted/UnsecureEJBServlet");
getLog().info("Accessing SecureServlet with no login");
HttpUtils.accessURL(url2, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
@@ -235,7 +237,9 @@
*/
public void testSecureServletWithBadPass() throws Exception
{
- String baseURL = "http://jduke:badpass@" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://jduke:badpass@" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURL("jduke", "badpass") ;
URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
}
@@ -243,7 +247,9 @@
*/
public void testSecureServletWithNoLogin() throws Exception
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"jbosstest/restricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_UNAUTHORIZED);
}
@@ -251,7 +257,9 @@
*/
public void testNotJbosstest() throws Exception
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"jbosstest-not/unrestricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -336,7 +344,9 @@
try
{
deploy("jbosstest-web2.ear");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"jbosstest-not2/unrestricted/SecureServlet");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
}
@@ -369,7 +379,9 @@
try
{
deploy("good-web.war");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"redeploy/index.html");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
getLog().debug(baseURL+"redeploy/index.html OK");
@@ -389,7 +401,9 @@
deploy("manifest-web.ear");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"manifest/classpath.jsp");
HttpMethodBase request = HttpUtils.accessURL(url);
Header errors = request.getResponseHeader("X-Exception");
@@ -421,7 +435,9 @@
try
{
deploy("jbosstest-good.ear");
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
URL url = new URL(baseURL+"redeploy/index.html");
HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
getLog().debug(baseURL+"redeploy/index.html OK");
@@ -447,7 +463,9 @@
deploy("class-loading.war");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
// Load a log4j class
URL url = new URL(baseURL+"class-loading/ClasspathServlet2?class=org.apache.log4j.net.SocketAppender");
HttpMethodBase request = HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
@@ -477,7 +495,9 @@
deploy("class-loading-ulr.war");
try
{
- String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // JBPAPP-2997
+ String baseURL = HttpUtils.getBaseURLNoAuth() ;
// Load a log4j class
URL url = new URL(baseURL+"class-loading-ulr/ClasspathServlet2?class=org.apache.log4j.net.SocketAppender");
HttpMethodBase request = HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/WebProgrammaticLoginTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -40,8 +40,8 @@
*/
public class WebProgrammaticLoginTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost()
- + ":" + Integer.getInteger("web.port", 8080) + "/";
+ // JBPAPP-2997
+ private String baseURLNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
private HttpClient httpConn = new HttpClient();
public WebProgrammaticLoginTestCase(String name)
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/web/test/ssl/SSLUnitTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -37,8 +37,9 @@
*/
public class SSLUnitTestCase extends JBossTestCase
{
- private String baseHttpNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
- private String baseHttpsNoAuth = "https://" + getServerHost() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
+ // JBPAPP-2997
+ private String baseHttpNoAuth = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private String baseHttpsNoAuth = "https://" + getServerHostForURL() + ":" + Integer.getInteger("secureweb.port", 8443) + "/";
public SSLUnitTestCase(String name)
{
@@ -64,7 +65,8 @@
log.info("+++ testHttpRedirectSecurityDomain");
int port = Integer.getInteger("web.port", 8080).intValue();
port += 1000;
- String httpNoAuth = "http://" + getServerHost() + ":" + port + "/";
+ // JBPAPP-2997
+ String httpNoAuth = "http://" + getServerHostForURL() + ":" + port + "/";
doHttpRedirect(httpNoAuth);
}
@@ -83,7 +85,8 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1000;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ // JBPAPP-2997
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
@@ -96,7 +99,8 @@
log.info("+++ testHttps");
int port = Integer.getInteger("secureweb.port", 8443).intValue();
port += 1500;
- String httpsNoAuth = "https://" + getServerHost() + ":" + port + "/";
+ // JBPAPP-2997
+ String httpsNoAuth = "https://" + getServerHostForURL() + ":" + port + "/";
doHttps(httpsNoAuth);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -27,6 +27,11 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
+import java.net.URL ;
+import java.io.BufferedReader ;
+import java.io.InputStreamReader ;
+import java.io.IOException ;
+
/** A test for the examples from the JBoss Admin Devel book.
*
* @author Thomas.Diesler at jboss.org
@@ -54,10 +59,35 @@
{
InitialContext iniCtx = getClientContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
+ // debugging
+ URL wsdl = service.getWSDLDocumentLocation() ;
+ printURLContents(wsdl) ;
+
helloPort = (Hello)service.getPort(Hello.class);
}
}
+ private void printURLContents(URL url) {
+ BufferedReader in = null ;
+ String inputLine = null ;
+
+ // the WSDL URL is correct
+ // the WSDL contents are incorrect, carrying an invalid soap:address location=
+ log.debug("URL = " + url + ": contents: START") ;
+
+ try {
+ in = new BufferedReader(new InputStreamReader(url.openStream())) ;
+
+ while ((inputLine = in.readLine()) != null)
+ log.debug(inputLine);
+
+ in.close();
+ } catch(IOException e) {
+ e.printStackTrace() ;
+ }
+ log.debug("URL contents: END") ;
+ }
+
public void testHelloString() throws Exception
{
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -140,7 +140,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: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/MarkupTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -66,8 +66,9 @@
*/
public class MarkupTestCase extends WebserviceTestBase
{
+ // JBPAPP-2997
private String url = "http://"
- + getServerHost() + ":"
+ + getServerHostForURL() + ":"
+ Integer.getInteger("web.port", 8080) + "/wsrp/MarkupService";
public MarkupTestCase(String name)
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/PortletManagementTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -84,10 +84,11 @@
public void testGetPortletDescriptionDynamicEndpoint() throws Exception
{
Service service = getService();
+ // JBPAPP-2997
WSRP_v1_PortletManagement_PortType endpoint =
(WSRP_v1_PortletManagement_PortType)service.getPort(WSRP_v1_PortletManagement_PortType.class);
((javax.xml.rpc.Stub)endpoint)._setProperty("javax.xml.rpc.service.endpoint.address",
- "http://" + getServerHost() +":8080/wsrp/PortletManagementService");
+ "http://" + getServerHostForURL() +":8080/wsrp/PortletManagementService");
GetPortletDescription ic = new GetPortletDescription(new RegistrationContext(),
new PortletContext("portletHandle", "portletState".getBytes(), new Extension[]{}),
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/wsrp/WSRPWSDLToEndpointTestCase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -71,7 +71,8 @@
public void testEndpointGrab() throws Exception
{
- String wsdl_url = "http://" + this.getServerHost() + ":8080/wsrp/MarkupService?wsdl";
+ // JBPAPP-2997
+ String wsdl_url = "http://" + this.getServerHostForURL() + ":8080/wsrp/MarkupService?wsdl";
Definition def = getWSDLDefinition(new URL(wsdl_url));
Service serve = def.getService(new QName("urn:oasis:names:tc:wsrp:v1:wsdl","WSRPService"));
assertMarkupService(serve);
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -6,7 +6,7 @@
<ejb-name>SessionA</ejb-name>
<ejb-ref>
<ejb-ref-name>ejb/SessionB</ejb-ref-name>
- <jndi-name>jnp://${jboss.bind.address:localhost}:1099/SessionB</jndi-name>
+ <jndi-name>jnp://${jboss.bind.url.address:localhost}:1099/SessionB</jndi-name>
</ejb-ref>
</session>
</enterprise-beans>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/jmx/invoker/sar/META-INF/jboss-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -91,7 +91,7 @@
<!-- Expose the jmx invoker service interface via HTTP -->
<mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
name="jboss.jmx:type=adaptor,name=Invoker,protocol=http,service=proxyFactory">
- <attribute name="InvokerURL">http://${jboss.bind.address:localhost}:8080/invoker/JMXInvokerServlet</attribute>
+ <attribute name="InvokerURL">http://${jboss.bind.url.address:localhost}:8080/invoker/JMXInvokerServlet</attribute>
<!-- The target MBean is the InvokerAdaptorService configured below -->
<depends optional-attribute-name="InvokerName">jboss.jmx:type=adaptor,name=Invoker</depends>
<attribute name="ExportedInterface">org.jboss.jmx.adaptor.rmi.RMIAdaptorExt</attribute>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security-srp/service-inf/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security-srp/service-inf/jboss-service.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/security-srp/service-inf/jboss-service.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -30,7 +30,7 @@
<!-- 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>
+ <attribute name="InvokerURL">http://${jboss.bind.url.address}:8080/invoker/JMXInvokerServlet</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>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -11,7 +11,7 @@
<!-- Datasources are not available outside the virtual machine -->
<jndi-name>DefaultDS</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.url.address}:1701</connection-url>
<!-- The driver class -->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -11,7 +11,7 @@
<!-- Datasources are not available outside the virtual machine -->
<jndi-name>DefaultDS</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jbossnode0}:1701</connection-url>
+ <connection-url>jdbc:hsqldb:hsql://${jbosstest.cluster.node0.url}:1701</connection-url>
<!-- The driver class -->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
Modified: branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java 2010-01-06 23:11:07 UTC (rev 99079)
@@ -32,11 +32,12 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.system.server.ServerConfigUtil ;
/**
* Integration with <a href="http://sourceforge.net/projects/hsqldb">HSQLDB</a>
*
- * @author <a href="mailto:rickard.oberg at telkel.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard.oberg at telkel.com">Rickard �berg</a>
* @author <a href="mailto:Scott_Stark at displayscape.com">Scott Stark</a>.
* @author <a href="mailto:pf at iprobot.com">Peter Fagerlund</a>
* @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
@@ -480,7 +481,8 @@
new String[] {
"-noexit",
"-driver", driver,
- "-url", JDBC_URL_PREFIX + "hsql://" + connectHost + ":" + port,
+ // JBPAPP-3018
+ "-url", JDBC_URL_PREFIX + "hsql://" + ServerConfigUtil.fixHostnameForURL(connectHost) + ":" + port,
"-user", user,
"-password", password,
"-dir", getDatabasePath()
@@ -734,7 +736,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;
+ // JBPAPP-3018
+ String dbURL = JDBC_URL_PREFIX + "hsql://" + ServerConfigUtil.fixHostnameForURL(connectHost) + ":" + port;
Connection connection = getConnection(dbURL);
Statement statement = connection.createStatement();
Modified: branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/services/binding/sample-bindings.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/services/binding/sample-bindings.xml 2010-01-06 22:18:01 UTC (rev 99078)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/services/binding/sample-bindings.xml 2010-01-06 23:11:07 UTC (rev 99079)
@@ -42,7 +42,7 @@
<service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3873</attribute>
</delegate-config>
<binding port="3873"/>
</service-config>
@@ -173,7 +173,7 @@
<attribute name="Properties"><![CDATA[
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
- java.naming.provider.url=${jboss.bind.address:localhost}:1100
+ java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1100
jnp.disableDiscovery=false
jnp.partitionName=${jboss.partition.name:DefaultPartition}
jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -452,7 +452,7 @@
<service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:3973</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:3973</attribute>
</delegate-config>
<binding port="3973"/>
</service-config>
@@ -584,7 +584,7 @@
<attribute name="Properties"><![CDATA[
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
- java.naming.provider.url=${jboss.bind.address:localhost}:1200
+ java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1200
jnp.disableDiscovery=false
jnp.partitionName=${jboss.partition.name:DefaultPartition}
jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -865,7 +865,7 @@
<service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:4073</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:4073</attribute>
</delegate-config>
<binding port="4073"/>
</service-config>
@@ -997,7 +997,7 @@
<attribute name="Properties"><![CDATA[
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
- java.naming.provider.url=${jboss.bind.address:localhost}:1300
+ java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1300
jnp.disableDiscovery=false
jnp.partitionName=${jboss.partition.name:DefaultPartition}
jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
@@ -1279,7 +1279,7 @@
<service-config name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3"
delegateClass="org.jboss.services.binding.AttributeMappingDelegate">
<delegate-config>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:4173</attribute>
+ <attribute name="InvokerLocator">socket://${jboss.bind.url.address}:4173</attribute>
</delegate-config>
<binding port="4173"/>
</service-config>
@@ -1411,7 +1411,7 @@
<attribute name="Properties"><![CDATA[
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
- java.naming.provider.url=${jboss.bind.address:localhost}:1400
+ java.naming.provider.url=jnp://${jboss.bind.url.address:localhost}:1400
jnp.disableDiscovery=false
jnp.partitionName=${jboss.partition.name:DefaultPartition}
jnp.discoveryGroup=${jboss.partition.udpGroup:230.0.0.4}
More information about the jboss-cvs-commits
mailing list