[jboss-cvs] JBossAS SVN: r64659 - trunk/testsuite/src/resources/naming/restart.

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

Author: bstansberry at jboss.com
Date: 2007-08-17 13:52:51 -0400 (Fri, 17 Aug 2007)
New Revision: 64659

Modified:
   trunk/testsuite/src/resources/naming/restart/naming-restart-beans.xml
Log:
Adjust ports to better avoid conflicts
Unexport the non-HA NamingServer

Modified: trunk/testsuite/src/resources/naming/restart/naming-restart-beans.xml
===================================================================
--- trunk/testsuite/src/resources/naming/restart/naming-restart-beans.xml	2007-08-17 16:33:13 UTC (rev 64658)
+++ trunk/testsuite/src/resources/naming/restart/naming-restart-beans.xml	2007-08-17 17:52:51 UTC (rev 64659)
@@ -3,22 +3,32 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
    <bean name="RestartNamingBean" class="org.jnp.server.NamingBeanImpl">
+   
+      <!-- IMPORTANT Ensure we use our own NamingServer and don't screw up the
+           static ref to the std one in the server-side NamingContext class -->
       <property name="useGlobalService">false</property>      
       <property name="installGlobalService">false</property>
+      
    </bean>
+
+   <!-- Use our own NamingService subclass that unexports the NamingServer
+        in stopService().  This better simulates a server shutdown. 
+        We don't really want to test a non-shutdown redeploy of the naming
+        service as that is a highly unlikely usage. -->
+   <bean name="RestartNamingService" class="org.jboss.test.naming.restart.RestartNamingService">
    
-   <!--bean name="RestartNamingService" class="org.jboss.test.naming.restart.RestartNamingService" -->
-   <bean name="RestartNamingService" class="org.jboss.naming.NamingService">
-   
       <property name="callByValue">false</property>
-      <property name="port">9099</property>
+      <property name="port">19099</property>
       <property name="bindAddress">${jboss.bind.address}</property>
-      <property name="rmiPort">9098</property>
+      <property name="rmiPort">0</property>
       <property name="rmiBindAddress">${jboss.bind.address}</property>
       <property name="lookupPool"><inject bean="jboss.system:service=ThreadPool"/></property>   
       <property name="naming"><inject bean="RestartNamingBean"/></property>
    </bean>
    
+   <!-- Our own HA-JNDI that we can redeploy.  Subclasses std HA-JNDI service
+        to ensure we don't pollute static ref to the std HA-JNDI in the 
+        server-side NamingContext class -->
    <bean name="RestartHAJNDI" class="org.jboss.test.naming.restart.RestartHANamingService">
    	
    	<depends>HAPartition</depends>
@@ -29,9 +39,9 @@
       <!-- Bind address of bootstrap and HA-JNDI RMI endpoints -->
       <property name="bindAddress">${jboss.bind.address}</property>
       <!-- Port on which the HA-JNDI stub is made available -->
-      <property name="port">1110</property>
+      <property name="port">19100</property>
       <!-- RmiPort to be used by the HA-JNDI service once bound. 0 => auto. -->
-      <property name="rmiPort">1111</property>
+      <property name="rmiPort">0</property>
       <!-- Accept backlog of the bootstrap socket -->
       <property name="backlog">50</property>
       <!-- The thread pool service used to control the bootstrap and
@@ -45,6 +55,8 @@
       
    </bean>
    
+   <!-- Binds an object in the above two naming services for remote lookup
+        by the test client -->
    <bean name="RestartObjectBinder" class="org.jboss.test.naming.restart.ObjectBinder">
       <property name="namingService"><inject bean="RestartNamingService"/></property>      
    </bean>