djencks 2005/01/18 01:13:40
Modified: modules/openejb-builder/src/java/org/openejb/deployment
EntityBuilder.java MdbBuilder.java
SessionBuilder.java
Log:
Add ServiceReferenceBuilder where appropriate, fix DefaultWorkManager so it
starts
Revision Changes Path
1.8 +4 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EntityBuilder.java 27 Dec 2004 02:03:25 -0000 1.7
+++ EntityBuilder.java 18 Jan 2005 06:13:39 -0000 1.8
@@ -76,6 +76,7 @@
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.ServiceRefType;
import org.apache.geronimo.gbean.GBeanData;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
@@ -190,8 +191,9 @@
}
MessageDestinationRefType[] messageDestinationRefs =
entityBean.getMessageDestinationRefArray();
-
- ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, cl);
+ ServiceRefType[] serviceRefs = entityBean.getServiceRefArray();
+
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
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.8 +3 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MdbBuilder.java 6 Dec 2004 06:32:33 -0000 1.7
+++ MdbBuilder.java 18 Jan 2005 06:13:39 -0000 1.8
@@ -82,6 +82,7 @@
import org.apache.geronimo.xbeans.j2ee.MessageDrivenBeanType;
import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
+import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbActivationConfigPropertyType;
import org.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
@@ -311,8 +312,9 @@
}
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, cl);
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
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.10 +3 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SessionBuilder.java 27 Dec 2004 02:03:25 -0000 1.9
+++ SessionBuilder.java 18 Jan 2005 06:13:39 -0000 1.10
@@ -77,6 +77,7 @@
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.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.transaction.ContainerPolicy;
@@ -133,8 +134,9 @@
}
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, cl);
+ ReadOnlyContext context =
ENCConfigBuilder.buildComponentContext(earContext, ejbModule.getModuleURI(),
userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
