[openejb-scm] [2630] branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb: Removed interface verification on references to MEJB since the MEJB doesn't have a proxyInfo.

[dain]

Title: [2630] branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb: Removed interface verification on references to MEJB since the MEJB doesn't have a proxyInfo.

Revision

2630

Author

dain

Date

2006-04-28 21:10:51 -0400 (Fri, 28 Apr 2006)

Log Message

Removed interface verification on references to MEJB since the MEJB doesn't have a proxyInfo.
Changed MEJB to return abstract name for container id instead of object name.

Modified Paths

branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java
branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java

Diff

Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java (2629 => 2630)

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java	2006-04-28 05:33:13 UTC (rev 2629)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java	2006-04-29 01:10:51 UTC (rev 2630)
@@ -71,6 +71,7 @@
 import org.apache.geronimo.core.service.InvocationResult;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.system.jmx.MBeanServerReference;
 import org.openejb.EJBComponentType;
@@ -89,7 +90,7 @@
     private static final int CREATE_INDEX = -1;
     private static final String DEFAULT_EJB_NAME = "ejb/mgmt/MEJB";
 
-    private final String objectName;
+    private final String containerId;
     private final InterfaceMethodSignature[] signatures;
     private final int[] methodMap;
     private final EJBProxyFactory proxyFactory;
@@ -98,16 +99,16 @@
     private final String ejbName;
 
     // todo remove this as soon as Geronimo supports factory beans
-    public MEJB(String objectName, MBeanServerReference mbeanServerReference) {
-        this(objectName, mbeanServerReference.getMBeanServer());
+    public MEJB(AbstractName abstractName, MBeanServerReference mbeanServerReference) {
+        this(abstractName.toString(), mbeanServerReference.getMBeanServer());
     }
 
-    public MEJB(String objectName, MBeanServer mbeanServer) {
-        super(objectName, mbeanServer);
-        this.objectName = objectName;
+    public MEJB(String containerId, MBeanServer mbeanServer) {
+        super(containerId, mbeanServer);
+        this.containerId = containerId;
         String ejbName;
         try {
-            ObjectName 
+            ObjectName 
             ejbName = oname.getKeyProperty("name");
             if (ejbName == null) {
                 ejbName = DEFAULT_EJB_NAME;
@@ -124,7 +125,7 @@
         for (Iterator it = vopMap.values().iterator(); it.hasNext(); ) {
             methodMap[i++] = ((Integer)it.next()).intValue();
         }
-        proxyInfo = new ProxyInfo(EJBComponentType.STATELESS, objectName, ManagementHome.class, Management.class, null, null, null, null);
+        proxyInfo = new ProxyInfo(EJBComponentType.STATELESS, containerId, ManagementHome.class, Management.class, null, null, null, null);
         proxyFactory = new EJBProxyFactory(this);
     }
 
@@ -147,7 +148,7 @@
     }
 
     public Object getContainerID() {
-        return objectName;
+        return containerId;
     }
 
     public String getEjbName() {
@@ -248,7 +249,7 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(MEJB.class, org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, NameFactory.STATELESS_SESSION_BEAN);
         infoBuilder.addReference("MBeanServerReference", MBeanServerReference.class);
 
-        infoBuilder.setConstructor(new String[]{"objectName", "MBeanServerReference"});
+        infoBuilder.setConstructor(new String[]{"abstractName", "MBeanServerReference"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java (2629 => 2630)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java	2006-04-28 05:33:13 UTC (rev 2629)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java	2006-04-29 01:10:51 UTC (rev 2630)
@@ -105,6 +105,10 @@
     }
 
     private void checkRemoteProxyInfo(AbstractNameQuery query, String home, String remote, Configuration configuration) throws DeploymentException {
+        if (remote.equals("javax.management.j2ee.Management") && home.equals("javax.management.j2ee.ManagementHome")) {
+            // Don't verify the MEJB because it doesn't have a proxyInfo attribute
+            return;
+        }
         GBeanData gbeanData;
         try {
             gbeanData = configuration.findGBeanData(query);