[jboss-cvs] JBossAS SVN: r60347 - branches/Branch_4_2/testsuite/src/resources/jmx/interceptors.

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

Author: dimitris at jboss.org
Date: 2007-02-06 17:19:51 -0500 (Tue, 06 Feb 2007)
New Revision: 60347

Modified:
   branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/jboss-service.xml
   branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/naming-xmbean.xml
Log:
Fix org.jboss.test.jmx.test.DeployXMBeanUnitTestCase, broken after the Naming changes

Modified: branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/jboss-service.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/jboss-service.xml	2007-02-06 22:09:38 UTC (rev 60346)
+++ branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/jboss-service.xml	2007-02-06 22:19:51 UTC (rev 60347)
@@ -32,6 +32,7 @@
       </attribute>
       <depends>jboss:service=invoker,type=jrmp</depends>
    </mbean>
+   
    <!-- A custom deployment of the JBoss JNDI naming service -->
    <mbean code="org.jboss.naming.NamingService"
       name="jboss.test:service=Naming,secured=true,persistent=true"
@@ -40,5 +41,7 @@
       <attribute name="Port">-1</attribute>
       <!-- Don't override the default naming service -->
       <attribute name="InstallGlobalService">false</attribute>
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>      
    </mbean>
 </server>

Modified: branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/naming-xmbean.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/naming-xmbean.xml	2007-02-06 22:09:38 UTC (rev 60346)
+++ branches/Branch_4_2/testsuite/src/resources/jmx/interceptors/naming-xmbean.xml	2007-02-06 22:19:51 UTC (rev 60347)
@@ -39,6 +39,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="getPort" setMethod="setPort">
       <name>Port</name>
       <type>int</type>