[jboss-cvs] JBossAS SVN: r86254 - in trunk/testsuite/src/main/org/jboss/test/cmp2: simple and 1 other directory.

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

Author: adrian at jboss.org
Date: 2009-03-24 09:10:54 -0400 (Tue, 24 Mar 2009)
New Revision: 86254

Modified:
   trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java
Log:
Remove the unnecessary use of the MBeanRegistry

Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java	2009-03-24 13:06:22 UTC (rev 86253)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java	2009-03-24 13:10:54 UTC (rev 86254)
@@ -21,30 +21,28 @@
  */
 package org.jboss.test.cmp2.commerce;
 
+import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Set;
-import java.util.Iterator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Properties;
-import java.lang.reflect.Method;
+import java.util.Set;
+
 import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
 import junit.framework.Test;
-import org.jboss.ejb.EntityContainer;
+
+import org.jboss.ejb.EjbModule;
 import org.jboss.ejb.plugins.cmp.ejbql.Catalog;
 import org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLCompiler;
-import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCReadAheadMetaData;
 import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCQueryMetaData;
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.server.registry.MBeanEntry;
-import org.jboss.mx.server.registry.MBeanRegistry;
+import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCReadAheadMetaData;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.util.ejb.EJBTestCase;
-import org.jboss.mx.util.MBeanProxyExt;
 
 public class LimitOffsetTest extends EJBTestCase {
    private JDBCEJBQLCompiler compiler;
@@ -63,14 +61,10 @@
 
    public void setUpEJB(Properties props) throws Exception
    {
-      MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
       ObjectName name = new ObjectName("jboss.j2ee:jndiName=commerce/Order,service=EJB");
-      MBeanRegistry registry = (MBeanRegistry) MBeanProxyExt.create(MBeanRegistry.class,
-                                                   ServerConstants.MBEAN_REGISTRY,
-                                                   server);
-      MBeanEntry entry = registry.get(name);
-      EntityContainer container = (EntityContainer) entry.getResourceInstance();
-      Catalog catalog = (Catalog) container.getEjbModule().getModuleData("CATALOG");
+      EjbModule ejbModule = (EjbModule) server.getAttribute(name, "EjbModule");
+      Catalog catalog = (Catalog) ejbModule.getModuleData("CATALOG");
       compiler = new JDBCEJBQLCompiler(catalog);
 
       queryMetaData = new JDBCQueryMetaData()

Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2009-03-24 13:06:22 UTC (rev 86253)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java	2009-03-24 13:10:54 UTC (rev 86254)
@@ -21,26 +21,24 @@
  */
 package org.jboss.test.cmp2.commerce;
 
+import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Set;
 import java.util.Properties;
-import java.lang.reflect.Method;
+import java.util.Set;
+
 import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
 import junit.framework.Test;
-import org.jboss.ejb.EntityContainer;
+
+import org.jboss.ejb.EjbModule;
 import org.jboss.ejb.plugins.cmp.ejbql.Catalog;
 import org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLCompiler;
-import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCReadAheadMetaData;
 import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCQueryMetaData;
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.server.registry.MBeanEntry;
-import org.jboss.mx.server.registry.MBeanRegistry;
+import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCReadAheadMetaData;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.util.ejb.EJBTestCase;
-import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.util.UnreachableStatementException;
 import org.jboss.util.platform.Java;
 
@@ -61,12 +59,10 @@
 
    public void setUpEJB(Properties props) throws Exception
    {
-      MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
       ObjectName name = new ObjectName("jboss.j2ee:jndiName=commerce/Order,service=EJB");
-      MBeanRegistry registry = (MBeanRegistry) MBeanProxyExt.create(MBeanRegistry.class, ServerConstants.MBEAN_REGISTRY, server);
-      MBeanEntry entry = registry.get(name);
-      EntityContainer container = (EntityContainer) entry.getResourceInstance();
-      Catalog catalog = (Catalog) container.getEjbModule().getModuleData("CATALOG");
+      EjbModule ejbModule = (EjbModule) server.getAttribute(name, "EjbModule");
+      Catalog catalog = (Catalog) ejbModule.getModuleData("CATALOG");
       compiler = new JDBCEJBQLCompiler(catalog);
    }
 

Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java	2009-03-24 13:06:22 UTC (rev 86253)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java	2009-03-24 13:10:54 UTC (rev 86254)
@@ -26,21 +26,19 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+
 import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
 import junit.framework.Test;
-import org.jboss.ejb.EntityContainer;
+
+import org.jboss.ejb.EjbModule;
 import org.jboss.ejb.plugins.cmp.ejbql.Catalog;
 import org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager;
 import org.jboss.ejb.plugins.cmp.jdbc.ReadAheadCache;
 import org.jboss.ejb.plugins.cmp.jdbc.bridge.JDBCEntityBridge;
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.server.registry.MBeanEntry;
-import org.jboss.mx.server.registry.MBeanRegistry;
-import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.util.ejb.EJBTestCase;
 
@@ -135,12 +133,10 @@
          simple.setIntegerPrimitive(i);
       }
 
-      MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
       ObjectName name = new ObjectName("jboss.j2ee:jndiName=cmp2/simple/Simple,service=EJB");
-      MBeanRegistry registry = (MBeanRegistry) MBeanProxyExt.create(MBeanRegistry.class, ServerConstants.MBEAN_REGISTRY, server);
-      MBeanEntry entry = registry.get(name);
-      EntityContainer container = (EntityContainer) entry.getResourceInstance();
-      Catalog catalog = (Catalog) container.getEjbModule().getModuleData("CATALOG");
+      EjbModule ejbModule = (EjbModule) server.getAttribute(name, "EjbModule");
+      Catalog catalog = (Catalog) ejbModule.getModuleData("CATALOG");
       JDBCEntityBridge bridge = (JDBCEntityBridge) catalog.getEntityByEJBName("SimpleEJB");
       jdbcStoreManager = (JDBCStoreManager)bridge.getManager();
    }