[jboss-cvs] JBossAS SVN: r109662 - in branches/JBoss-AS-6.0.x-ipv6/testsuite: src/main/org/jboss/test/cluster/defaultcfg/web/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 2 13:22:58 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-12-02 13:22:57 -0500 (Thu, 02 Dec 2010)
New Revision: 109662
Modified:
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/persistent/httpsession-ds.xml
Log:
Fix up deployment of datasource and connection URL in PersistentManager{CrossContextCalls,FormAuth}TestCase (JBAS-8540)
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml 2010-12-02 17:57:39 UTC (rev 109661)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/server-config.xml 2010-12-02 18:22:57 UTC (rev 109662)
@@ -386,6 +386,7 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -401,6 +402,7 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -418,6 +420,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-SYNC-1" host="${node1}">
<jvmarg value="-Xms128m" />
@@ -433,6 +436,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-DIST-0" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -448,6 +452,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-udp-DIST-1" host="${node1}">
<jvmarg value="-Xms128m" />
@@ -463,6 +468,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
</server>
<server name="cluster-tcp-0" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -477,6 +483,7 @@
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -493,6 +500,7 @@
<sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
@@ -687,6 +695,7 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -703,6 +712,7 @@
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="node0.bind.address.url" value="${node0.url}" />
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java 2010-12-02 17:57:39 UTC (rev 109661)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/PersistentManagerFormAuthTestCase.java 2010-12-02 18:22:57 UTC (rev 109662)
@@ -31,6 +31,7 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.jboss.test.JBossTestUtil;
import org.jboss.test.cluster.testutil.DBSetupDelegate;
import org.jboss.test.cluster.testutil.DelegatingClusteredTestCase;
import org.jboss.test.cluster.testutil.TestSetupDelegate;
@@ -55,7 +56,10 @@
protected void setUp() throws Exception
{
super.setUp();
- baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080);
+ // JBAS-8540 + getServerHost() is really for non-clustered test cases
+ // baseURLNoAuth = "http://" + getServerHost + ":" + Integer.getInteger("web.port", 8080);
+ baseURLNoAuth = "http://" + JBossTestUtil.fixHostnameForURL(getServers()[0]) + ":" + Integer.getInteger("web.port", 8080);
+
}
protected String getContextPath()
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/persistent/httpsession-ds.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/persistent/httpsession-ds.xml 2010-12-02 17:57:39 UTC (rev 109661)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/persistent/httpsession-ds.xml 2010-12-02 18:22:57 UTC (rev 109662)
@@ -14,7 +14,9 @@
<!-- For server mode db, allowing other processes to use hsqldb over tcp.
This requires the org.jboss.jdbc.HypersonicDatabase mbean.-->
- <connection-url>jdbc:hsqldb:hsql://${node0.bind.address:localhost}:1701</connection-url>
+ <!-- JBAS-8540 -->
+ <!-- would prefer use of SBM here, but need to assign to one specific host -->
+ <connection-url>jdbc:hsqldb:hsql://${node0.bind.address.url:localhost}:1701</connection-url>
<!-- For totally in-memory db, not saved when jboss stops.
The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
More information about the jboss-cvs-commits
mailing list