dblevins 2005/02/19 04:46:38
Modified: modules/core/src/java/org/openejb/corba AdapterEntity.java
AdapterStateful.java AdapterStateless.java
Log:
Removed getProxyFactory from EJBContainer interface and all references to it.
Fixed the WSContainer so it doesn't put instances of InvocationResult in the
soap message.
Fixed the invocation test in WSContainerTest.
Slightly improved the ulgy EJBInvocationStream code.
Revision Changes Path
1.3 +3 -3
openejb/modules/core/src/java/org/openejb/corba/AdapterEntity.java
Index: AdapterEntity.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterEntity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdapterEntity.java 18 Jan 2005 21:50:39 -0000 1.2
+++ AdapterEntity.java 19 Feb 2005 09:46:38 -0000 1.3
@@ -146,7 +146,7 @@
EJBContainer container = getContainer();
Servant servant =
getTieLoader().loadTieClass(container.getProxyInfo().getRemoteInterface(),
container.getProxyInfo());
if (servant instanceof Tie) {
- ((Tie)
servant).setTarget(container.getProxyFactory().getEJBObject(pk));
+ ((Tie) servant).setTarget(container.getEJBObject(pk));
}
return servant;
} catch (IOException e) {
1.3 +3 -3
openejb/modules/core/src/java/org/openejb/corba/AdapterStateful.java
Index: AdapterStateful.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterStateful.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdapterStateful.java 18 Jan 2005 21:50:39 -0000 1.2
+++ AdapterStateful.java 19 Feb 2005 09:46:38 -0000 1.3
@@ -146,7 +146,7 @@
EJBContainer container = getContainer();
Servant servant =
getTieLoader().loadTieClass(container.getProxyInfo().getRemoteInterface(),
container.getProxyInfo());
if (servant instanceof Tie) {
- ((Tie)
servant).setTarget(container.getProxyFactory().getEJBObject(pk));
+ ((Tie) servant).setTarget(container.getEJBObject(pk));
}
return servant;
} catch (IOException e) {
1.3 +3 -3
openejb/modules/core/src/java/org/openejb/corba/AdapterStateless.java
Index: AdapterStateless.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterStateless.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdapterStateless.java 18 Jan 2005 21:50:39 -0000 1.2
+++ AdapterStateless.java 19 Feb 2005 09:46:38 -0000 1.3
@@ -89,7 +89,7 @@
poa.the_POAManager().activate();
Servant servant =
tieLoader.loadTieClass(container.getProxyInfo().getRemoteInterface(),
container.getProxyInfo());
- Remote obj = container.getProxyFactory().getEJBObject(null);
+ Remote obj = container.getEJBObject(null);
if (servant instanceof Tie) {
((Tie) servant).setTarget(obj);
}
