[jboss-cvs] JBossAS SVN: r60391 - trunk/testsuite/src/resources/naming/services.

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

Author: dimitris at jboss.org
Date: 2007-02-07 11:59:08 -0500 (Wed, 07 Feb 2007)
New Revision: 60391

Modified:
   trunk/testsuite/src/resources/naming/services/naming-xmbean.xml
   trunk/testsuite/src/resources/naming/services/pooled-service.xml
Log:
JBAS-4082, fix naming tests after naming service changes

Modified: trunk/testsuite/src/resources/naming/services/naming-xmbean.xml
===================================================================
--- trunk/testsuite/src/resources/naming/services/naming-xmbean.xml	2007-02-07 16:56:25 UTC (rev 60390)
+++ trunk/testsuite/src/resources/naming/services/naming-xmbean.xml	2007-02-07 16:59:08 UTC (rev 60391)
@@ -37,6 +37,16 @@
       <name>MethodMap</name>
       <type>java.util.Map</type>
    </attribute>
+  <attribute access="read-write" getMethod="getNaming" setMethod="setNaming">
+      <description>Underlying Naming bean instance</description>
+      <name>Naming</name>
+      <type>org.jnp.server.NamingBean</type>
+   </attribute>
+   <attribute access="read-only" getMethod="getNamingInstance">
+      <description>Underlying Naming bean instance</description>
+      <name>NamingInstance</name>
+      <type>org.jnp.interfaces.Naming</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>
@@ -93,6 +103,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: trunk/testsuite/src/resources/naming/services/pooled-service.xml
===================================================================
--- trunk/testsuite/src/resources/naming/services/pooled-service.xml	2007-02-07 16:56:25 UTC (rev 60390)
+++ trunk/testsuite/src/resources/naming/services/pooled-service.xml	2007-02-07 16:59:08 UTC (rev 60391)
@@ -46,6 +46,8 @@
       <!-- The detached pooled invoker proxy -->
       <depends optional-attribute-name="InvokerProxyFactory"
          proxy-type="attribute">jboss.test:service=proxyFactory,type=pooled,target=Naming</depends>
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>           
    </mbean>
 
 </server>