[openejb-scm] [2635] branches/v2_1/openejb2/modules/core/src/java/org/openejb: Changed openejb builder to set the ejbs reference on the ejb module so jsr77 can see the ejbs in the module

Sun, 30 Apr 2006 17:56:45 -0700

Title: [2635] branches/v2_1/openejb2/modules/core/src/java/org/openejb: Changed openejb builder to set the ejbs reference on the ejb module so jsr77 can see the ejbs in the module
Revision
2635
Author
dain
Date
2006-04-30 21:03:26 -0400 (Sun, 30 Apr 2006)

Log Message

Changed openejb builder to set the ejbs reference on the ejb module so jsr77 can see the ejbs in the module
MEJB can be j2eeType StatelessSessionBean unless it name has the required EJBModule and EJBApplication properties.


Modified Paths

Diff

Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java (2634 => 2635)

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java	2006-04-30 03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java	2006-05-01 01:03:26 UTC (rev 2635)
@@ -133,7 +133,9 @@
         return server.getJavaVMs();
     }
 
-    public String[] getEJBs() {
+    public String[] getEjbs() {
+        if (ejbs == null) return new String[0];
+
         ArrayList copy;
         synchronized (ejbs) {
             copy = new ArrayList(ejbs);
@@ -212,12 +214,6 @@
         infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
         infoBuilder.addAttribute("TMDelegate", TransactionManagerDelegate.class, true);
 
-        infoBuilder.addAttribute("objectName", String.class, false);
-        infoBuilder.addAttribute("server", String.class, false);
-        infoBuilder.addAttribute("application", String.class, false);
-        infoBuilder.addAttribute("javaVMs", String[].class, false);
-        infoBuilder.addAttribute("ejbs", String[].class, false);
-
         infoBuilder.addReference("EJBCollection", EJB.class);
 
         infoBuilder.addInterface(EJBModule.class);

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

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java	2006-04-30 03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java	2006-05-01 01:03:26 UTC (rev 2635)
@@ -246,7 +246,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(MEJB.class, org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, NameFactory.STATELESS_SESSION_BEAN);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(MEJB.class, org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, "MEJB");
         infoBuilder.addReference("MBeanServerReference", MBeanServerReference.class);
 
         infoBuilder.setConstructor(new String[]{"abstractName", "MBeanServerReference"});

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2634 => 2635)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-04-30 03:53:16 UTC (rev 2634)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-05-01 01:03:26 UTC (rev 2635)
@@ -63,6 +63,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.EJBModule;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -94,6 +95,7 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.openejb.EJBModuleImpl;
+import org.openejb.EJBContainer;
 import org.openejb.deployment.corba.NoDistributedTxTransactionImportPolicyBuilder;
 import org.openejb.deployment.corba.TransactionImportPolicyBuilder;
 import org.openejb.deployment.pkgen.TranQLPKGenBuilder;
@@ -415,6 +417,12 @@
 
             ejbModuleGBeanData.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
             ejbModuleGBeanData.setAttribute("TMDelegate", tmDelegate);
+
+            ejbModuleGBeanData.setReferencePatterns("EJBCollection",
+                    new ReferencePatterns(new AbstractNameQuery(null,
+                            Collections.singletonMap(NameFactory.EJB_MODULE, moduleBaseName.getNameProperty(NameFactory.J2EE_NAME)),
+                            EJBContainer.class.getName())));
+
             earContext.addGBean(ejbModuleGBeanData);
         } catch (Exception e) {
             throw new DeploymentException("Unable to initialize EJBModule GBean " + ejbModuleGBeanData.getAbstractName(), e);

Reply via email to