djencks 2004/09/24 03:18:55
Modified: modules/core/src/java/org/openejb/deployment
BeanBuilder.java EntityBuilder.java MdbBuilder.java
OpenEJBModuleBuilder.java SessionBuilder.java
Removed: modules/core/src/java/org/openejb/deployment
OpenEJBRefAdapter.java
Log:
Use namespace rewriting to eliminate refAdapter use. Fix broken jndi for
non-app-client clients. Clean up exception handling. Fix invalid openejb-dd
Revision Changes Path
1.3 +11 -11
openejb/modules/core/src/java/org/openejb/deployment/BeanBuilder.java
Index: BeanBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/BeanBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanBuilder.java 21 Sep 2004 05:20:48 -0000 1.2
+++ BeanBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -68,9 +68,9 @@
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.geronimo.naming.GerRemoteRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
import org.openejb.ResourceEnvironmentBuilder;
-import org.openejb.xbeans.ejbjar.OpenejbLocalRefType;
-import org.openejb.xbeans.ejbjar.OpenejbRemoteRefType;
abstract class BeanBuilder {
@@ -84,10 +84,10 @@
return moduleBuilder;
}
- protected void setResourceEnvironment(ResourceEnvironmentBuilder builder,
ResourceRefType[] resourceRefArray, OpenejbLocalRefType[] openejbResourceRefArray) {
+ protected void setResourceEnvironment(ResourceEnvironmentBuilder builder,
ResourceRefType[] resourceRefArray, GerLocalRefType[] openejbResourceRefArray) {
Map openejbNames = new HashMap();
for (int i = 0; i < openejbResourceRefArray.length; i++) {
- OpenejbLocalRefType openejbLocalRefType = openejbResourceRefArray[i];
+ GerLocalRefType openejbLocalRefType = openejbResourceRefArray[i];
openejbNames.put(openejbLocalRefType.getRefName(),
openejbLocalRefType.getTargetName());
}
Set unshareableResources = new HashSet();
@@ -110,13 +110,13 @@
EJBModule ejbModule,
EnvEntryType[] envEntries,
EjbRefType[] ejbRefs,
- OpenejbRemoteRefType[]
openejbEjbRefs,
+ GerRemoteRefType[]
openejbEjbRefs,
EjbLocalRefType[]
ejbLocalRefs,
- OpenejbLocalRefType[]
openejbEjbLocalRefs,
+ GerRemoteRefType[]
openejbEjbLocalRefs,
ResourceRefType[]
resourceRefs,
- OpenejbLocalRefType[]
openejbResourceRefs,
+ GerRemoteRefType[]
openejbResourceRefs,
ResourceEnvRefType[]
resourceEnvRefs,
- OpenejbLocalRefType[]
openejbResourceEnvRefs,
+ GerRemoteRefType[]
openejbResourceEnvRefs,
MessageDestinationRefType[] messageDestinationRefs, UserTransaction userTransaction,
ClassLoader cl) throws
NamingException, DeploymentException {
@@ -129,12 +129,12 @@
}
- protected Map mapRefs(OpenejbRemoteRefType[] refs) {
+ protected Map mapRefs(GerRemoteRefType[] refs) {
Map refMap = new HashMap();
if (refs != null) {
for (int i = 0; i < refs.length; i++) {
- OpenejbRemoteRefType ref = refs[i];
- refMap.put(ref.getRefName(), new OpenEJBRefAdapter(ref));
+ GerRemoteRefType ref = refs[i];
+ refMap.put(ref.getRefName(), ref);
}
}
return refMap;
1.3 +6 -6
openejb/modules/core/src/java/org/openejb/deployment/EntityBuilder.java
Index: EntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EntityBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EntityBuilder.java 21 Sep 2004 05:20:48 -0000 1.2
+++ EntityBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -70,10 +70,10 @@
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.geronimo.naming.GerRemoteRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
import org.openejb.entity.bmp.BMPContainerBuilder;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbLocalRefType;
-import org.openejb.xbeans.ejbjar.OpenejbRemoteRefType;
class EntityBuilder extends BeanBuilder {
@@ -168,27 +168,27 @@
// ejb refs
EjbRefType[] ejbRefs = entityBean.getEjbRefArray();
- OpenejbRemoteRefType[] openejbEjbRefs = null;
+ GerRemoteRefType[] openejbEjbRefs = null;
if (openejbEntityBean != null) {
openejbEjbRefs = openejbEntityBean.getEjbRefArray();
}
EjbLocalRefType[] ejbLocalRefs = entityBean.getEjbLocalRefArray();
- OpenejbLocalRefType[] openejbEjbLocalRefs = null;
+ GerLocalRefType[] openejbEjbLocalRefs = null;
if (openejbEntityBean != null) {
openejbEjbLocalRefs = openejbEntityBean.getEjbLocalRefArray();
}
// resource refs
ResourceRefType[] resourceRefs = entityBean.getResourceRefArray();
- OpenejbLocalRefType[] openejbResourceRefs = null;
+ GerLocalRefType[] openejbResourceRefs = null;
if (openejbEntityBean != null) {
openejbResourceRefs = openejbEntityBean.getResourceRefArray();
}
// resource env refs
ResourceEnvRefType[] resourceEnvRefs = entityBean.getResourceEnvRefArray();
- OpenejbLocalRefType[] openejbResourceEnvRefs = null;
+ GerLocalRefType[] openejbResourceEnvRefs = null;
if (openejbEntityBean != null) {
openejbResourceEnvRefs = openejbEntityBean.getResourceEnvRefArray();
}
1.3 +6 -6
openejb/modules/core/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MdbBuilder.java 21 Sep 2004 05:20:48 -0000 1.2
+++ MdbBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -80,10 +80,10 @@
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.geronimo.naming.GerRemoteRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
import org.openejb.mdb.MDBContainerBuilder;
-import org.openejb.xbeans.ejbjar.OpenejbLocalRefType;
import org.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
-import org.openejb.xbeans.ejbjar.OpenejbRemoteRefType;
class MdbBuilder extends BeanBuilder {
@@ -228,27 +228,27 @@
// ejb refs
EjbRefType[] ejbRefs = messageDrivenBean.getEjbRefArray();
- OpenejbRemoteRefType[] openejbEjbRefs = null;
+ GerRemoteRefType[] openejbEjbRefs = null;
if (openejbMessageDrivenBean != null) {
openejbEjbRefs = openejbMessageDrivenBean.getEjbRefArray();
}
EjbLocalRefType[] ejbLocalRefs = messageDrivenBean.getEjbLocalRefArray();
- OpenejbLocalRefType[] openejbEjbLocalRefs = null;
+ GerLocalRefType[] openejbEjbLocalRefs = null;
if (openejbMessageDrivenBean != null) {
openejbEjbLocalRefs = openejbMessageDrivenBean.getEjbLocalRefArray();
}
// resource refs
ResourceRefType[] resourceRefs = messageDrivenBean.getResourceRefArray();
- OpenejbLocalRefType[] openejbResourceRefs = null;
+ GerLocalRefType[] openejbResourceRefs = null;
if (openejbMessageDrivenBean != null) {
openejbResourceRefs = openejbMessageDrivenBean.getResourceRefArray();
}
// resource env refs
ResourceEnvRefType[] resourceEnvRefs =
messageDrivenBean.getResourceEnvRefArray();
- OpenejbLocalRefType[] openejbResourceEnvRefs = null;
+ GerLocalRefType[] openejbResourceEnvRefs = null;
if (openejbMessageDrivenBean != null) {
openejbResourceEnvRefs =
openejbMessageDrivenBean.getResourceEnvRefArray();
}
1.28 +16 -8
openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- OpenEJBModuleBuilder.java 23 Sep 2004 23:53:52 -0000 1.27
+++ OpenEJBModuleBuilder.java 24 Sep 2004 07:18:55 -0000 1.28
@@ -87,8 +87,8 @@
import org.apache.geronimo.xbeans.j2ee.EnterpriseBeansType;
import org.apache.xmlbeans.SchemaTypeLoader;
import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlException;
import org.openejb.EJBModuleImpl;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.proxy.ProxyObjectFactory;
@@ -139,7 +139,7 @@
// check if we have an alt spec dd
return parseSpecDD(SchemaConversionUtils.parse(path.openStream()));
} catch (Exception e) {
- throw new DeploymentException("Unable to parse " + path, e);
+ throw new DeploymentException("Could not parse path " + path, e);
}
}
@@ -148,7 +148,7 @@
// check if we have an alt spec dd
return parseSpecDD(SchemaConversionUtils.parse(specDD));
} catch (Exception e) {
- throw new DeploymentException("Unable to parse specDD");
+ throw new DeploymentException("could not parse spec dd", e);
}
}
@@ -157,11 +157,19 @@
return ejbJarDoc.getEjbJar();
}
- public XmlObject parseVendorDD(URL url) throws XmlException {
- return XmlBeansUtil.getXmlObject(url, OpenejbOpenejbJarDocument.type);
+ public XmlObject parseVendorDD(URL path) throws DeploymentException {
+ try {
+ XmlObject dd = SchemaConversionUtils.parse(path.openStream());
+ dd = SchemaConversionUtils.convertToGeronimoNamingSchema(dd);
+ dd = dd.changeType(OpenejbOpenejbJarDocument.type);
+ SchemaConversionUtils.validateDD(dd);
+ return dd;
+ } catch (Exception e) {
+ throw new DeploymentException(e.getMessage(), e);
+ }
}
- public XmlObject getDeploymentPlan(URL module) throws XmlException {
+ public XmlObject getDeploymentPlan(URL module) throws DeploymentException {
try {
URL moduleBase;
if (module.toString().endsWith("/")) {
@@ -512,7 +520,7 @@
static {
GBeanInfoFactory infoFactory = new
GBeanInfoFactory(OpenEJBModuleBuilder.class);
infoFactory.addAttribute("kernel", Kernel.class, false);
- infoFactory.setConstructor(new String[] {"kernel"});
+ infoFactory.setConstructor(new String[]{"kernel"});
infoFactory.addInterface(ModuleBuilder.class);
infoFactory.addInterface(EJBReferenceBuilder.class);
1.3 +6 -6
openejb/modules/core/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionBuilder.java 21 Sep 2004 05:20:48 -0000 1.2
+++ SessionBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
@@ -71,11 +71,11 @@
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.geronimo.naming.GerRemoteRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
import org.openejb.ContainerBuilder;
import org.openejb.sfsb.StatefulContainerBuilder;
import org.openejb.slsb.StatelessContainerBuilder;
-import org.openejb.xbeans.ejbjar.OpenejbLocalRefType;
-import org.openejb.xbeans.ejbjar.OpenejbRemoteRefType;
import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
@@ -175,27 +175,27 @@
// ejb refs
EjbRefType[] ejbRefs = sessionBean.getEjbRefArray();
- OpenejbRemoteRefType[] openejbEjbRefs = null;
+ GerRemoteRefType[] openejbEjbRefs = null;
if (openejbSessionBean != null) {
openejbEjbRefs = openejbSessionBean.getEjbRefArray();
}
EjbLocalRefType[] ejbLocalRefs = sessionBean.getEjbLocalRefArray();
- OpenejbLocalRefType[] openejbEjbLocalRefs = null;
+ GerLocalRefType[] openejbEjbLocalRefs = null;
if (openejbSessionBean != null) {
openejbEjbLocalRefs = openejbSessionBean.getEjbLocalRefArray();
}
// resource refs
ResourceRefType[] resourceRefs = sessionBean.getResourceRefArray();
- OpenejbLocalRefType[] openejbResourceRefs = null;
+ GerLocalRefType[] openejbResourceRefs = null;
if (openejbSessionBean != null) {
openejbResourceRefs = openejbSessionBean.getResourceRefArray();
}
// resource env refs
ResourceEnvRefType[] resourceEnvRefs = sessionBean.getResourceEnvRefArray();
- OpenejbLocalRefType[] openejbResourceEnvRefs = null;
+ GerLocalRefType[] openejbResourceEnvRefs = null;
if (openejbSessionBean != null) {
openejbResourceEnvRefs = openejbSessionBean.getResourceEnvRefArray();
}
