Index: container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java	(revision 0)
+++ container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java	(revision 0)
@@ -0,0 +1,104 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.mgmt;
+
+import java.util.List;
+import java.util.Set;
+
+import javax.ejb.Init;
+import javax.ejb.RemoteHome;
+import javax.ejb.Stateless;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.IntrospectionException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.management.QueryExp;
+import javax.management.ReflectionException;
+import javax.management.j2ee.ListenerRegistration;
+import javax.management.j2ee.ManagementHome;
+
+@Stateless(name = "MEJB")
+@RemoteHome(ManagementHome.class)
+public class MEJBBean {
+                                         
+    MBeanServer mbeanServer;
+
+    public MEJBBean() {
+        List mbeanServers = MBeanServerFactory.findMBeanServer(null);
+        if (mbeanServers.size() > 0) {
+            mbeanServer = (MBeanServer) mbeanServers.get(0);
+        } else {
+            mbeanServer = MBeanServerFactory.createMBeanServer();
+        }
+    }
+
+    @Init
+    public void create() {
+
+    }
+
+    public Object getAttribute(ObjectName objectName, String string) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
+        return mbeanServer.getAttribute(objectName, string);
+    }
+
+    public AttributeList getAttributes(ObjectName objectName, String[] strings) throws InstanceNotFoundException, ReflectionException {
+        return mbeanServer.getAttributes(objectName, strings);
+    }
+
+    public String getDefaultDomain() {
+        return mbeanServer.getDefaultDomain();
+    }
+
+    public Integer getMBeanCount() {
+        return mbeanServer.getMBeanCount();
+    }
+
+    public MBeanInfo getMBeanInfo(ObjectName objectName) throws IntrospectionException, InstanceNotFoundException, ReflectionException {
+        return mbeanServer.getMBeanInfo(objectName);
+    }
+
+    public Object invoke(ObjectName objectName, String string, Object[] objects, String[] strings) throws InstanceNotFoundException, MBeanException, ReflectionException {
+        return mbeanServer.invoke(objectName, string, objects, strings);
+    }
+
+    public boolean isRegistered(ObjectName objectName) {
+        return mbeanServer.isRegistered(objectName);
+    }
+
+    public Set queryNames(ObjectName objectName, QueryExp queryExp) {
+        return mbeanServer.queryNames(objectName, queryExp);
+    }
+
+    public void setAttribute(ObjectName objectName, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
+        mbeanServer.setAttribute(objectName, attribute);
+    }
+
+    public AttributeList setAttributes(ObjectName objectName, AttributeList attributeList) throws InstanceNotFoundException, ReflectionException {
+        return mbeanServer.setAttributes(objectName, attributeList);
+    }
+
+    public ListenerRegistration getListenerRegistry() {
+        return null;
+    }
+}
\ No newline at end of file

Property changes on: container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Rev
Name: svn:eol-style
   + native

Index: container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java	(revision 536564)
+++ container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java	(working copy)
@@ -62,6 +62,9 @@
                     String refName = ref.getEjbRefName();
                     ref.setMappedName(MAPPED_NAME_PREFIX + refName);
                 }
+                if (null == mappedName && ref.getEjbRefName().equals("ejb/MEJB")) {
+                	ref.setMappedName("MEJBGBean/MEJB");
+                }
             }
             for (MessageDestinationRef ref : enterpriseBean.getMessageDestinationRef()) {
                 String refName = ref.getMessageDestinationRefName();
Index: container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java	(revision 536564)
+++ container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java	(working copy)
@@ -127,7 +127,20 @@
             throw new IllegalArgumentException("It's boring to implement 0 interfaces!");
         }
         Jdk13InvocationHandler handler = new Jdk13InvocationHandler(h);
-        return Proxy.newProxyInstance(interfaces[0].getClassLoader(), interfaces, handler);
+        try {
+            return Proxy.newProxyInstance(interfaces[0].getClassLoader(), interfaces, handler);
+        } catch (IllegalArgumentException e) {
+            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+            try {
+                Class tcclHomeClass = tccl.loadClass(interfaces[0].getName());
+                if (tcclHomeClass == interfaces[0]) {
+                    return Proxy.newProxyInstance(tccl, interfaces, handler);
+                }
+            } catch (ClassNotFoundException e1) {
+                throw e;
+            }
+            throw e;
+        }
     }
 }