[jboss-cvs] JBossAS SVN: r57339 - in branches/JBoss_4_0_2_CP: system/src/main/org/jboss/system testsuite/imports testsuite/src/main/org/jboss/test/jmx testsuite/src/main/org/jboss/test/jmx/conf testsuite/src/main/org/jboss/test/jmx/test testsuite/src/resources/jmx testsuite/src/resources/jmx/conf testsuite/src/resources/jmx/conf/normal testsuite/src/resources/jmx/conf/scoped testsuite/src/resources/jmx/proxy testsuite/src/resources/jmx/proxy/scoped

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Oct 1 21:01:59 EDT 2006


Author: ryan.campbell at jboss.com
Date: 2006-10-01 21:01:57 -0400 (Sun, 01 Oct 2006)
New Revision: 57339

Added:
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/test/MBeanAttributeConfigurationUnitTestCase.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/test/ProxyScopedUnitTestCase.java
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/jboss-service.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml
Removed:
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/jboss-service.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml
   branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml
Modified:
   branches/JBoss_4_0_2_CP/system/src/main/org/jboss/system/ServiceConfigurator.java
   branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
Log:
ASPATCH-43: JBAS-2288: Customer needs fix of JBAS-1709 for 4.0.2

Modified: branches/JBoss_4_0_2_CP/system/src/main/org/jboss/system/ServiceConfigurator.java
===================================================================
--- branches/JBoss_4_0_2_CP/system/src/main/org/jboss/system/ServiceConfigurator.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/system/src/main/org/jboss/system/ServiceConfigurator.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -221,7 +221,7 @@
       } // end of if ()
 
       // Get the classloader for loading attribute classes.
-      ClassLoader cl = Thread.currentThread().getContextClassLoader();
+      ClassLoader cl = server.getClassLoader(loaderName); 
       // Initialize the mbean using the configuration supplied defaults
       MBeanAttributeInfo[] attributes = info.getAttributes();
       HashMap attributeMap = new HashMap();
@@ -469,8 +469,19 @@
                "; type=" + typeClass);
          }
 
-         editor.setAsText(attributeText);
-         value = editor.getValue();
+         // JBAS-1709, temporarily switch the TCL so that property
+         // editors have access to the actual deployment ClassLoader.
+         ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+         Thread.currentThread().setContextClassLoader(cl);
+         try 
+         {
+            editor.setAsText(attributeText);
+            value = editor.getValue();            
+         }
+         finally 
+         {
+            Thread.currentThread().setContextClassLoader(tcl);
+         }  
       }
       return value;
    }

Modified: branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml	2006-10-02 01:01:57 UTC (rev 57339)
@@ -2752,6 +2752,19 @@
       </fileset>
     </jar>
 
+    <jar destfile="${build.lib}/conftestnormal.sar">
+      <metainf dir="${build.resources}/jmx/conf/normal"/>
+      <fileset dir="${build.classes}">
+        <include name="org/jboss/test/jmx/conf/**"/>
+      </fileset>
+    </jar>
+    <jar destfile="${build.lib}/conftestscoped.sar">
+      <metainf dir="${build.resources}/jmx/conf/scoped"/>
+      <fileset dir="${build.classes}">
+        <include name="org/jboss/test/jmx/conf/**"/>
+      </fileset>
+    </jar>
+    
     <jar destfile="${build.lib}/testdeploya.sar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/test/jmx/mbeana/**"/>
@@ -2810,7 +2823,13 @@
         <include name="org/jboss/test/jmx/proxy/*.class"/>
       </fileset>
     </jar>
-
+    <jar destfile="${build.lib}/jmxproxyscoped.sar">
+      <metainf dir="${build.resources}/jmx/proxy/scoped"/>
+      <fileset dir="${build.classes}">
+        <include name="org/jboss/test/jmx/proxy/*.class"/>
+      </fileset>
+    </jar>
+    
     <!-- ExternalClass ear including a sar and util jar -->
     <jar destfile="${build.lib}/external.sar"
       manifest="${build.resources}/jmx/loading/ext/manifest.mf">

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.jmx.conf;
-
-/**
- * @author Dimitris.Andreadis at jboss.org
- * @version $Revision$
- */
-public class ConfTest implements ConfTestMBean
-{
-   private Class aClass;
-   private Class[] aClassArray;
-   private SimpleBean aBean;
-   
-   public void setClassAttr(Class aClass)
-   {
-      this.aClass = aClass;
-   }
-   
-   public Class getClassAttr()
-   {
-      return aClass;
-   }
-   
-   public void setClassArrayAttr(Class[] aClassArray)
-   {
-      this.aClassArray = aClassArray;
-   }
-   
-   public Class[] getClassArrayAttr()
-   {
-      return aClassArray;
-   }
-   
-   public void setBeanAttr(SimpleBean aBean)
-   {
-      this.aBean = aBean;
-   }
-   
-   public SimpleBean getBeanAttr()
-   {
-      return aBean;
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/ConfTest.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.jmx.conf;
-
-/**
- * @author Dimitris.Andreadis at jboss.org
- * @version $Revision$
- */
-public interface ConfTestMBean
-{
-   void setClassAttr(Class aClass);
-   Class getClassAttr();
-   
-   void setClassArrayAttr(Class[] aClassArray);
-   Class[] getClassArrayAttr();
-   
-   void setBeanAttr(SimpleBean aBean);
-   SimpleBean getBeanAttr();
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/ConfTestMBean.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.jmx.conf;
-
-import java.io.Serializable;
-
-/**
- * @author Dimitris.Andreadis at jboss.org
- * @version $Revision$
- */
-public class SimpleBean implements Serializable
-{
-   private String aString;
-   private String[] aStringArray;
-   
-   public SimpleBean()
-   {
-   }
-   
-   public void setAString(String aString)
-   {
-      this.aString = aString;
-   }
-   
-   public String getAString()
-   {
-      return aString;
-   }
-   
-   public void setAStringArray(String[] aStringArray)
-   {
-      this.aStringArray = aStringArray;
-   }
-   
-   public String[] getAStringArray()
-   {
-      return aStringArray;
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleBean.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.jmx.conf;
-
-/**
- * @author Dimitris.Andreadis at jboss.org
- * @version $Revision$
- */
-public class SimpleClass1
-{
-   public SimpleClass1()
-   {
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass1.java)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.jmx.conf;
-
-/**
- * @author Dimitris.Andreadis at jboss.org
- * @version $Revision$
- */
-public class SimpleClass2
-{
-   public SimpleClass2()
-   {
-   }
-}

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/conf/SimpleClass2.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/test/MBeanAttributeConfigurationUnitTestCase.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/test/MBeanAttributeConfigurationUnitTestCase.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/jmx/test/ProxyScopedUnitTestCase.java (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/main/org/jboss/test/jmx/test/ProxyScopedUnitTestCase.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/normal)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/normal/jboss-service.xml	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/jboss-service.xml	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE server
-    PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
-
-<server>
-
-   <mbean code="org.jboss.test.jmx.conf.ConfTest"
-      name="test:name=MBeanAttributeConfiguration">
-      
-      <attribute name="ClassAttr">org.jboss.test.jmx.conf.SimpleClass1</attribute>
-      <attribute name="ClassArrayAttr">org.jboss.test.jmx.conf.SimpleClass1,org.jboss.test.jmx.conf.SimpleClass2</attribute>
-      <attribute name="BeanAttr" attributeClass="org.jboss.test.jmx.conf.SimpleBean" serialDataType="javaBean">
-         <property name="aString">string</property>
-         <property name="aStringArray">string1,string2</property>
-      </attribute>
-   </mbean>
-
-</server>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/normal/jboss-service.xml (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/normal/jboss-service.xml)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/scoped)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE server
-    PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
-
-<server>
-   <loader-repository>test:loader=scoped,name=MBeanAttributeConfiguration</loader-repository>
-      
-   <mbean code="org.jboss.test.jmx.conf.ConfTest"
-      name="test:name=MBeanAttributeConfiguration">
-      
-      <attribute name="ClassAttr">org.jboss.test.jmx.conf.SimpleClass1</attribute>
-      <attribute name="ClassArrayAttr">org.jboss.test.jmx.conf.SimpleClass1,org.jboss.test.jmx.conf.SimpleClass2</attribute>
-      <attribute name="BeanAttr" attributeClass="org.jboss.test.jmx.conf.SimpleBean" serialDataType="javaBean">
-         <property name="aString">string</property>
-         <property name="aStringArray">string1,string2</property>
-      </attribute>      
-   </mbean>
-
-</server>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/conf/scoped/jboss-service.xml)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/proxy/scoped)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml	2006-10-02 00:40:44 UTC (rev 57338)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml	2006-10-02 01:01:57 UTC (rev 57339)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE server
-    PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
-
-<server>
-   <loader-repository>test:loader=scoped,name=proxy</loader-repository>
-   
-   <mbean code="org.jboss.test.jmx.proxy.Target"
-          name="jboss.test:name=ProxyTarget"/>
-
-   <mbean code="org.jboss.test.jmx.proxy.ProxyTests"
-          name="jboss.test:name=ProxyTests">
-      <depends optional-attribute-name="Proxy" 
-               proxy-type="org.jboss.test.jmx.proxy.TargetMBean"
-      >jboss.test:name=ProxyTarget</depends>
-   </mbean>
-
-   <mbean code="org.jboss.test.jmx.proxy.ProxyTests"
-          name="jboss.test:name=ProxyTestsNested">
-      <depends optional-attribute-name="Proxy" 
-               proxy-type="org.jboss.test.jmx.proxy.TargetMBean">
-         <mbean code="org.jboss.test.jmx.proxy.Target"
-                name="jboss.test:name=ProxyTargetNested"/>
-      </depends>
-   </mbean>
-
-   <mbean code="org.jboss.test.jmx.proxy.ProxyTests"
-          name="jboss.test:name=ProxyTestsAttribute">
-      <depends optional-attribute-name="Proxy" 
-               proxy-type="attribute"
-      >jboss.test:name=ProxyTarget</depends>
-   </mbean>
-
-</server>
\ No newline at end of file

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml (from rev 57338, branches/JBoss_4_0_2_JBAS-2288/testsuite/src/resources/jmx/proxy/scoped/jboss-service.xml)




More information about the jboss-cvs-commits mailing list