Apply the patch from Wojtek for TUSCANY-2397. Thanks. (corbaname-improvement-jira-2357-09-july.patch)

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

2 files changed, 0 insertions, 39 deletions

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 edba92d190..d5922ad305 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
@@ -34,14 +34,6 @@ public interface CorbaHost {
      * @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 serviceObject
-     * @throws CorbaHostException
-     */
-    void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException;
 
     /**
      * Registers servant in name server.
@@ -50,14 +42,6 @@ public interface CorbaHost {
      * @throws CorbaHostException
      */
     void registerServant(String uri, Object serviceObject) throws CorbaHostException;
-    
-    /**
-     * Removes servant from name server
-     * @param orb The ORB instance
-     * @param name binding name
-     * @throws CorbaHostException
-     */
-    void unregisterServant(ORB orb, String name) throws CorbaHostException;
 
     /**
      * Removes servant from name server
@@ -70,16 +54,6 @@ public interface CorbaHost {
     /**
      * Gets reference to object
      * @param name binding name
-     * @param host ORB host name
-     * @param port ORB port
-     * @return
-     * @throws CorbaHostException
-     */
-    Object lookup(String name, String host, int port) throws CorbaHostException;
-    
-    /**
-     * Gets reference to object
-     * @param name binding name
      * @return objects reference
      * @throws CorbaHostException
      */
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 f4196bf401..ace61d934e 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
@@ -37,23 +37,10 @@ public class ExtensibleCorbaHost implements CorbaHost {
         return getCorbaHost().lookup(uri);
     }
 
-    public Object lookup(String name, String host, int port) throws CorbaHostException {
-        return getCorbaHost().lookup(name, host, port);
-    }
-
-    public void registerServant(ORB orb, String name, Object serviceObject) throws CorbaHostException {
-        getCorbaHost().registerServant(orb, name, serviceObject);
-    }
-
     public void registerServant(String uri, Object serviceObject) throws CorbaHostException {
         getCorbaHost().registerServant(uri, serviceObject);
     }
 
-    public void unregisterServant(ORB orb, String name) throws CorbaHostException {
-        getCorbaHost().unregisterServant(orb, name);
-    }
-
-
     public void unregisterServant(String uri) throws CorbaHostException {
         getCorbaHost().unregisterServant(uri);
     }