Diff
Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java (2622 => 2623)
--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java 2006-04-24 04:42:49 UTC (rev 2622)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBABean.java 2006-04-25 23:22:39 UTC (rev 2623)
@@ -48,6 +48,8 @@
import java.util.Properties;
import java.net.InetSocketAddress;
+import javax.ejb.spi.HandleDelegate;
+
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -114,6 +116,10 @@
return orb;
}
+ public HandleDelegate getHandleDelegate() {
+ return new CORBAHandleDelegate();
+ }
+
public POA getRootPOA() {
return rootPOA;
}
@@ -203,6 +209,8 @@
infoFactory.addAttribute("ORB", ORB.class, false);
infoFactory.addAttribute("rootPOA", POA.class, false);
+ infoFactory.addAttribute("handleDelegate", HandleDelegate.class, false);
+
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addReference("SecurityService", SecurityService.class, NameFactory.GERONIMO_SERVICE);
Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBAHandleDelegate.java (2622 => 2623)
--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBAHandleDelegate.java 2006-04-24 04:42:49 UTC (rev 2622)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/corba/CORBAHandleDelegate.java 2006-04-25 23:22:39 UTC (rev 2623)
@@ -100,10 +100,4 @@
out.writeObject(ejbObject);
}
- public static class HandleDelegateReference extends SimpleReference {
-
- public Object getContent() {
- return new CORBAHandleDelegate();
- }
- }
}
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java (2622 => 2623)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java 2006-04-24 04:42:49 UTC (rev 2622)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java 2006-04-25 23:22:39 UTC (rev 2623)
@@ -134,10 +134,6 @@
return new CORBAProxyReference(configuration.getId(), containerNameQuery, nsCorbaloc, objectName, home);
}
- public Object createHandleDelegateReference() {
- return new CORBAHandleDelegate.HandleDelegateReference();
- }
-
public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {
AbstractNameQuery match;
if (query != null) {
