[jboss-cvs] JBossAS SVN: r97475 - in branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src: resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF and 1 other directories.

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

Author: rachmatowicz at jboss.com
Date: 2009-12-04 14:27:27 -0500 (Fri, 04 Dec 2009)
New Revision: 97475

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
Log:
More changes to invoker jar and clustered entity test cases.

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2009-12-04 19:09:55 UTC (rev 97474)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml	2009-12-04 19:27:27 UTC (rev 97475)
@@ -9,7 +9,7 @@
    <mbean code="org.jboss.remoting.transport.Connector"
           name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
       <depends>jboss.aop:service=AspectDeployer</depends>
-      <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>
@@ -284,7 +284,7 @@
       display-name="Servlet transport Connector">
       <depends>jboss.aop:service=AspectDeployer</depends>
       <attribute name="InvokerLocator">
-         servlet://${jboss.bind.address}:8080/servlet-invoker/ServerInvokerServlet
+         servlet://${jboss.bind.url.address}:8080/servlet-invoker/ServerInvokerServlet
       </attribute>
       
       <attribute name="Configuration">
@@ -298,7 +298,7 @@
       name="jboss.remoting:service=Connector,transport=SSLServlet"
       display-name="Servlet ssl transport Connector">
       <depends>jboss.aop:service=AspectDeployer</depends>
-      <attribute name="InvokerLocator">sslservlet://${jboss.bind.address}:8443/servlet-invoker/SSLServerInvokerServlet</attribute>
+      <attribute name="InvokerLocator">sslservlet://${jboss.bind.url.address}:8443/servlet-invoker/SSLServerInvokerServlet</attribute>
       
       <attribute name="Configuration">
          <handlers>

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	2009-12-04 19:09:55 UTC (rev 97474)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/resources/test-configs/invoker/deploy/servlet-invoker.war/WEB-INF/web.xml	2009-12-04 19:27:27 UTC (rev 97475)
@@ -30,7 +30,7 @@
         <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
         <init-param>
              <param-name>locatorUrl</param-name>
-             <param-value>sslservlet://localhost:8443/servlet-invoker/SSLServerInvokerServlet</param-value>
+             <param-value>sslservlet://${jboss.bind.url.address}:8443/servlet-invoker/SSLServerInvokerServlet</param-value>
              <description>The ssl servlet server invoker locator url</description>
          </init-param>
         <load-on-startup>1</load-on-startup>

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java	2009-12-04 19:09:55 UTC (rev 97474)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java	2009-12-04 19:27:27 UTC (rev 97475)
@@ -60,8 +60,14 @@
    {
       super.setUp();
       
-      sfsb0 = getUserTest(System.getProperty("jbosstest.cluster.node0"));
-      sfsb1 = getUserTest(System.getProperty("jbosstest.cluster.node1"));  
+      // JBPAPP-2997
+      String host0 = System.getProperty("jbosstest.cluster.node0") ;
+      String hostForURL0 = System.getProperty("jbosstest.cluster.node0.url") ;
+      String host1 = System.getProperty("jbosstest.cluster.node1") ;
+      String hostForURL1 = System.getProperty("jbosstest.cluster.node1.url") ;
+      
+      sfsb0 = getUserTest(host0, hostForURL0);
+      sfsb1 = getUserTest(host1, hostForURL1);  
       sfsb0.cleanup();
       sfsb1.cleanup();
    }
@@ -88,19 +94,19 @@
       sfsb0 = sfsb1 = null;
    }
    
-   protected EmbeddedIdTest getUserTest(String nodeJNDIAddress) throws Exception
+   protected EmbeddedIdTest getUserTest(String nodeAddress, String nodeAddressForURL) throws Exception
    {
       Properties prop1 = new Properties();
       prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
       prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      prop1.put("java.naming.provider.url", "jnp://" + nodeJNDIAddress + ":1099");
+      prop1.put("java.naming.provider.url", "jnp://" + nodeAddressForURL + ":1099");
    
-      log.info("===== Naming properties for " + nodeJNDIAddress + ": ");
+      log.info("===== Naming properties for " + nodeAddress + ": ");
       log.info(prop1);
-      log.info("Create InitialContext for " + nodeJNDIAddress);
+      log.info("Create InitialContext for " + nodeAddress);
       InitialContext ctx1 = new InitialContext(prop1);
    
-      log.info("Lookup sfsb from " + nodeJNDIAddress);
+      log.info("Lookup sfsb from " + nodeAddress);
       return (EmbeddedIdTest) ctx1.lookup(getEarName() + "/EmbeddedIdTestBean/remote");
       
    }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java	2009-12-04 19:09:55 UTC (rev 97474)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java	2009-12-04 19:27:27 UTC (rev 97475)
@@ -55,13 +55,13 @@
    public void testAll() throws Exception
    {
       System.out.println("*** testServerFound()");
-      String node0 = System.getProperty("jbosstest.cluster.node0");
-      String node1 = System.getProperty("jbosstest.cluster.node1");
+      String nodeForURL0 = System.getProperty("jbosstest.cluster.node0.url");
+      String nodeForURL1 = System.getProperty("jbosstest.cluster.node1.url");
         
       Properties prop0 = new Properties();
       prop0.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
       prop0.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      prop0.put("java.naming.provider.url", "jnp://" + node0 + ":1099");
+      prop0.put("java.naming.provider.url", "jnp://" + nodeForURL0 + ":1099");
       
       System.out.println("===== Node0 properties: ");
       System.out.println(prop0);
@@ -69,7 +69,7 @@
       Properties prop1 = new Properties();
       prop1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
       prop1.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-      prop1.put("java.naming.provider.url", "jnp://" + node1 + ":1099");
+      prop1.put("java.naming.provider.url", "jnp://" + nodeForURL1 + ":1099");
 
       System.out.println("===== Node1 properties: ");
       System.out.println(prop1);