[openejb-scm] [2549] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment: slight cleanup of ear context

[djencks]

Title: [2549] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment: slight cleanup of ear context

Revision

2549

Author

djencks

Date

2006-03-13 14:24:03 -0500 (Mon, 13 Mar 2006)

Log Message

slight cleanup of ear context

Modified Paths

• branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
• branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java
• branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java
• branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java

Diff

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

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-13 10:10:35 UTC (rev 2548)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
@@ -378,9 +378,9 @@
 
         GBeanData ejbModuleGBeanData = new GBeanData(moduleBaseName, EJBModuleImpl.GBEAN_INFO);
         try {
-            ejbModuleGBeanData.setReferencePattern("J2EEServer", earContext.getServerObjectName());
-            if (!earContext.getJ2EEApplicationName().equals("null")) {
-                ejbModuleGBeanData.setReferencePattern("J2EEApplication", earContext.getApplicationName());
+            ejbModuleGBeanData.setReferencePattern("J2EEServer", earContext.getServerName());
+            if (!module.isStandAlone()) {
+                ejbModuleGBeanData.setReferencePattern("J2EEApplication", earContext.getModuleName());
             }
 
             ejbModuleGBeanData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java (2548 => 2549)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java	2006-03-13 10:10:35 UTC (rev 2548)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java	2006-03-13 19:24:03 UTC (rev 2549)
@@ -148,7 +148,7 @@
                     KernelHelper.ENVIRONMENT,
                     ConfigurationModuleType.EJB,
                     kernel,
-                    "null",
+                    serverName, "null",
                     null,
                     null,
                     null,
@@ -192,7 +192,7 @@
                     KernelHelper.ENVIRONMENT,
                     ConfigurationModuleType.EJB,
                     kernel,
-                    "null",
+                    serverName, "null",
                     null,
                     null,
                     null,
@@ -237,7 +237,7 @@
                     KernelHelper.ENVIRONMENT,
                     ConfigurationModuleType.EJB,
                     kernel,
-                    "null",
+                    serverName, "null",
                     null,
                     null,
                     null,

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2548 => 2549)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java	2006-03-13 10:10:35 UTC (rev 2548)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java	2006-03-13 19:24:03 UTC (rev 2549)
@@ -170,7 +170,7 @@
                     KernelHelper.ENVIRONMENT,
                     ConfigurationModuleType.EJB,
                     kernel,
-                    NameFactory.NULL,
+                    serverName, NameFactory.NULL,
                     null,
                     null,
                     null,

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2548 => 2549)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java	2006-03-13 10:10:35 UTC (rev 2548)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java	2006-03-13 19:24:03 UTC (rev 2549)
@@ -194,7 +194,7 @@
                     KernelHelper.ENVIRONMENT,
                     ConfigurationModuleType.EJB,
                     kernel,
-                    NameFactory.NULL,
+                    serverName, NameFactory.NULL,
                     null,
                     null,
                     null,