djencks 2005/02/19 13:24:43
Modified: modules/openejb-builder/src/java/org/openejb/deployment
AbstractContainerBuilder.java
BMPContainerBuilder.java CMPContainerBuilder.java
EntityBuilder.java MdbBuilder.java
OpenEJBModuleBuilder.java
StatefulContainerBuilder.java
StatelessContainerBuilder.java
Log:
synch to changes in NameFactory and J2eeContext, jsr-77 compliance
Revision Changes Path
1.6 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java
Index: AbstractContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractContainerBuilder.java 26 Jan 2005 23:28:01 -0000 1.5
+++ AbstractContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.6
@@ -47,8 +47,8 @@
*/
package org.openejb.deployment;
-import java.util.Set;
import java.util.Map;
+import java.util.Set;
import javax.ejb.TimedObject;
import javax.ejb.Timer;
import javax.management.ObjectName;
1.4 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/BMPContainerBuilder.java
Index: BMPContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/BMPContainerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BMPContainerBuilder.java 16 Feb 2005 06:12:38 -0000 1.3
+++ BMPContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.4
@@ -64,9 +64,9 @@
import org.openejb.dispatch.VirtualOperation;
import org.openejb.entity.BusinessMethod;
import org.openejb.entity.EntityInstanceFactory;
-import org.openejb.entity.bmp.BMPEntityInterceptorBuilder;
import org.openejb.entity.HomeMethod;
import org.openejb.entity.bmp.BMPCreateMethod;
+import org.openejb.entity.bmp.BMPEntityInterceptorBuilder;
import org.openejb.entity.bmp.BMPFinderMethod;
import org.openejb.entity.bmp.BMPInstanceContextFactory;
import org.openejb.entity.bmp.BMPRemoveMethod;
1.13 +1 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java
Index: CMPContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CMPContainerBuilder.java 16 Feb 2005 06:12:38 -0000 1.12
+++ CMPContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.13
@@ -54,7 +54,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import javax.ejb.TimedObject;
import javax.ejb.Timer;
import javax.management.ObjectName;
1.12 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java
Index: EntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EntityBuilder.java 16 Feb 2005 06:12:38 -0000 1.11
+++ EntityBuilder.java 19 Feb 2005 18:24:43 -0000 1.12
@@ -153,7 +153,7 @@
public ObjectName createEJBObjectName(J2eeContext moduleJ2eeContext,
EntityBeanType entityBean) throws DeploymentException {
String ejbName = entityBean.getEjbName().getStringValue();
try {
- return NameFactory.getEjbComponentName(null, null, null, null,
ejbName, NameFactory.ENTITY_BEAN, moduleJ2eeContext);
+ return NameFactory.getComponentName(null, null, null, null,
null, ejbName, NameFactory.ENTITY_BEAN, moduleJ2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct ejb object
name: " + ejbName, e);
}
1.12 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MdbBuilder.java 16 Feb 2005 00:09:23 -0000 1.11
+++ MdbBuilder.java 19 Feb 2005 18:24:43 -0000 1.12
@@ -215,10 +215,10 @@
String containerId) throws DeploymentException {
RefContext refContext = earContext.getRefContext();
ObjectName resourceAdapterObjectName = getResourceAdapterId(uri,
resourceAdapter, refContext, moduleJ2eeContext);
- J2eeContext resourceAdapterJ2eeContext = new
J2eeContextImpl(resourceAdapterObjectName, NameFactory.JCA_RESOURCE);
+ J2eeContext resourceAdapterJ2eeContext =
J2eeContextImpl.newContext(resourceAdapterObjectName,
NameFactory.RESOURCE_ADAPTER_MODULE);
ObjectName resourceModuleObjectName = null;
try {
- resourceModuleObjectName = NameFactory.getModuleName(null, null,
null, null, NameFactory.RESOURCE_ADAPTER_MODULE, resourceAdapterJ2eeContext);
+ resourceModuleObjectName = NameFactory.getModuleName(null, null,
null, null, null, resourceAdapterJ2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct resource
module name", e);
}
1.27 +4 -7
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- OpenEJBModuleBuilder.java 15 Feb 2005 04:47:00 -0000 1.26
+++ OpenEJBModuleBuilder.java 19 Feb 2005 18:24:43 -0000 1.27
@@ -57,7 +57,6 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
import java.util.jar.JarFile;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -80,7 +79,6 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.security.deploy.Security;
@@ -291,7 +289,7 @@
public void initContext(EARContext earContext, Module module,
ClassLoader cl) throws DeploymentException {
J2eeContext earJ2eeContext = earContext.getJ2eeContext();
- J2eeContext moduleJ2eeContext = new
J2eeContextImpl(earJ2eeContext.getJ2eeDomainName(),
earJ2eeContext.getJ2eeServerName(), earJ2eeContext.getJ2eeApplicationName(),
module.getName(), null, null);
+ J2eeContext moduleJ2eeContext =
J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext,
NameFactory.EJB_MODULE, module.getName());
URI moduleUri = module.getModuleURI();
EJBModule ejbModule = (EJBModule) module;
@@ -352,7 +350,7 @@
public String addGBeans(EARContext earContext, Module module,
ClassLoader cl) throws DeploymentException {
J2eeContext earJ2eeContext = earContext.getJ2eeContext();
- J2eeContext moduleJ2eeContext = new
J2eeContextImpl(earJ2eeContext.getJ2eeDomainName(),
earJ2eeContext.getJ2eeServerName(), earJ2eeContext.getJ2eeApplicationName(),
module.getName(), null, null);
+ J2eeContext moduleJ2eeContext =
J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext,
NameFactory.EJB_MODULE, module.getName());
EJBModule ejbModule = (EJBModule) module;
OpenejbOpenejbJarType openejbEjbJar = (OpenejbOpenejbJarType)
module.getVendorDD();
@@ -363,7 +361,7 @@
ObjectName ejbModuleObjectName = null;
try {
- ejbModuleObjectName = NameFactory.getModuleName(null, null,
null, null, NameFactory.EJB_MODULE, moduleJ2eeContext);
+ ejbModuleObjectName = NameFactory.getModuleName(null, null,
null, null, null, moduleJ2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct module name",
e);
}
@@ -441,7 +439,6 @@
*/
Security security = null;
//TODO fix this!
- Map localSecurityRealms = new HashMap();
security =
SecurityBuilder.buildSecurityConfig(openejbEjbJar.getSecurity(),
collectRoleNames(ejbJar));
EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
1.3 +4 -4
openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatefulContainerBuilder.java
Index: StatefulContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatefulContainerBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatefulContainerBuilder.java 15 Feb 2005 03:24:06 -0000 1.2
+++ StatefulContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.3
@@ -58,15 +58,15 @@
import org.openejb.dispatch.MethodHelper;
import org.openejb.dispatch.MethodSignature;
import org.openejb.dispatch.VirtualOperation;
+import org.openejb.sfsb.AfterBegin;
+import org.openejb.sfsb.AfterCompletion;
+import org.openejb.sfsb.BeforeCompletion;
import org.openejb.sfsb.BusinessMethod;
import org.openejb.sfsb.CreateMethod;
import org.openejb.sfsb.RemoveMethod;
import org.openejb.sfsb.StatefulInstanceContextFactory;
import org.openejb.sfsb.StatefulInstanceFactory;
import org.openejb.sfsb.StatefulInterceptorBuilder;
-import org.openejb.sfsb.AfterBegin;
-import org.openejb.sfsb.BeforeCompletion;
-import org.openejb.sfsb.AfterCompletion;
import org.openejb.slsb.dispatch.EJBActivateOperation;
import org.openejb.slsb.dispatch.EJBPassivateOperation;
import org.openejb.slsb.dispatch.SetSessionContextOperation;
1.3 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatelessContainerBuilder.java
Index: StatelessContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/StatelessContainerBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatelessContainerBuilder.java 26 Jan 2005 23:28:01 -0000 1.2
+++ StatelessContainerBuilder.java 19 Feb 2005 18:24:43 -0000 1.3
@@ -61,12 +61,12 @@
import org.openejb.dispatch.MethodSignature;
import org.openejb.dispatch.VirtualOperation;
import org.openejb.slsb.BusinessMethod;
+import org.openejb.slsb.CreateMethod;
import org.openejb.slsb.EJBCreateMethod;
import org.openejb.slsb.RemoveMethod;
import org.openejb.slsb.StatelessInstanceContextFactory;
import org.openejb.slsb.StatelessInstanceFactory;
import org.openejb.slsb.StatelessInterceptorBuilder;
-import org.openejb.slsb.CreateMethod;
import org.openejb.slsb.dispatch.SetSessionContextOperation;
/**
