[jboss-cvs] JBossAS SVN: r109674 - branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/partition.

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

Author: rachmatowicz at jboss.com
Date: 2010-12-02 17:22:11 -0500 (Thu, 02 Dec 2010)
New Revision: 109674

Modified:
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
Log:
Fix InvokerURL in deployment for org.jboss.test.cluster.defaultcfg.test.PartitionRestartUnitTestCase (JBAS-8540)

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2010-12-02 22:16:20 UTC (rev 109673)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2010-12-02 22:22:11 UTC (rev 109674)
@@ -124,8 +124,39 @@
     <constructor>
       <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
       <!-- otherwise, parser will complain. -->
-      <parameter><![CDATA[socket://${jboss.bind.address:localhost}:14446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+      <!-- JBAS-8540
+       NOTE: In order to handle both IPv4 and IPv6 address literals in URLs (see rfc2732), the value of
+       the InvokerURL attribute is now constructed using the ServiceBindingManger, using the following format:
+         <value-factory bean="ServiceBindingManager" method="getStringBinding">
+           <parameter>servicename</parameter>
+           <parameter>bindingname</parameter>
+           <parameter>URL string</parameter>
+           <parameter>actual host</parameter>
+           <parameter>actual port</parameter>
+         </value-factory>
+       where 'URL string' is a string which may contain the substitution variables host, hostforurl and port.
+       The value-factory element will return a string with the variables ${host}, ${hostforurl} and ${port}
+       replaced with the values for host, hostforurl and port in the metadata for the ServiceBindingManager's
+       entry for that servicename/bindingname pair.
+       In order to ensure that the values 'actual host' and 'actual port' are used in the variable substitution,
+       you must ensure that servicename and bindingname are unique to your bean deployment on the AS
+       and do not match any existing ServiceBindingManager metadata entries. A safe approach is to use the
+       following practice:
+          servicename = the JMX ObjectName of your bean deployment
+          bindingname = any identifier unique among all beans deployed with the same servicename
+       If these values are not unique, you may instead pick up the host and port of an existing ServiceBindingManager
+       metadata entry which is probably not what you want.
+      -->          
       <parameter>
+		<value-factory bean="ServiceBindingManager" method="getStringBinding">
+	  	  <parameter>RestartConnector</parameter>
+	  	  <parameter><null/></parameter>
+	      <parameter><![CDATA[socket://${hostforurl}:${port}/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&enableTcpNoDelay=true]]></parameter>
+	      <parameter>${jboss.bind.address}</parameter>
+	      <parameter>14446</parameter>
+	    </value-factory>
+      </parameter>      
+      <parameter>
         <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
           <entry><key>dataType</key><value>invocation</value></entry>
           <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>