[jboss-cvs] JBossAS SVN: r96368 - in branches/JBPAPP_4_2_0_GA_CP_IPV6: ejb3/src/resources and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 13 13:20:19 EST 2009
Author: rachmatowicz at jboss.com
Date: 2009-11-13 13:20:18 -0500 (Fri, 13 Nov 2009)
New Revision: 96368
Modified:
branches/JBPAPP_4_2_0_GA_CP_IPV6/connector/src/etc/example-config/hsqldb-ds.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/ejb3-service.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/ejb3-connectors-service.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/naming/src/main/org/jnp/interfaces/NamingContext.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/etc/conf/default/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/web/WebService.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/bin/run.sh
branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/Main.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/system/server/ServerConfigUtil.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/util/server/Server.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml
Log:
Initial set of fixes for JBPAPP-3018
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/connector/src/etc/example-config/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/connector/src/etc/example-config/hsqldb-ds.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/connector/src/etc/example-config/hsqldb-ds.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/ejb3/src/resources/META-INF/ejb3-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/ejb3-service.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/ejb3-service.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/jboss-service.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/META-INF/jboss-service.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/ejb3/src/resources/ejb3-connectors-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/ejb3-connectors-service.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/ejb3-connectors-service.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/messaging/src/main/org/jboss/mq/il/http/HTTPServerILService.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/naming/src/main/org/jnp/interfaces/NamingContext.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/naming/src/main/org/jnp/interfaces/NamingContext.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/naming/src/main/org/jnp/interfaces/NamingContext.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/etc/conf/default/jboss-service.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/etc/conf/default/jboss-service.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpInvoker.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/invocation/http/server/HttpProxyFactory.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/server/src/main/org/jboss/web/WebService.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/web/WebService.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/server/src/main/org/jboss/web/WebService.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/system/src/bin/run.sh
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/bin/run.sh 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/bin/run.sh 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/system/src/main/org/jboss/Main.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/Main.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/Main.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/system/src/main/org/jboss/system/server/ServerConfigUtil.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/system/server/ServerConfigUtil.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/system/src/main/org/jboss/system/server/ServerConfigUtil.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/test/src/main/org/jboss/test/util/server/Server.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/util/server/Server.java 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/util/server/Server.java 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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_IPV6/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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 -->
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml 2009-11-13 17:56:26 UTC (rev 96367)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/resources/test-configs/jbm-cluster1/deploy/hsqldb-ds.xml 2009-11-13 18:20:18 UTC (rev 96368)
@@ -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>
More information about the jboss-cvs-commits
mailing list