[jboss-cvs] JBossAS SVN: r111901 - in projects/jboss-jca/trunk/core/src/test: resources and 1 other directory.

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

Author: jesper.pedersen
Date: 2011-08-02 10:46:31 -0400 (Tue, 02 Aug 2011)
New Revision: 111901

Removed:
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/common/
Modified:
   projects/jboss-jca/trunk/core/src/test/resources/naming.xml
Log:
Remove unneeded classes

Modified: projects/jboss-jca/trunk/core/src/test/resources/naming.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/naming.xml	2011-08-02 13:25:10 UTC (rev 111900)
+++ projects/jboss-jca/trunk/core/src/test/resources/naming.xml	2011-08-02 14:46:31 UTC (rev 111901)
@@ -1,13 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <deployment>
 
   <!-- Naming -->
-  <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+  <bean name="LookupPool">
+    <constructor factoryMethod="newFixedThreadPool"
+                 factoryClass="java.util.concurrent.Executors">
+      <parameter>2</parameter>
+    </constructor>
+  </bean>
 
-  <!-- java:comp -->
-  <bean name="JavaCompInitializer" class="org.jboss.jca.core.common.JavaCompInitializer">
-    <depends>NamingServer</depends>
+  <bean name="NamingBeanImpl" class="org.jnp.server.NamingBeanImpl">
+    <!-- Install this bean as the global JVM NamingServer -->
+    <property name="installGlobalService">true</property>
+    
+    <property name="useGlobalService">false</property>
   </bean>
 
+  <bean name="NamingServer" class="org.jnp.server.Main">
+    <property name="namingInfo"><inject bean="NamingBeanImpl"/></property>
+
+    <!-- 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.
+      -->
+    <property name="callByValue">false</property>
+    
+    <!-- The listening port for the bootstrap JNP service. Set this to -1
+         to run the NamingService without the JNP invoker listening port.
+      -->
+    <property name="port">1099</property>
+    
+    <!-- The bootstrap JNP server bind address. This also sets the default
+         RMI service bind address. Empty == all addresses
+      -->
+    <property name="bindAddress">${iron.jacamar.bindaddress:localhost}</property>
+
+    <!-- The port of the RMI naming service, 0 == anonymous -->
+    <property name="rmiPort">0</property>
+
+    <!-- The RMI service bind address. Empty == all addresses -->
+    <property name="rmiBindAddress">${iron.jacamar.bindaddress:localhost}</property>
+
+    <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
+    <property name="enableRmiServerHostname">true</property>
+
+    <!-- The thread pool service used to control the bootstrap lookups -->
+    <property name="lookupExector"><inject bean="LookupPool"/></property>
+  </bean>
+
 </deployment>