[jboss-cvs] JBossAS SVN: r97750 - in branches/JBPAPP_4_2_0_GA_CP_IPV6: testsuite/src/resources/test-configs/jbm-cluster2/deploy and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: rachmatowicz at jboss.com
Date: 2009-12-11 14:29:49 -0500 (Fri, 11 Dec 2009)
New Revision: 97750

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java
Log:
Fix Hypersonic MBean URLs and Messaging cluster test.


Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml	2009-12-11 19:05:54 UTC (rev 97749)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/imports/server-config.xml	2009-12-11 19:29:49 UTC (rev 97750)
@@ -108,7 +108,8 @@
        <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}" />

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml	2009-12-11 19:05:54 UTC (rev 97749)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster2/deploy/hsqldb-ds.xml	2009-12-11 19:29:49 UTC (rev 97750)
@@ -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_IPV6/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java	2009-12-11 19:05:54 UTC (rev 97749)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java	2009-12-11 19:29:49 UTC (rev 97750)
@@ -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();