[jboss-cvs] JBossAS SVN: r99964 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/resources/test/localfromremote and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2010-01-26 18:53:34 -0500 (Tue, 26 Jan 2010)
New Revision: 99964

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi1.properties
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi2.properties
Log:
Update org.jboss.ejb3.test.localfromremote.unit.LocalTestCase to use jndi.properties file which is based on testsuite bind address (JBPAPP-2997)

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-26 23:52:03 UTC (rev 99963)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2010-01-26 23:53:34 UTC (rev 99964)
@@ -3503,6 +3503,9 @@
       <mkdir dir="${build.lib}"/>
 
       <copy file="${resources}/test/localfromremote/jndi1.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
+      <!-- adjust the hostname in jndi.properties to our bind address-->
+      <replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+
       <jar jarfile="${build.lib}/localfromremote-test1.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/localfromremote/*.class"/>
@@ -3516,6 +3519,9 @@
       <copy file="${build.lib}/localfromremote-test1.jar" tofile="${resources}/test-configs/localfromremote1/deploy/localfromremote-test.jar"/>
 
       <copy file="${resources}/test/localfromremote/jndi2.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
+      <!-- adjust the hostname in jndi.properties to our bind address-->
+      <replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+
       <jar jarfile="${build.lib}/localfromremote-test2.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/localfromremote/*.class"/>

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi1.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi1.properties	2010-01-26 23:52:03 UTC (rev 99963)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi1.properties	2010-01-26 23:53:34 UTC (rev 99964)
@@ -1,3 +1,4 @@
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1199
\ No newline at end of file
+# JBPAPP-2997
+java.naming.provider.url=jnp://JBOSS_BIND_URL_ADDRESS:1199
\ No newline at end of file

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi2.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi2.properties	2010-01-26 23:52:03 UTC (rev 99963)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/localfromremote/jndi2.properties	2010-01-26 23:53:34 UTC (rev 99964)
@@ -1,3 +1,4 @@
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
+# JBPAPP-2997
+java.naming.provider.url=jnp://JBOSS_BIND_URL_ADDRESS:1099
\ No newline at end of file