[jboss-cvs] JBossAS SVN: r60974 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test.

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

Author: bstansberry at jboss.com
Date: 2007-02-27 21:52:10 -0500 (Tue, 27 Feb 2007)
New Revision: 60974

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
Log:
If server has -u set, client should use the value for HA-JNDI discovery

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java	2007-02-28 02:43:52 UTC (rev 60973)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java	2007-02-28 02:52:10 UTC (rev 60974)
@@ -48,6 +48,7 @@
    private static final String NODE1_JNDI = System.getProperty("node1.jndi.url");
    private static final String NODE0_HAJNDI = System.getProperty("node0.hajndi.url");
    private static final String NODE1_HAJNDI = System.getProperty("node1.hajndi.url");
+   private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup");
    
    // BINDING KEYS and VALUES
    private static final String LOCAL0_KEY = "org.jboss.test.cluster.test.Local0Key";
@@ -70,8 +71,7 @@
 
    public static Test suite() throws Exception
    {
-      Test t1 = JBossClusteredTestCase.getDeploySetup(HAJndiTestCase.class, "cross-server.jar");
-      return t1;
+      return getDeploySetup(HAJndiTestCase.class, "cross-server.jar");
    }
 
    /**
@@ -338,8 +338,16 @@
       Hashtable env = new Hashtable();        
       env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
       env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+
       if (autoDisabled)
+      {
          env.put("jnp.disableDiscovery", "true");
+      }
+      else if (DISCOVERY_GROUP != null && "".equals(DISCOVERY_GROUP) == false)
+      {
+         // USe the multicast address this test environment is using
+         env.put("jnp.discoveryGroup", DISCOVERY_GROUP);
+      }
         
       Context naming = new InitialContext (env);
       return naming;