djencks 2005/01/21 19:39:15
Modified: modules/openejb-builder/src/java/org/openejb/deployment
CMPEntityBuilder.java EntityBuilder.java
MdbBuilder.java OpenEJBModuleBuilder.java
SessionBuilder.java
Log:
GERONIMO-450 progress: get the domain and J2EEServer for gbeans from the
parent config, or specify them explicitly if there is not parent. Also some
improvements in storing enhanced/generated classes in a config.
Revision Changes Path
1.13 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
Index: CMPEntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CMPEntityBuilder.java 7 Jan 2005 06:37:54 -0000 1.12
+++ CMPEntityBuilder.java 22 Jan 2005 00:39:14 -0000 1.13
@@ -225,7 +225,7 @@
ObjectName generatorObjectName = new
ObjectName(generatorName);
ObjectName wrapperGeneratorObjectName = new
ObjectName(generatorName + ",isWrapper=true");
keyGenerator = new
GBeanData(wrapperGeneratorObjectName, PrimaryKeyGeneratorWrapper.GBEAN_INFO);
-
keyGenerator.setReferencePatterns("PrimaryKeyGenerator",
Collections.singleton(generatorObjectName));
+
keyGenerator.setReferencePattern("PrimaryKeyGenerator", generatorObjectName);
keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);
} catch (Exception e) {
throw new DeploymentException("Unable to initialize
PrimaryKeyGeneratorWrapper GBean", e);
1.9 +5 -5
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EntityBuilder.java 18 Jan 2005 06:13:39 -0000 1.8
+++ EntityBuilder.java 22 Jan 2005 00:39:14 -0000 1.9
@@ -51,11 +51,12 @@
import java.security.Permissions;
import java.util.Map;
import java.util.Set;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import javax.transaction.UserTransaction;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -77,7 +78,6 @@
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
-import org.apache.geronimo.gbean.GBeanData;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
@@ -101,7 +101,7 @@
ObjectName entityObjectName =
createEJBObjectName(moduleJ2eeContext, entityBean);
GBeanData entityGBean = createBean(earContext, ejbModule,
entityObjectName, entityBean, openejbEntityBean, transactionPolicyHelper,
security, cl);
- earContext.addGBean( entityGBean);
+ earContext.addGBean(entityGBean);
}
}
@@ -192,8 +192,8 @@
MessageDestinationRefType[] messageDestinationRefs =
entityBean.getMessageDestinationRefArray();
ServiceRefType[] serviceRefs = entityBean.getServiceRefArray();
-
- ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule, userTransaction,
envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs, openejbEjbLocalRefs,
resourceRefs, openejbResourceRefs, resourceEnvRefs, openejbResourceEnvRefs,
messageDestinationRefs, serviceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MdbBuilder.java 18 Jan 2005 06:13:39 -0000 1.8
+++ MdbBuilder.java 22 Jan 2005 00:39:14 -0000 1.9
@@ -314,7 +314,7 @@
MessageDestinationRefType[] messageDestinationRefs =
messageDrivenBean.getMessageDestinationRefArray();
ServiceRefType[] serviceRefs =
messageDrivenBean.getServiceRefArray();
- ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule, userTransaction,
envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs, openejbEjbLocalRefs,
resourceRefs, openejbResourceRefs, resourceEnvRefs, openejbResourceEnvRefs,
messageDestinationRefs, serviceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
1.21 +2 -2
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- OpenEJBModuleBuilder.java 21 Jan 2005 06:30:37 -0000 1.20
+++ OpenEJBModuleBuilder.java 22 Jan 2005 00:39:14 -0000 1.21
@@ -262,7 +262,7 @@
}
OpenejbOpenejbJarType openejbEjbJar =
OpenejbOpenejbJarType.Factory.newInstance();
- openejbEjbJar.setParentId("org/apache/geronimo/Server");
+ openejbEjbJar.setParentId(defaultParentId.toString());
if (null != ejbJar.getId()) {
openejbEjbJar.setConfigId(ejbJar.getId());
} else {
1.11 +4 -4
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SessionBuilder.java 18 Jan 2005 06:13:39 -0000 1.10
+++ SessionBuilder.java 22 Jan 2005 00:39:14 -0000 1.11
@@ -51,11 +51,12 @@
import java.security.Permissions;
import java.util.Map;
import java.util.Set;
-import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import javax.transaction.UserTransaction;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -76,9 +77,8 @@
import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
-import org.apache.geronimo.xbeans.j2ee.SessionBeanType;
import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
-import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.xbeans.j2ee.SessionBeanType;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.transaction.ContainerPolicy;
import org.openejb.transaction.TransactionPolicy;
@@ -136,7 +136,7 @@
MessageDestinationRefType[] messageDestinationRefs =
sessionBean.getMessageDestinationRefArray();
ServiceRefType[] serviceRefs = sessionBean.getServiceRefArray();
- ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule, userTransaction,
envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs, openejbEjbLocalRefs,
resourceRefs, openejbResourceRefs, resourceEnvRefs, openejbResourceEnvRefs,
messageDestinationRefs, serviceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
