dain 2004/09/29 15:36:00
Modified: modules/core/src/java/org/openejb/deployment
EntityBuilder.java SessionBuilder.java
Log:
Addded JNDI reference address and fatory for resolving EJBs from a remote jndi enc
Moved EJB reference index code from EARContext to a new EJBRefContext
Revision Changes Path
1.4 +4 -9
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EntityBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
+++ EntityBuilder.java 29 Sep 2004 19:36:00 -0000 1.4
@@ -50,7 +50,6 @@
import java.security.Permissions;
import java.util.Map;
import javax.management.ObjectName;
-import javax.naming.Reference;
import javax.transaction.UserTransaction;
import org.apache.geronimo.deployment.DeploymentException;
@@ -61,6 +60,8 @@
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.security.deploy.Security;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerRemoteRefType;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
import org.apache.geronimo.xbeans.j2ee.EjbRefType;
@@ -70,8 +71,6 @@
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;
@@ -217,9 +216,7 @@
ENCConfigBuilder.assureEJBHomeInterface(home, cl);
String objectName = entityObjectName.getCanonicalName();
- boolean isSession = false;
- Reference reference =
getModuleBuilder().createEJBRemoteReference(objectName, isSession, remote, home);
- earContext.addEJBRef(module.getModuleURI(), ejbName, reference);
+ earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(),
ejbName, objectName);
}
// ejb-local-ref
@@ -231,9 +228,7 @@
ENCConfigBuilder.assureEJBLocalHomeInterface(localHome, cl);
String objectName = entityObjectName.getCanonicalName();
- boolean isSession = false;
- Reference reference =
getModuleBuilder().createEJBLocalReference(objectName, isSession, local, localHome);
- earContext.addEJBLocalRef(module.getModuleURI(), ejbName,
reference);
+ earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(),
ejbName, objectName);
}
}
}
1.4 +4 -10
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionBuilder.java 24 Sep 2004 07:18:55 -0000 1.3
+++ SessionBuilder.java 29 Sep 2004 19:36:00 -0000 1.4
@@ -50,7 +50,6 @@
import java.security.Permissions;
import java.util.Map;
import javax.management.ObjectName;
-import javax.naming.Reference;
import javax.transaction.UserTransaction;
import org.apache.geronimo.deployment.DeploymentException;
@@ -62,6 +61,8 @@
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.security.deploy.Security;
import org.apache.geronimo.transaction.UserTransactionImpl;
+import org.apache.geronimo.xbeans.geronimo.naming.GerLocalRefType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerRemoteRefType;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
import org.apache.geronimo.xbeans.j2ee.EjbRefType;
@@ -71,8 +72,6 @@
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;
@@ -238,10 +237,7 @@
ENCConfigBuilder.assureEJBHomeInterface(home, cl);
String objectName = sessionObjectName.getCanonicalName();
-
- boolean isSession = true;
- Reference reference =
getModuleBuilder().createEJBRemoteReference(objectName, isSession, remote, home);
- earContext.addEJBRef(module.getModuleURI(), ejbName, reference);
+ earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(),
ejbName, objectName);
}
// ejb-local-ref
@@ -253,9 +249,7 @@
ENCConfigBuilder.assureEJBLocalHomeInterface(localHome, cl);
String objectName = sessionObjectName.getCanonicalName();
- boolean isSession = true;
- Reference reference =
getModuleBuilder().createEJBLocalReference(objectName, isSession, local, localHome);
- earContext.addEJBLocalRef(module.getModuleURI(), ejbName,
reference);
+ earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(),
ejbName, objectName);
}
}
}
