djencks 2005/02/24 22:44:04
Modified: modules/openejb-builder/src/java/org/openejb/deployment
EntityBuilder.java MdbBuilder.java
SessionBuilder.java
Log:
Allow setting location of ws in service-ref plans
Revision Changes Path
1.13 +7 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EntityBuilder.java 19 Feb 2005 18:24:43 -0000 1.12
+++ EntityBuilder.java 25 Feb 2005 03:44:04 -0000 1.13
@@ -67,6 +67,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
import org.apache.geronimo.xbeans.j2ee.EjbRefType;
@@ -177,11 +178,16 @@
// resource env refs
ResourceEnvRefType[] resourceEnvRefs =
entityBean.getResourceEnvRefArray();
GerResourceEnvRefType[] openejbResourceEnvRefs = null;
+
+ ServiceRefType[] serviceRefs = entityBean.getServiceRefArray();
+ GerServiceRefType[] openejbServiceRefs = null;
+
if (openejbEntityBean != null) {
openejbEjbRefs = openejbEntityBean.getEjbRefArray();
openejbEjbLocalRefs = openejbEntityBean.getEjbLocalRefArray();
openejbResourceRefs = openejbEntityBean.getResourceRefArray();
openejbResourceEnvRefs =
openejbEntityBean.getResourceEnvRefArray();
+ openejbServiceRefs = openejbEntityBean.getServiceRefArray();
builder.setJndiNames(openejbEntityBean.getJndiNameArray());
builder.setLocalJndiNames(openejbEntityBean.getLocalJndiNameArray());
} else {
@@ -191,9 +197,8 @@
}
MessageDestinationRefType[] messageDestinationRefs =
entityBean.getMessageDestinationRefArray();
- ServiceRefType[] serviceRefs = entityBean.getServiceRefArray();
- Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+ Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs,
openejbServiceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
}
1.15 +7 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MdbBuilder.java 19 Feb 2005 22:26:55 -0000 1.14
+++ MdbBuilder.java 25 Feb 2005 03:44:04 -0000 1.15
@@ -71,6 +71,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceLocatorType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
import org.apache.geronimo.xbeans.j2ee.ActivationConfigPropertyType;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
@@ -304,18 +305,22 @@
// resource env refs
ResourceEnvRefType[] resourceEnvRefs =
messageDrivenBean.getResourceEnvRefArray();
GerResourceEnvRefType[] openejbResourceEnvRefs = null;
+
+ ServiceRefType[] serviceRefs =
messageDrivenBean.getServiceRefArray();
+ GerServiceRefType[] openejbServiceRefs = null;
+
//get arrays from openejb plan if present
if (openejbMessageDrivenBean != null) {
openejbEjbRefs = openejbMessageDrivenBean.getEjbRefArray();
openejbEjbLocalRefs =
openejbMessageDrivenBean.getEjbLocalRefArray();
openejbResourceRefs =
openejbMessageDrivenBean.getResourceRefArray();
openejbResourceEnvRefs =
openejbMessageDrivenBean.getResourceEnvRefArray();
+ openejbServiceRefs =
openejbMessageDrivenBean.getServiceRefArray();
}
MessageDestinationRefType[] messageDestinationRefs =
messageDrivenBean.getMessageDestinationRefArray();
- ServiceRefType[] serviceRefs =
messageDrivenBean.getServiceRefArray();
- Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+ Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs,
openejbServiceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
1.15 +7 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SessionBuilder.java 23 Feb 2005 18:13:27 -0000 1.14
+++ SessionBuilder.java 25 Feb 2005 03:44:04 -0000 1.15
@@ -68,6 +68,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
import org.apache.geronimo.xbeans.j2ee.EjbRefType;
@@ -119,11 +120,16 @@
// resource env refs
ResourceEnvRefType[] resourceEnvRefs =
sessionBean.getResourceEnvRefArray();
GerResourceEnvRefType[] openejbResourceEnvRefs = null;
+
+ ServiceRefType[] serviceRefs = sessionBean.getServiceRefArray();
+ GerServiceRefType[] openejbServiceRefs = null;
+
if (openejbSessionBean != null) {
openejbEjbRefs = openejbSessionBean.getEjbRefArray();
openejbEjbLocalRefs = openejbSessionBean.getEjbLocalRefArray();
openejbResourceRefs = openejbSessionBean.getResourceRefArray();
openejbResourceEnvRefs =
openejbSessionBean.getResourceEnvRefArray();
+ openejbServiceRefs = openejbSessionBean.getServiceRefArray();
builder.setJndiNames(openejbSessionBean.getJndiNameArray());
builder.setLocalJndiNames(openejbSessionBean.getLocalJndiNameArray());
} else {
@@ -133,9 +139,8 @@
}
MessageDestinationRefType[] messageDestinationRefs =
sessionBean.getMessageDestinationRefArray();
- ServiceRefType[] serviceRefs = sessionBean.getServiceRefArray();
- Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs, cl);
+ Map context = ENCConfigBuilder.buildComponentContext(earContext,
ejbModule, userTransaction, envEntries, ejbRefs, openejbEjbRefs, ejbLocalRefs,
openejbEjbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs,
openejbResourceEnvRefs, messageDestinationRefs, serviceRefs,
openejbServiceRefs, cl);
builder.setComponentContext(context);
ENCConfigBuilder.setResourceEnvironment(earContext,
ejbModule.getModuleURI(), builder, resourceRefs, openejbResourceRefs);
