[jboss-cvs] JBossAS SVN: r57217 - in branches/JBoss_4_0_3_SP1_CP: common/src/main/org/jboss/net/sockets naming naming/src/main/org/jnp/server server/src/etc/conf/default/xmdesc server/src/main/org/jboss/naming testsuite testsuite/src/main/org/jboss/test/naming/test testsuite/src/resources/naming/services

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Sep 26 17:37:19 EDT 2006


Author: scott.stark at jboss.org
Date: 2006-09-26 17:37:05 -0400 (Tue, 26 Sep 2006)
New Revision: 57217

Added:
   branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultClientSocketFactory.java
   branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/NamingServerWrapper.java
Modified:
   branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
   branches/JBoss_4_0_3_SP1_CP/naming/.project
   branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/Main.java
   branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/MainMBean.java
   branches/JBoss_4_0_3_SP1_CP/server/src/etc/conf/default/xmdesc/NamingService-xmbean.xml
   branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/naming/NamingService.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/.classpath
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/naming-xmbean.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/pooled-service.xml
Log:
ASPATCH-79, update NamingSerivce to support multiple interfaces

Added: branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultClientSocketFactory.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultClientSocketFactory.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultClientSocketFactory.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.net.sockets;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.rmi.server.RMIClientSocketFactory;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+/**
+ * A RMIClientSocketFactory that adds a bind address override of the server
+ * host to control what the address the client uses.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 30203 $
+ */
+public class DefaultClientSocketFactory
+   implements RMIClientSocketFactory, Serializable
+{
+   private static final long serialVersionUID = -920483051658660269L;
+   /** An override of the server address */
+   private InetAddress bindAddress;
+
+   public DefaultClientSocketFactory()
+   {
+   }
+
+   public String getBindAddress()
+   {
+      String address = null;
+      if( bindAddress != null )
+         address = bindAddress.getHostAddress();
+      return address;
+   }
+   public void setBindAddress(String host) throws UnknownHostException
+   {
+      bindAddress = InetAddress.getByName(host);
+   }
+
+   /**
+    * Create a server socket on the specified port (port 0 indicates
+    * an anonymous port).
+    * @param  port the port number
+    * @return the server socket on the specified port
+    * @exception java.io.IOException if an I/O error occurs during server socket
+    * creation
+    * @since 1.2
+    */
+   public Socket createSocket(String host, int port) throws IOException
+   {
+      InetAddress addr = null;
+      if( bindAddress != null )
+         addr = bindAddress;
+      else
+         addr = InetAddress.getByName(host);
+      Socket s = new Socket(addr, port);
+      return s;
+   }
+
+   public boolean equals(Object obj)
+   {
+      boolean equals = obj instanceof DefaultClientSocketFactory;
+      if( equals && bindAddress != null )
+      {
+         DefaultClientSocketFactory dcsf = (DefaultClientSocketFactory) obj;
+         InetAddress dcsfa = dcsf.bindAddress;
+         if( dcsfa != null )
+            equals = bindAddress.equals(dcsfa);
+         else
+            equals = false;
+      }
+      return equals;
+   }
+   public int hashCode()
+   {
+      int hashCode = getClass().getName().hashCode();
+      if( bindAddress != null )
+         hashCode += bindAddress.toString().hashCode();
+      return hashCode;
+   }
+   public String toString()
+   {
+      StringBuffer tmp = new StringBuffer(super.toString());
+      tmp.append('[');
+      tmp.append("bindAddress=");
+      tmp.append(bindAddress);
+      tmp.append(']');
+      return tmp.toString();
+   }
+}

Modified: branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -114,4 +114,13 @@
     {
         return getClass().getName().hashCode();
     }
+    public String toString()
+    {
+       StringBuffer tmp = new StringBuffer(super.toString());
+       tmp.append('[');
+       tmp.append("bindAddress=");
+       tmp.append(bindAddress);
+       tmp.append(']');
+       return tmp.toString();
+    }
 }

Modified: branches/JBoss_4_0_3_SP1_CP/naming/.project
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/naming/.project	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/naming/.project	2006-09-26 21:37:05 UTC (rev 57217)
@@ -11,6 +11,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>auto,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/RMIC.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

Modified: branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/Main.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/Main.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/Main.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -42,7 +42,7 @@
    
    // Attributes ----------------------------------------------------
    /** The Naming interface server implementation */
-   protected NamingServer theServer;
+   protected Naming theServer;
    protected MarshalledObject serverStub;
    protected boolean isStubExported;
    /** The jnp server socket through which the NamingServer stub is vended */
@@ -77,6 +77,8 @@
    protected int rmiPort = 0;
    /** A flag indicating if theServer will be set as the NamingContext.setLocal value */
    protected boolean InstallGlobalService = true;
+   /** A flag indicating if theServer will try to use the NamingContext.setLocal value */
+   protected boolean UseGlobalService = true;
    protected Logger log;
    /** The thread pool used to handle jnp stub lookup requests */
    protected ThreadPool lookupPool;
@@ -201,7 +203,15 @@
    {
       this.InstallGlobalService = flag;
    }
-
+   public boolean getUseGlobalService()
+   {
+      return UseGlobalService;
+   }
+   public void setUseGlobalService(boolean flag)
+   {
+      this.UseGlobalService = flag;
+   }
+   
    public String getClientSocketFactory()
    {
       return clientSocketFactoryName;
@@ -243,11 +253,24 @@
       // Create the local naming service instance if it does not exist
       if( theServer == null )
       {
-         theServer = new NamingServer();
+         // See if we should try to reuse the current local server
+         if( UseGlobalService == true )
+            theServer = NamingContext.localServer;
+         // If not, or there is no server create one
+         if( theServer == null )
+            theServer = new NamingServer();
+         else
+         {
+            // We need to wrap the server to allow exporting it
+            NamingServerWrapper wrapper = new NamingServerWrapper(theServer);
+            theServer = wrapper;
+         }
+         log.debug("Using NamingServer: "+theServer);
          if( InstallGlobalService == true )
          {
             // Set local server reference
             NamingContext.setLocal(theServer);
+            log.debug("Installed global NamingServer: "+theServer);
          }
       }
 
@@ -326,7 +349,7 @@
       catch (IOException e)
       {
          log.error("Could not start on port " + port, e);
-	   }
+      }
 
       if( lookupPool == null  )
          lookupPool = new BasicThreadPool("NamingBootstrap Pool");
@@ -343,7 +366,7 @@
       if( addr == null )
          addr = bindAddress;
 
-      if( clientSocketFactory != null )
+      if( clientSocketFactory != null && addr != null )
       {
          // See if the client socket supports setBindAddress(String)
          try
@@ -352,7 +375,7 @@
             Class[] parameterTypes = {String.class};
             Method m = csfClass.getMethod("setBindAddress", parameterTypes);
             Object[] args = {addr.getHostAddress()};
-            m.invoke(serverSocketFactory, args);
+            m.invoke(clientSocketFactory, args);
          }
          catch (NoSuchMethodException e)
          {

Modified: branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/MainMBean.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/MainMBean.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/MainMBean.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -49,6 +49,22 @@
     */ 
    public void setInstallGlobalService(boolean flag);
 
+   /** Get the UseGlobalService which defines whether the MainMBean's
+    * Naming server will initialized from the existing NamingContext.setLocal
+    * global value.
+    * 
+    * @return true if this should try to use VM global naming service, false otherwise 
+    */ 
+   public boolean getUseGlobalService();
+   /** Set the UseGlobalService which defines whether the MainMBean's
+    * Naming server will initialized from the existing NamingContext.setLocal global
+    * value. This allows one to export multiple servers via different transports
+    * and still share the same underlying naming service.
+    * 
+    * @return true if this should try to use VM global naming service, false otherwise 
+    */ 
+   public void setUseGlobalService(boolean flag);
+
    /** Get the RMIClientSocketFactory implementation class */
    public String getClientSocketFactory();
    /** Set the RMIClientSocketFactory implementation class */
@@ -68,4 +84,4 @@
       throws Exception;
    
    public void stop();
-}
\ No newline at end of file
+}

Added: branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/NamingServerWrapper.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/NamingServerWrapper.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/naming/src/main/org/jnp/server/NamingServerWrapper.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -0,0 +1,63 @@
+package org.jnp.server;
+
+import java.rmi.RemoteException;
+import java.util.Collection;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.jnp.interfaces.Naming;
+
+/**
+ * A delegating wrapper that can be used to create a unique rmi server endpoint that shares
+ * the an underlying Naming server implementation.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class NamingServerWrapper
+   implements Naming
+{
+   Naming delegate;
+   NamingServerWrapper(Naming delegate)
+   {
+      this.delegate = delegate;
+   }
+
+   public void bind(Name name, Object obj, String className)
+      throws NamingException, RemoteException
+   {
+      delegate.bind(name, obj, className);
+   }
+   public Context createSubcontext(Name name)
+      throws NamingException, RemoteException
+   {
+      return delegate.createSubcontext(name);
+   }
+   public Collection list(Name name)
+      throws NamingException, RemoteException
+   {
+      return delegate.list(name);
+   }
+   public Collection listBindings(Name name)
+      throws NamingException, RemoteException
+   {
+      return delegate.listBindings(name);
+   }
+   public Object lookup(Name name)
+      throws NamingException, RemoteException
+   {
+      return delegate.lookup(name);
+   }
+   public void rebind(Name name, Object obj, String className)
+      throws NamingException, RemoteException
+   {
+      delegate.rebind(name, obj, className);
+   }
+   public void unbind(Name name)
+      throws NamingException, RemoteException
+   {
+      delegate.unbind(name);
+   }
+}

Modified: branches/JBoss_4_0_3_SP1_CP/server/src/etc/conf/default/xmdesc/NamingService-xmbean.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/server/src/etc/conf/default/xmdesc/NamingService-xmbean.xml	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/server/src/etc/conf/default/xmdesc/NamingService-xmbean.xml	2006-09-26 21:37:05 UTC (rev 57217)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mbean PUBLIC
-   "-//JBoss//DTD JBOSS XMBEAN 1.1//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_1.dtd"
+"-//JBoss//DTD JBOSS XMBEAN 1.1//EN"
+"http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_1.dtd"
 [
-   <!ATTLIST interceptor proxyName CDATA #IMPLIED>
+<!ATTLIST interceptor proxyName CDATA #IMPLIED>
 ]>
 
 <!-- The JNDI Naming service XMBean
-$Id$
+   $Id$
 -->
 <mbean>
    <description>The standard JBoss JNDI naming server with a custom
       ProxyFactoryInterceptor interceptor that does replacement of NamingContext
       objects with the detached invoker proxy.
    </description>
-
+   
    <descriptors>
       <interceptors>
          <!-- Uncomment to enable NamingContext replacement by the detached
-         invoker proxy. You need to set the proxyName attribute correctly.
-         <interceptor code="org.jboss.naming.interceptors.ProxyFactoryInterceptor"
+            invoker proxy. You need to set the proxyName attribute correctly.
+            <interceptor code="org.jboss.naming.interceptors.ProxyFactoryInterceptor"
             proxyName="jboss:service=proxyFactory,type=pooled,target=Naming"/>
          -->
          <interceptor code="org.jboss.mx.interceptor.PersistenceInterceptor2" />
@@ -27,23 +27,23 @@
          <interceptor code="org.jboss.mx.interceptor.ObjectReferenceInterceptor" />
       </interceptors>
    </descriptors>
-
+   
    <class>org.jboss.naming.NamingService</class>
-
+   
    <constructor>
       <description>The default constructor</description>
       <name>NamingService</name>
    </constructor>
    
    &defaultAttributes;
-
+   
    <attribute access="read-only" getMethod="getMethodMap">
       <name>MethodMap</name>
       <type>java.util.Map</type>
    </attribute>
    <attribute access="read-write" getMethod="getCallByValue" setMethod="setCallByValue">
       <description>The call by value mode. true if all lookups are unmarshalled using
-      the caller's TCL, false if in VM lookups return the value by reference.</description>
+         the caller's TCL, false if in VM lookups return the value by reference.</description>
       <name>CallByValue</name>
       <type>boolean</type>
    </attribute>
@@ -54,7 +54,7 @@
    </attribute>
    <attribute access="read-write" getMethod="getPort" setMethod="setPort">
       <description>The listening port for the bootstrap JNP service. Set this to -1
-        to run the NamingService without the JNP invoker listening port.</description>
+         to run the NamingService without the JNP invoker listening port.</description>
       <name>Port</name>
       <type>int</type>
    </attribute>
@@ -69,10 +69,10 @@
       <name>JNPServerSocketFactory</name>
       <type>java.lang.String</type>
    </attribute>
-
+   
    <attribute access="read-write" getMethod="getRmiPort" setMethod="setRmiPort">
       <description>The port of the RMI naming service, 0 == anonymous. This
-      is only used if an explicit InvokerProxyFactory has not been set.</description>
+         is only used if an explicit InvokerProxyFactory has not been set.</description>
       <name>RmiPort</name>
       <type>int</type>
    </attribute>
@@ -91,12 +91,23 @@
       <name>ServerSocketFactory</name>
       <type>java.lang.String</type>
    </attribute>
-
+   
    <attribute access="read-write" getMethod="getInstallGlobalService"
       setMethod="setInstallGlobalService">
+      <description>Ghe InstallGlobalService which defines whether the MainMBean's
+         Naming server will be installed as the NamingContext.setLocal global
+         value.</description>
       <name>InstallGlobalService</name>
       <type>boolean</type>
    </attribute>
+   <attribute access="read-write" getMethod="getUseGlobalService"
+      setMethod="setUseGlobalService">
+      <description>The UseGlobalService which defines whether the MainMBean's
+         Naming server will initialized from the existing NamingContext.setLocal global
+         value.</description>
+      <name>UseGlobalService</name>
+      <type>boolean</type>
+   </attribute>
    <attribute access="write-only" setMethod="setLookupPool">
       <description>The thread pool service used to control the bootstrap lookups</description>
       <name>LookupPool</name>
@@ -104,11 +115,11 @@
    </attribute>
    <attribute access="write-only" setMethod="setInvokerProxyFactory">
       <description>The detached invoker proxy factory to use for the naming
-      service transport.</description>
+         service transport.</description>
       <name>InvokerProxyFactory</name>
       <type>org.jboss.invocation.jrmp.server.JRMPProxyFactoryMBean</type>
    </attribute>
-
+   
    <!-- Operations -->
    <operation>
       <description>The generic invocation operation used by detached invokers
@@ -123,7 +134,7 @@
       </parameter>
       <return-type>java.lang.Object</return-type>
    </operation>
-
+   
    &defaultOperations;   			
-
+   
 </mbean>

Modified: branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/naming/NamingService.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/naming/NamingService.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/naming/NamingService.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -152,6 +152,14 @@
    {
       naming.setInstallGlobalService(flag);
    }
+   public boolean getUseGlobalService()
+   {
+      return naming.getUseGlobalService();
+   }
+   public void setUseGlobalService(boolean flag)
+   {
+      naming.setUseGlobalService(flag);
+   }
 
    public String getClientSocketFactory()
    {

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/.classpath
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/.classpath	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/.classpath	2006-09-26 21:37:05 UTC (rev 57217)
@@ -46,5 +46,6 @@
 	<classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-xalan/lib/xalan.jar"/>
+	<classpathentry kind="lib" path="output/resources"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/PooledInvokerUnitTestCase.java	2006-09-26 21:37:05 UTC (rev 57217)
@@ -79,6 +79,25 @@
       getLog().debug("lookup('') = "+obj);
    }
 
+   /**
+    * Test lookup of a binding that would be created in the default naming
+    * service to validate that 
+    * @throws Exception
+    */
+   public void testSharedLookup()
+      throws Exception
+   {
+      getLog().info("+++ testSharedLookup");
+      Properties env = new Properties();
+      env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":10999/");
+      env.setProperty("jnp.disableDiscovery", "true");
+      InitialContext ctx = new InitialContext(env);
+      Object obj = ctx.lookup("jmx/rmi/RMIAdaptor");
+      assertNotNull("jmx/rmi/RMIAdaptor", obj);
+      getLog().info("lookup('jmx/rmi/RMIAdaptor') = "+obj);      
+   }
+
    public void testListing() throws Exception
    {
       log.debug("+++ testListing");

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/naming-xmbean.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/naming-xmbean.xml	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/naming-xmbean.xml	2006-09-26 21:37:05 UTC (rev 57217)
@@ -93,6 +93,14 @@
       <name>InstallGlobalService</name>
       <type>boolean</type>
    </attribute>
+   <attribute access="read-write" getMethod="getUseGlobalService"
+      setMethod="setUseGlobalService">
+      <description>The UseGlobalService which defines whether the MainMBean's
+         Naming server will initialized from the existing NamingContext.setLocal global
+         value.</description>
+      <name>UseGlobalService</name>
+      <type>boolean</type>
+   </attribute>
    <attribute access="write-only" setMethod="setLookupPool">
       <description>The thread pool service used to control the bootstrap lookups</description>
       <name>LookupPool</name>

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/pooled-service.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/pooled-service.xml	2006-09-26 21:34:34 UTC (rev 57216)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/naming/services/pooled-service.xml	2006-09-26 21:37:05 UTC (rev 57217)
@@ -38,8 +38,16 @@
       xmbean-dd="naming-xmbean.xml">
       <!-- The bootstrap port used to lookup the Naming proxy -->
       <attribute name="Port">10999</attribute>
+      <attribute name="RmiPort">10998</attribute>
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
       <!-- Don't override the default naming service -->
       <attribute name="InstallGlobalService">false</attribute>
+      <!-- Use the default local service -->
+      <attribute name="UseGlobalService">true</attribute>
+      <!-- Validate the default client socket factory -->
+      <attribute name="ClientSocketFactory">org.jboss.net.sockets.DefaultClientSocketFactory</attribute>
+      <!-- Validate the default server socket factory -->
+      <attribute name="ServerSocketFactory">org.jboss.net.sockets.DefaultSocketFactory</attribute>
       <!-- The thread pool service used to control the bootstrap lookups -->
       <depends optional-attribute-name="LookupPool"
          proxy-type="attribute">jboss.system:service=ThreadPool</depends>




More information about the jboss-cvs-commits mailing list