dain 2004/04/15 22:34:07
Modified: modules/core/src/java/org/openejb/server/ejbd
ClientObjectFactory.java JndiRequestHandler.java
Log:
Changed container id to a String
Simplified requirements to create an EJBProxyFactory
EJBProxyFactory is now constructed in the GenericEJBContainer constructor
Change ProxyRefAddress to store the class names instead of a proxy info
object; this allows the construction of an ejb-ref without knowing the
container type
Merged stateless and stateful object base classes into a single class,
which simplifies proxy construction
Revision Changes Path
1.4 +6 -6
openejb/modules/core/src/java/org/openejb/server/ejbd/ClientObjectFactory.java
Index: ClientObjectFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/ClientObjectFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClientObjectFactory.java 9 Apr 2004 19:04:02 -0000 1.3
+++ ClientObjectFactory.java 16 Apr 2004 02:34:07 -0000 1.4
@@ -145,7 +145,7 @@
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
- info.getContainerID().toString(),
+ info.getContainerID(),
idCode);
return metaData;
}
@@ -175,7 +175,7 @@
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
- info.getContainerID().toString(),
+ info.getContainerID(),
idCode);
Object primKey = info.getPrimaryKey();
@@ -209,7 +209,7 @@
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
- info.getContainerID().toString(),
+ info.getContainerID(),
idCode);
EJBHomeHandler hanlder =
EJBHomeHandler.createEJBHomeHandler(eMetaData,sMetaData,cMetaData);
@@ -242,7 +242,7 @@
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
- info.getContainerID().toString(),
+ info.getContainerID(),
idCode);
Object primKey = info.getPrimaryKey();
@@ -276,7 +276,7 @@
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
-
info.getContainerID().toString(),
+ info.getContainerID(),
idCode);
EJBHomeHandler hanlder =
EJBHomeHandler.createEJBHomeHandler(eMetaData,sMetaData,cMetaData);
1.4 +3 -3
openejb/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java
Index: JndiRequestHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JndiRequestHandler.java 9 Apr 2004 19:04:02 -0000 1.3
+++ JndiRequestHandler.java 16 Apr 2004 02:34:07 -0000 1.4
@@ -84,14 +84,14 @@
int index = containerIndex.getContainerIndexByJndiName(name);
if (index > 0) {
EJBContainer deployment = containerIndex.getContainer(index);
- ProxyInfo info = deployment.getProxyFactory().getProxyInfo();
+ ProxyInfo info = deployment.getProxyInfo();
res.setResponseCode(JNDI_EJBHOME);
EJBMetaDataImpl metaData = new EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
info.getPrimaryKeyClass(),
info.getComponentType(),
- info.getContainerID().toString(),
+ info.getContainerID(),
index);
res.setResult(metaData);
} else {
