[jboss-cvs] JBossAS SVN: r86262 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/cmp2/commerce and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 24 11:00:00 EDT 2009
Author: adrian at jboss.org
Date: 2009-03-24 11:00:00 -0400 (Tue, 24 Mar 2009)
New Revision: 86262
Modified:
branches/Branch_5_x/server/src/main/org/jboss/jmx/connector/invoker/InvokerAdaptorService.java
branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java
Log:
[JBAS-6662] - Remove unnecessary use of MBeanRegistry/Entry
Modified: branches/Branch_5_x/server/src/main/org/jboss/jmx/connector/invoker/InvokerAdaptorService.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/jmx/connector/invoker/InvokerAdaptorService.java 2009-03-24 14:34:15 UTC (rev 86261)
+++ branches/Branch_5_x/server/src/main/org/jboss/jmx/connector/invoker/InvokerAdaptorService.java 2009-03-24 15:00:00 UTC (rev 86262)
@@ -25,11 +25,12 @@
import java.lang.reflect.Method;
import java.lang.reflect.UndeclaredThrowableException;
import java.rmi.RemoteException;
+import java.security.Principal;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.security.Principal;
+
import javax.management.InstanceNotFoundException;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanServer;
@@ -42,7 +43,6 @@
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
import org.jboss.jmx.connector.invoker.client.InvokerAdaptorException;
-import org.jboss.mx.server.ServerConstants;
import org.jboss.security.SecurityConstants;
import org.jboss.security.SecurityContext;
import org.jboss.system.Registry;
@@ -74,7 +74,7 @@
**/
public class InvokerAdaptorService
extends ServiceMBeanSupport
- implements InvokerAdaptorServiceMBean, ServerConstants
+ implements InvokerAdaptorServiceMBean
{
private ObjectName mbeanRegistry;
/** */
@@ -111,8 +111,6 @@
protected void startService()
throws Exception
{
- mbeanRegistry = new ObjectName(MBEAN_REGISTRY);
-
// Build the interface method map
HashMap tmpMap = new HashMap(61);
for(int n = 0; n < exportedInterfaces.length; n ++)
@@ -213,12 +211,7 @@
if (objectName != null)
{
// Obtain the ClassLoader associated with the MBean deployment
- newCL = (ClassLoader) server.invoke
- (
- mbeanRegistry, "getValue",
- new Object[] { objectName, CLASSLOADER },
- new String[] { ObjectName.class.getName(), String.class.getName() }
- );
+ newCL = server.getClassLoaderFor(objectName);
}
if (newCL != null && newCL != oldCL)
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java 2009-03-24 14:34:15 UTC (rev 86261)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/LimitOffsetTest.java 2009-03-24 15:00:00 UTC (rev 86262)
@@ -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: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-03-24 14:34:15 UTC (rev 86261)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-03-24 15:00:00 UTC (rev 86262)
@@ -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: branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java 2009-03-24 14:34:15 UTC (rev 86261)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/cmp2/simple/PageSizeUnitTestCase.java 2009-03-24 15:00:00 UTC (rev 86262)
@@ -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();
}
More information about the jboss-cvs-commits
mailing list