Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java (2530 => 2531)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java 2006-03-09 20:25:52 UTC (rev 2530)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java 2006-03-10 01:58:07 UTC (rev 2531)
@@ -166,7 +166,7 @@
//todo check this is correct
URI moduleURI = URI.create("");
String moduleType = null;
- tssBeanObjectName = earContext.getRefContext().locateComponentName(tssBeanLink, moduleURI, moduleType, NameFactory.CORBA_TSS, earContext.getJ2eeContext(), earContext, "TSS GBean");
+ tssBeanObjectName = earContext.getRefContext().locateComponentName(tssBeanLink, moduleURI, moduleType, NameFactory.CORBA_TSS, earContext.getModuleName(), earContext, "TSS GBean");
} else if (openejbEntityBean.isSetTss()) {
OpenejbTssType tss = openejbEntityBean.getTss();
try {
@@ -176,7 +176,7 @@
getStringValue(tss.getModule()),
getStringValue(tss.getName()),
getStringValue(NameFactory.CORBA_TSS),
- earContext.getJ2eeContext());
+ earContext.getModuleName());
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Invalid object name for tss bean", e);
}
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java (2530 => 2531)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java 2006-03-09 20:25:52 UTC (rev 2530)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java 2006-03-10 01:58:07 UTC (rev 2531)
@@ -298,7 +298,7 @@
resourceLocator.getModule(),
resourceLocator.getName(),
NameFactory.JCA_RESOURCE_ADAPTER,
- earContext.getJ2eeContext());
+ earContext.getModuleName());
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct resource adapter object name", e);
}
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2530 => 2531)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-09 20:25:52 UTC (rev 2530)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-10 01:58:07 UTC (rev 2531)
@@ -303,7 +303,7 @@
}
public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
- J2eeContext earJ2eeContext = earContext.getJ2eeContext();
+ J2eeContext earJ2eeContext = earContext.getModuleName();
J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.EJB_MODULE, module.getName());
URI moduleUri = module.getModuleURI();
@@ -349,7 +349,7 @@
* creating GBeans for all the EJBs in the JAR, etc.
*/
public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException {
- J2eeContext earJ2eeContext = earContext.getJ2eeContext();
+ J2eeContext earJ2eeContext = earContext.getModuleName();
J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.EJB_MODULE, module.getName());
DataSourceDelegate delegate = new DataSourceDelegate();
@@ -382,7 +382,7 @@
try {
ejbModuleGBeanData.setReferencePattern("J2EEServer", earContext.getServerObjectName());
if (!earContext.getJ2EEApplicationName().equals("null")) {
- ejbModuleGBeanData.setReferencePattern("J2EEApplication", earContext.getApplicationObjectName());
+ ejbModuleGBeanData.setReferencePattern("J2EEApplication", earContext.getApplicationName());
}
ejbModuleGBeanData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
@@ -519,7 +519,7 @@
private static ObjectName getResourceContainerId(URI uri, GerResourceLocatorType resourceLocator, EARContext earContext) throws DeploymentException {
RefContext refContext = earContext.getRefContext();
- J2eeContext j2eeContext = earContext.getJ2eeContext();
+ J2eeContext j2eeContext = earContext.getModuleName();
try {
if (resourceLocator.isSetResourceLink()) {
String containerId = refContext.getConnectionFactoryContainerId(uri, resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, earContext);
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java (2530 => 2531)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java 2006-03-09 20:25:52 UTC (rev 2530)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java 2006-03-10 01:58:07 UTC (rev 2531)
@@ -192,7 +192,7 @@
private void addWSContainerGBean(EARContext earContext, EJBModule ejbModule, ClassLoader cl, Map portInfoMap, ObjectName sessionObjectName, SessionBeanType sessionBean, OpenejbSessionBeanType openejbSessionBean, ObjectName listener) throws DeploymentException {
String ejbName = sessionBean.getEjbName().getStringValue().trim();
- J2eeContext j2eeContext = earContext.getJ2eeContext();
+ J2eeContext j2eeContext = earContext.getModuleName();
OpenejbWebServiceSecurityType webServiceSecurity = openejbSessionBean == null ? null : openejbSessionBean.getWebServiceSecurity();
//this code belongs here
@@ -308,7 +308,7 @@
String tssBeanLink = openejbSessionBean.getTssLink().trim();
URI moduleURI = ejbModule.getModuleURI();
String moduleType = NameFactory.EJB_MODULE;
- tssBeanObjectName = earContext.getRefContext().locateComponentName(tssBeanLink, moduleURI, moduleType, NameFactory.CORBA_TSS, earContext.getJ2eeContext(), earContext, "TSS GBean");
+ tssBeanObjectName = earContext.getRefContext().locateComponentName(tssBeanLink, moduleURI, moduleType, NameFactory.CORBA_TSS, earContext.getModuleName(), earContext, "TSS GBean");
} else if (openejbSessionBean.isSetTss()) {
OpenejbTssType tss = openejbSessionBean.getTss();
try {
@@ -318,7 +318,7 @@
getStringValue(tss.getModule()),
getStringValue(tss.getName()),
NameFactory.CORBA_TSS,
- earContext.getJ2eeContext());
+ earContext.getModuleName());
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Invalid object name for tss bean", e);
}
