Add host-corba-jdk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672465 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 129 insertions, 88 deletions

diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHost.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java
index c8b485466e..2e6d319810 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHost.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java
@@ -17,13 +17,21 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.host.corba;
+package org.apache.tuscany.sca.host.corba.jdk;
 
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.host.corba.CorbaHost;
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
 import org.omg.CosNaming.NamingContextPackage.InvalidName;
 import org.omg.CosNaming.NamingContextPackage.NotFound;
 
@@ -31,6 +39,9 @@ import org.omg.CosNaming.NamingContextPackage.NotFound;
  * Default implementation of CORBA host
  */
 public class DefaultCorbaHost implements CorbaHost {
+    private static final Logger logger = Logger.getLogger(DefaultCorbaHost.class.getName());
+
+    private Map<String, ORB> orbs = new ConcurrentHashMap<String, ORB>();
 
     private void validatePort(int port) throws IllegalArgumentException {
         if (port < 1) {
@@ -44,15 +55,9 @@ public class DefaultCorbaHost implements CorbaHost {
         }
     }
 
-    private String[] getArgs(String host, int port) {
-        String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port};
-        return args;
-    }
-
-    private NamingContext getNamingContext(String host, int port) throws Exception {
-        ORB orb = ORB.init(getArgs(host, port), null);
+    private NamingContextExt getNamingContext(ORB orb) throws Exception {
         org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService");
-        return NamingContextHelper.narrow(objRef);
+        return NamingContextExtHelper.narrow(objRef);
     }
 
     private void handleException(Exception e) throws CorbaHostException {
@@ -66,16 +71,11 @@ public class DefaultCorbaHost implements CorbaHost {
         }
     }
 
-    public void registerServant(String name, String host, int port, Object servantObject) throws CorbaHostException {
-        validatePort(port);
+    public void registerServant(ORB orb, String name, Object servantObject) throws CorbaHostException {
         validateName(name);
-        if (host == null || host.length() == 0) {
-            host = "localhost";
-        }
         try {
-            NamingContext ncRef = getNamingContext(host, port);
-            NameComponent nc = new NameComponent(name, "");
-            NameComponent[] path = {nc};
+            NamingContextExt ncRef = getNamingContext(orb);
+            NameComponent[] path = ncRef.to_name(name);
             try {
                 ncRef.resolve(path);
                 // no exception means that some object is already registered
@@ -91,33 +91,23 @@ public class DefaultCorbaHost implements CorbaHost {
         }
     }
 
-    public void unregisterServant(String name, String host, int port) throws CorbaHostException {
-        validatePort(port);
+    public void unregisterServant(ORB orb, String name) throws CorbaHostException {
         validateName(name);
-        if (host == null || host.length() == 0) {
-            host = "localhost";
-        }
         try {
-            NamingContext ncRef = getNamingContext(host, port);
-            NameComponent nc = new NameComponent(name, "");
-            NameComponent[] path = {nc};
+            NamingContextExt ncRef = getNamingContext(orb);
+            NameComponent[] path = ncRef.to_name(name);
             ncRef.unbind(path);
         } catch (Exception e) {
             handleException(e);
         }
     }
 
-    public Object getReference(String name, String host, int port) throws CorbaHostException {
-        validatePort(port);
+    public Object lookup(ORB orb, String name) throws CorbaHostException {
         validateName(name);
-        if (host == null || host.length() == 0) {
-            host = "localhost";
-        }
         Object result = null;
         try {
-            NamingContext ncRef = getNamingContext(host, port);
-            NameComponent nc = new NameComponent(name, "");
-            NameComponent path[] = {nc};
+            NamingContextExt ncRef = getNamingContext(orb);
+            NameComponent[] path = ncRef.to_name(name);
             result = ncRef.resolve(path);
         } catch (Exception e) {
             handleException(e);
@@ -125,4 +115,52 @@ public class DefaultCorbaHost implements CorbaHost {
         return result;
     }
 
+    public ORB createORB(String host, int port, boolean server) throws CorbaHostException {
+        validatePort(port);
+
+        String key = host + ":" + port;
+        ORB orb = orbs.get(key);
+        if (orb != null) {
+            return orb;
+        }
+        // Create an ORB object
+        Properties props = new Properties();
+        props.putAll(System.getProperties());
+
+        String portStr = String.valueOf(port);
+        props.put("org.omg.CORBA.ORBServerId", "1000000");
+        props.put("org.omg.CORBA.ORBInitialHost", host);
+        props.put("org.omg.CORBA.ORBInitialPort", portStr);
+
+        // STEP 1: Set ORBPeristentServerPort property
+        // Set the proprietary property to open up a port to listen to
+        // INS requests. 
+
+        if (server) {
+            props.put("com.sun.CORBA.POA.ORBPersistentServerPort", portStr);
+            props.put("com.ibm.CORBA.ListenerPort", portStr);
+            props.put("gnu.CORBA.ListenerPort", portStr);
+            //        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
+            //        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+            props.put("yoko.orb.oa.endpoint", "iiop --host " + host + " --port " + port);
+            props.put("yoko.orb.poamanager.TNameService.endpoint", "iiop --host " + host);
+        }
+
+        String[] args = {"-ORBInitialHost", host, "-ORBInitialPort", "" + port};
+        orb = ORB.init(args, props);
+        orbs.put(key, orb);
+        return orb;
+    }
+
+    public void stop() {
+        for (ORB orb : orbs.values()) {
+            try {
+                orb.shutdown(true);
+                orb.destroy();
+            } catch (Throwable e) {
+                logger.log(Level.SEVERE, e.getMessage(), e);
+            }
+        }
+    }
+
 }
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
index 59f0ce9a53..59f0ce9a53 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
index 7eb29b0859..03a243fd48 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
@@ -47,7 +47,7 @@ public class TransientNameServer {
                 synchronized (flag) {
                     try {
                         service.run();
-                        orb = service.createdOrb;
+                        orb = service.getORB();
                         started = Boolean.TRUE;
                     } catch (Throwable e) {
                         started = Boolean.FALSE;
@@ -56,19 +56,11 @@ public class TransientNameServer {
                         flag.notifyAll();
                     }
                 }
+                // Wait for requests
                 orb.run();
-                /*
-                // now we just sit and wait here.
-                synchronized (service) {
-                    try {
-                        service.wait();
-                    } catch (InterruptedException e) {
-                        throw new IllegalStateException(e);
-                    }
-                }
-                */
             }
         };
+        // t.setDaemon(true);
         t.start();
         checkState();
         return t.isAlive() ? t : null;
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 4e6c7a9715..39ba6b784e 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
@@ -170,6 +170,7 @@ public class TransientNameService {
     public void destroy() {
         // only destroy this if we created the orb instance.
         if (createdOrb != null) {
+            createdOrb.shutdown(true);
             createdOrb.destroy();
             createdOrb = null;
         }
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
index a7164e9ef3..a7164e9ef3 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
index 444143f173..444143f173 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
+++ b/java/sca/modules/host-corba-jdk/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 2c7a308769..96265a318e 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 
 import org.apache.tuscany.sca.host.corba.CorbaHost;
 import org.apache.tuscany.sca.host.corba.CorbaHostException;
-import org.apache.tuscany.sca.host.corba.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.jdk.DefaultCorbaHost;
 import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
 import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
 import org.apache.tuscany.sca.host.corba.testing.general.TestInterface;
@@ -106,7 +106,7 @@ public class DefaultCorbaHostTestCase {
         killProcess(tn);
     }
     */
-    
+
     private static TransientNameServer server;
 
     @BeforeClass
@@ -135,13 +135,14 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_registerServant() {
         try {
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false);
             TestInterface servant = new TestInterfaceServant();
-            host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant);
+            host.registerServant(orb, "Test", servant);
 
-            TestInterface ref = TestInterfaceHelper.narrow(host.getReference("Test", null, DEFAULT_PORT));
+            TestInterface ref = TestInterfaceHelper.narrow(host.lookup(orb, "Test"));
             assertEquals(2, ref.getInt(2));
 
-            host.unregisterServant("Test", LOCALHOST, DEFAULT_PORT);
+            host.unregisterServant(orb, "Test");
         } catch (Exception e) {
             e.printStackTrace();
             fail();
@@ -154,9 +155,10 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_nameAlreadyRegistered() {
         try {
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false);
             TestInterface servant = new TestInterfaceServant();
-            host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant);
-            host.registerServant("Test", LOCALHOST, DEFAULT_PORT, servant);
+            host.registerServant(orb, "Test", servant);
+            host.registerServant(orb, "Test", servant);
             fail();
         } catch (CorbaHostException e) {
             assertTrue(e.getMessage().equals(CorbaHostException.BINDING_IN_USE));
@@ -172,7 +174,8 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_getNonExistingObject() {
         try {
-            host.getReference("NonExistingReference", LOCALHOST, DEFAULT_PORT);
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false);
+            host.lookup(orb, "NonExistingReference");
             fail();
         } catch (CorbaHostException e) {
             assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
@@ -188,7 +191,8 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_unregisterNonExistentObject() {
         try {
-            host.unregisterServant("NonExistingReference2", LOCALHOST, DEFAULT_PORT);
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false);
+            host.unregisterServant(orb, "NonExistingReference2");
             fail();
         } catch (CorbaHostException e) {
             assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
@@ -204,8 +208,9 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_invalidHost() {
         try {
+            ORB orb = host.createORB("not_" + LOCALHOST, DEFAULT_PORT, false);
             TestInterface servant = new TestInterfaceServant();
-            host.registerServant("Test", "nosuchhost", DEFAULT_PORT, servant);
+            host.registerServant(orb, "Test", servant);
             fail();
         } catch (CorbaHostException e) {
             // Expected
@@ -221,8 +226,9 @@ public class DefaultCorbaHostTestCase {
     @Test
     public void test_invalidPort() {
         try {
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT + 1, false);
             TestInterface servant = new TestInterfaceServant();
-            host.registerServant("Test", LOCALHOST, 9991, servant);
+            host.registerServant(orb, "Test", servant);
             fail();
         } catch (CorbaHostException e) {
             // Expected
@@ -239,8 +245,9 @@ public class DefaultCorbaHostTestCase {
     @Ignore("SUN JDK 6 is happy with all kind of names")
     public void test_invalidBindingName() {
         try {
+            ORB orb = host.createORB(LOCALHOST, DEFAULT_PORT, false);
             TestInterface servant = new TestInterfaceServant();
-            host.registerServant("---", LOCALHOST, DEFAULT_PORT, servant);
+            host.registerServant(orb, "---", servant);
             fail();
         } catch (CorbaHostException e) {
             assertTrue(e.getMessage().equals(CorbaHostException.WRONG_NAME));
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
index 8d1a9db9e9..8d1a9db9e9 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
index fe85dc7743..fe85dc7743 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
index 305a4d7b97..305a4d7b97 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
index f557d3e020..f557d3e020 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
index f993066dab..f993066dab 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
index 30a77deaf5..30a77deaf5 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
index 0ebde8ef0d..0ebde8ef0d 100644
--- a/java/sca/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ b/java/sca/modules/host-corba-jdk/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/java/sca/modules/host-corba/src/test/resources/general.idl b/java/sca/modules/host-corba-jdk/src/test/resources/general.idl
index f67566deb8..f67566deb8 100644
--- a/java/sca/modules/host-corba/src/test/resources/general.idl
+++ b/java/sca/modules/host-corba-jdk/src/test/resources/general.idl
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index 7d9a3db587..1ff0e79cbd 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
@@ -19,43 +19,45 @@
 
 package org.apache.tuscany.sca.host.corba;
 
+import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 
 /**
  * CORBA Service hosting interface
  */
 public interface CorbaHost {
-
+    /**
+     * Create an ORB instance
+     * @param host The host name
+     * @param port The port number
+     * @param server Is it for server side
+     * @return
+     */
+    ORB createORB(String host, int port, boolean server) throws CorbaHostException;
     /**
      * Registers servant in name server.
-     * 
+     * @param orb The ORB instance
      * @param name binding name
-     * @param host name server host
-     * @param port name server port
      * @param serviceObject
      * @throws CorbaHostException
      */
-    void registerServant(String name, String host, int port, Object serviceObject) throws CorbaHostException;
+    void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException;
 
     /**
      * Removes servant from name server
-     * 
+     * @param orb The ORB instance
      * @param name binding name
-     * @param host name server host
-     * @param port name server port
      * @throws CorbaHostException
      */
-    void unregisterServant(String name, String host, int port) throws CorbaHostException;
+    void unregisterServant(ORB orb, String name) throws CorbaHostException;
 
     /**
      * Gets reference to object
-     * 
+     * @param orb The ORB instance
      * @param name binding name
-     * @param host name server host
-     * @param port name server port
      * @return objects reference
      * @throws CorbaHostException
      */
-    Object getReference(String name, String host, int port) throws CorbaHostException;
+    Object lookup(ORB orb, String name) throws CorbaHostException;
 
 }
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
index f9150f137c..c7a6eb6ba4 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
@@ -30,8 +30,6 @@ public class DefaultCorbaHostExtensionPoint implements CorbaHostExtensionPoint {
     private List<CorbaHost> corbaHosts = new ArrayList<CorbaHost>();
 
     public DefaultCorbaHostExtensionPoint() {
-        CorbaHost defaultHost = new DefaultCorbaHost();
-        addCorbaHost(defaultHost);
     }
 
     public void addCorbaHost(CorbaHost host) {
diff --git a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 0b44ccafe1..630a42ece5 100644
--- a/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
@@ -19,6 +19,7 @@
 
 package org.apache.tuscany.sca.host.corba;
 
+import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 
 /**
@@ -26,31 +27,33 @@ import org.omg.CORBA.Object;
  */
 public class ExtensibleCorbaHost implements CorbaHost {
 
-    private CorbaHostExtensionPoint chep;
+    private CorbaHostExtensionPoint hosts;
 
     public ExtensibleCorbaHost(CorbaHostExtensionPoint chep) {
-        this.chep = chep;
+        this.hosts = chep;
     }
 
-    public Object getReference(String name, String host, int port) throws CorbaHostException {
-        if (chep.getCorbaHosts().isEmpty()) {
-            throw new CorbaHostException("No registered CORBA hosts");
-        }
-        return chep.getCorbaHosts().get(0).getReference(name, host, port);
+    public Object lookup(ORB orb, String name) throws CorbaHostException {
+        return getCorbaHost().lookup(orb, name);
     }
 
-    public void registerServant(String name, String host, int port, Object serviceObject) throws CorbaHostException {
-        if (chep.getCorbaHosts().isEmpty()) {
-            throw new CorbaHostException("No registered CORBA hosts");
-        }
-        chep.getCorbaHosts().get(0).registerServant(name, host, port, serviceObject);
+    public void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException {
+        getCorbaHost().registerServant(orb, name, serviceObject);
     }
 
-    public void unregisterServant(String name, String host, int port) throws CorbaHostException {
-        if (chep.getCorbaHosts().isEmpty()) {
+    public void unregisterServant(ORB orb, String name) throws CorbaHostException {
+        getCorbaHost().unregisterServant(orb, name);
+    }
+    
+    protected CorbaHost getCorbaHost() throws CorbaHostException {
+        if (hosts.getCorbaHosts().isEmpty()) {
             throw new CorbaHostException("No registered CORBA hosts");
         }
-        chep.getCorbaHosts().get(0).unregisterServant(name, host, port);
+        return hosts.getCorbaHosts().get(0);
+    }
+
+    public ORB createORB(String host, int port, boolean server) throws CorbaHostException {
+        return getCorbaHost().createORB(host, port, server);
     }
 
 }