bug 2264 - remove deprecated APIs

4 files changed, 0 insertions, 215 deletions

diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 50b8b7586f3..b4de4b38b91 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -64,37 +64,6 @@ public abstract class Application
         return main(appName, args, initData);
     }
 
-    /**
-     * @deprecated This method has been deprecated.
-     **/
-    public final int
-    main(String appName, String[] args, String configFile, Logger logger)
-    {
-        InitializationData initData = new InitializationData();
-        if(configFile != null)
-        {
-            try
-            {
-                initData.properties = Util.createProperties();
-                initData.properties.load(configFile);
-            }
-            catch(LocalException ex)
-            {
-                System.err.println(appName + ": " + ex);
-                ex.printStackTrace();
-                return 1;
-            }
-            catch(java.lang.Exception ex)
-            {
-                System.err.println(appName + ": unknown exception");
-                ex.printStackTrace();
-                return 1;
-            }
-        }
-        initData.logger = logger;
-        return main(appName, args, initData);
-    }
-
     public final int
     main(String appName, String[] args, InitializationData initializationData)
     {
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 50b8d2ddab4..4cf498fd19c 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -11,16 +11,8 @@ package Ice;
 
 public interface ObjectPrx
 {
-    /**
-     * @deprecated This method has been replaced with ice_getHash.
-     **/
-    int ice_hash();
     int ice_getHash();
 
-    /**
-     * @deprecated This method has been replaced with ice_getCommunicator.
-     **/
-    Communicator ice_communicator();
     Communicator ice_getCommunicator();
 
     String ice_toString();
@@ -47,17 +39,9 @@ public interface ObjectPrx
                           java.util.Map context);
 
     Identity ice_getIdentity();
-    /**
-     * @deprecated This method has been replaced with ice_identity.
-     **/
-    ObjectPrx ice_newIdentity(Identity newIdentity);
     ObjectPrx ice_identity(Identity newIdentity);
 
     java.util.Map ice_getContext();
-    /**
-     * @deprecated This method has been replaced with ice_context.
-     **/
-    ObjectPrx ice_newContext(java.util.Map newContext);
     ObjectPrx ice_context(java.util.Map newContext);
     /**
      * @deprecated This method has been replaced with ice_context.
@@ -65,24 +49,12 @@ public interface ObjectPrx
     ObjectPrx ice_defaultContext();
 
     String ice_getFacet(); 
-    /**
-     * @deprecated This method has been replaced with ice_facet.
-     **/
-    ObjectPrx ice_newFacet(String newFacet);
     ObjectPrx ice_facet(String newFacet);
 
     String ice_getAdapterId();
-    /**
-     * @deprecated This method has been replaced with ice_adapterId.
-     **/
-    ObjectPrx ice_newAdapterId(String newAdapterId);
     ObjectPrx ice_adapterId(String newAdapterId);
 
     Endpoint[] ice_getEndpoints();
-    /**
-     * @deprecated This method has been replaced with ice_endpoints.
-     **/
-    ObjectPrx ice_newEndpoints(Endpoint[] newEndpoints);
     ObjectPrx ice_endpoints(Endpoint[] newEndpoints);
 
     int ice_getLocatorCacheTimeout();
@@ -107,10 +79,6 @@ public interface ObjectPrx
     ObjectPrx ice_locator(Ice.LocatorPrx locator);
 
     boolean ice_isCollocationOptimized();
-    /**
-     * @deprecated This method has been replaced with ice_collocationOptimized.
-     **/
-    ObjectPrx ice_collocationOptimization(boolean b);
     ObjectPrx ice_collocationOptimized(boolean b);
 
     ObjectPrx ice_twoway();
@@ -131,10 +99,6 @@ public interface ObjectPrx
     boolean ice_isThreadPerConnection();
     ObjectPrx ice_threadPerConnection(boolean tpc);
 
-    /**
-     * @deprecated This method has been replaced with ice_getConnection.
-     **/
-    Connection ice_connection();
     Connection ice_getConnection();
     Connection ice_getCachedConnection();
 
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 4cc662d8931..2a84c5690c0 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -17,29 +17,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
         return _reference.hashCode();
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_getHash.
-     **/
-    public final int
-    ice_hash()
-    {
-        return ice_getHash();
-    }
-
     public final int
     ice_getHash()
     {
         return _reference.hashCode();
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_getCommunicator.
-     **/
-    public final Communicator ice_communicator()
-    {
-        return ice_getCommunicator();
-    }
-
     public final Communicator ice_getCommunicator()
     {
         return _reference.getCommunicator();
@@ -312,15 +295,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_identity.
-     **/
-    public final ObjectPrx
-    ice_newIdentity(Identity newIdentity)
-    {
-        return ice_identity(newIdentity);
-    }
-
     public final java.util.Map
     ice_getContext()
     {
@@ -334,15 +308,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     /**
-     * @deprecated This method has been replaced with ice_context.
-     **/
-    public final ObjectPrx
-    ice_newContext(java.util.Map newContext)
-    {
-        return ice_context(newContext);
-    }
-
-    /**
      * @deprecated
      **/
     public final ObjectPrx
@@ -377,15 +342,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_facet.
-     **/
-    public final ObjectPrx
-    ice_newFacet(String newFacet)
-    {
-        return ice_facet(newFacet);
-    }
-
     public final String
     ice_getAdapterId()
     {
@@ -410,15 +366,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_adapterId.
-     **/
-    public final ObjectPrx
-    ice_newAdapterId(String newAdapterId)
-    {
-        return ice_adapterId(newAdapterId);
-    }
-
     public final Endpoint[]
     ice_getEndpoints()
     {
@@ -440,15 +387,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_endpoints.
-     **/
-    public final ObjectPrx
-    ice_newEndpoints(Endpoint[] newEndpoints)
-    {
-        return ice_endpoints(newEndpoints);
-    }
-
     public final int
     ice_getLocatorCacheTimeout()
     {
@@ -592,15 +530,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         return _reference.getCollocationOptimized();
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_collocationOptimized.
-     **/
-    public final ObjectPrx
-    ice_collocationOptimization(boolean b)
-    {
-        return ice_collocationOptimized(b);
-    }
-
     public final ObjectPrx
     ice_collocationOptimized(boolean b)
     {
@@ -771,15 +700,6 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
-    /**
-     * @deprecated This method has been replaced with ice_collocationOptimized.
-     **/
-    public final Connection
-    ice_connection()
-    { 
-       return ice_getConnection();
-    }
-
     public final Connection
     ice_getConnection()
     {
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 690f5205e78..096f3aea71d 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -104,74 +104,6 @@ public final class Util
         return initialize(new InitializationData());
     }
 
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithLogger(StringSeqHolder args, Logger logger)
-    {
-        InitializationData initData = new InitializationData();
-        initData.logger = logger;
-        return initialize(args, initData);
-    }
-
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithLogger(String[] args, Logger logger)
-    {
-        InitializationData initData = new InitializationData();
-        initData.logger = logger;
-        return initialize(args, initData);
-    }
-
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithProperties(StringSeqHolder args, Properties properties)
-    {
-        InitializationData initData = new InitializationData();
-        initData.properties = properties;
-        return initialize(args, initData);
-    }
-
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithProperties(String[] args, Properties properties)
-    {
-        InitializationData initData = new InitializationData();
-        initData.properties = properties;
-        return initialize(args, initData);
-    }
-
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithPropertiesAndLogger(StringSeqHolder args, Properties properties, Logger logger)
-    {
-        InitializationData initData = new InitializationData();
-        initData.properties = properties;
-        initData.logger = logger;
-        return initialize(args, initData);
-    }
-
-    /**
-     * @deprecated This method has been deprecated, use initialize instead.
-     **/
-    public static Communicator
-    initializeWithPropertiesAndLogger(String[] args, Properties properties, Logger logger)
-    {
-        InitializationData initData = new InitializationData();
-        initData.properties = properties;
-        initData.logger = logger;
-        return initialize(args, initData);
-    }
-
     public static IceInternal.Instance
     getInstance(Communicator communicator)
     {