Bug 3878 - remove some deprecated features

11 files changed, 4 insertions, 221 deletions

diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 9263a1a2970..afc95d967d8 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -169,24 +169,6 @@ public final class CommunicatorI implements Communicator
         _instance.setDefaultLocator(locator);
     }
 
-    /**
-     * @deprecated
-     **/
-    public java.util.Map<String, String>
-    getDefaultContext()
-    {
-        return _instance.getDefaultContext();
-    }
-
-    /**
-     * @deprecated
-     **/
-    public void
-    setDefaultContext(java.util.Map<String, String> ctx)
-    {
-        _instance.setDefaultContext(ctx);
-    }
-
     public ImplicitContext
     getImplicitContext()
     {
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index c60bbaf1487..80bae2d73ad 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -43,10 +43,6 @@ public interface ObjectPrx
 
     java.util.Map<String, String> ice_getContext();
     ObjectPrx ice_context(java.util.Map<String, String> newContext);
-    /**
-     * @deprecated This method has been replaced with ice_context.
-     **/
-    ObjectPrx ice_defaultContext();
 
     String ice_getFacet(); 
     ObjectPrx ice_facet(String newFacet);
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 302ec582abd..1b61c737146 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -307,15 +307,6 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
         return newInstance(_reference.changeContext(newContext));
     }
 
-    /**
-     * @deprecated
-     **/
-    public final ObjectPrx
-    ice_defaultContext()
-    {
-        return newInstance(_reference.defaultContext());
-    }
-
     public final String
     ice_getFacet()
     {
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 06d5e630ad2..f91064ef8e0 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -15,13 +15,12 @@ public class FixedReference extends Reference
     FixedReference(Instance instance,
                    Ice.Communicator communicator,
                    Ice.Identity identity,
-                   java.util.Map<String, String> context,
                    String facet,
                    int mode,
                    boolean secure,
                    Ice.ConnectionI connection)
     {
-        super(instance, communicator, identity, context, facet, mode, secure);
+        super(instance, communicator, identity, facet, mode, secure);
         _fixedConnection = connection;
     }
 
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index eae10dbd6d9..59788b78067 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -268,35 +268,6 @@ public final class Instance
         return _serverACM;
     }
 
-    public synchronized void
-    setDefaultContext(java.util.Map<String, String> ctx)
-    {
-        if(_state == StateDestroyed)
-        {
-            throw new Ice.CommunicatorDestroyedException();
-        }
-
-        if(ctx == null || ctx.isEmpty())
-        {
-            _defaultContext = _emptyContext;
-        }
-        else
-        {
-            _defaultContext = new java.util.HashMap<String, String>(ctx);
-        }
-    }
-
-    public synchronized java.util.Map<String, String>
-    getDefaultContext()
-    {
-        if(_state == StateDestroyed)
-        {
-            throw new Ice.CommunicatorDestroyedException();
-        }
-
-        return new java.util.HashMap<String, String>(_defaultContext);
-    }
-
     public Ice.ImplicitContextI
     getImplicitContext()
     {
@@ -731,8 +702,6 @@ public final class Instance
 
             _pluginManager = new Ice.PluginManagerI(communicator);
            
-            _defaultContext = _emptyContext;
-          
             _outgoingConnectionFactory = new OutgoingConnectionFactory(this);
 
             _servantFactoryManager = new ObjectFactoryManager();
@@ -1133,14 +1102,11 @@ public final class Instance
     private Timer _timer;
     private EndpointFactoryManager _endpointFactoryManager;
     private Ice.PluginManager _pluginManager;
-    private java.util.Map<String, String> _defaultContext;
 
     private Ice.ObjectAdapter _adminAdapter;
     private java.util.Map<String, Ice.Object> _adminFacets = new java.util.HashMap<String, Ice.Object>();
     private java.util.Set<String> _adminFacetFilter = new java.util.HashSet<String>();
     private Ice.Identity _adminIdentity;
 
-    private static java.util.Map<String, String> _emptyContext = new java.util.HashMap<String, String>();
-
     private static boolean _oneOffDone = false;
 }
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index edc5c5a5e11..a1a4dd5dcd0 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Apr 28 13:06:23 2009
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon May 11 11:43:17 2009
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -429,7 +429,6 @@ public final class PropertyNames
     public static final Property Glacier2Props[] = 
     {
         new Property("Glacier2\\.AddSSLContext", false, null),
-        new Property("Glacier2\\.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
         new Property("Glacier2\\.Admin\\.AdapterId", true, null),
         new Property("Glacier2\\.Admin\\.Endpoints", true, null),
         new Property("Glacier2\\.Admin\\.Locator", true, null),
@@ -441,7 +440,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
         new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
         new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", true, null),
-        new Property("Glacier2\\.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
         new Property("Glacier2\\.Client\\.AdapterId", false, null),
         new Property("Glacier2\\.Client\\.Endpoints", false, null),
         new Property("Glacier2\\.Client\\.Locator", false, null),
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 037b5508cac..5b9deb89f6a 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -60,15 +60,6 @@ public abstract class Reference implements Cloneable
         return _context;
     }
 
-    public final Reference
-    defaultContext()
-    {
-        Reference r = _instance.referenceFactory().copy(this);
-        r._context = _instance.getDefaultContext();
-        return r;
-
-    }
-
     public final Ice.Communicator 
     getCommunicator()
     {
@@ -424,7 +415,6 @@ public abstract class Reference implements Cloneable
     Reference(Instance instance,
               Ice.Communicator communicator,
               Ice.Identity identity,
-              java.util.Map<String, String> context,
               String facet,
               int mode,
               boolean secure)
@@ -441,7 +431,7 @@ public abstract class Reference implements Cloneable
         _mode = mode;
         _secure = secure;
         _identity = identity;
-        _context = context == null ? _emptyContext : context;
+        _context = _emptyContext;
         _facet = facet;
         _hashInitialized = false;
         _overrideCompress = false;
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index a3e1c6ec612..4eaebed5bfc 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -47,7 +47,6 @@ public final class ReferenceFactory
         FixedReference ref = new FixedReference(_instance, 
                                                 _communicator, 
                                                 ident, 
-                                                _instance.getDefaultContext(),
                                                 "", // Facet
                                                 Reference.ModeTwoway,
                                                 false,
@@ -791,7 +790,6 @@ public final class ReferenceFactory
         return updateCache(new RoutableReference(_instance, 
                                                  _communicator,
                                                  ident,
-                                                 _instance.getDefaultContext(), 
                                                  facet,
                                                  mode,
                                                  secure,
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index c309e7d8298..654aecc41f4 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -584,7 +584,6 @@ public class RoutableReference extends Reference
     RoutableReference(Instance instance,
                       Ice.Communicator communicator,
                       Ice.Identity identity,
-                      java.util.Map<String, String> context,
                       String facet,
                       int mode,
                       boolean secure,
@@ -598,7 +597,7 @@ public class RoutableReference extends Reference
                       Ice.EndpointSelectionType endpointSelection,
                       int locatorCacheTimeout)
     {
-        super(instance, communicator, identity, context, facet, mode, secure);
+        super(instance, communicator, identity, facet, mode, secure);
         _endpoints = endpoints;
         _adapterId = adapterId;
         _locatorInfo = locatorInfo;
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index 712086d32e5..20c99f1057a 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -697,50 +697,6 @@ class Twoways
                 r = p2.opContext(ctx);
                 test(r.equals(ctx));
             }
-            {
-                //
-                // Test that default context is obtained correctly from communicator.
-                //
-/* DEPRECATED
-                java.util.HashMap dflt = new java.util.HashMap();
-                dflt.put("a", "b");
-                communicator.setDefaultContext(dflt);
-                test(!p.opContext().equals(dflt));
-
-                MyClassPrx p2 = MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
-                test(p2.opContext().isEmpty());
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-                test(p2.opContext().equals(dflt));
-
-                communicator.setDefaultContext(new java.util.HashMap());
-                test(!p2.opContext().isEmpty());
-
-                communicator.setDefaultContext(dflt);
-                MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                        communicator.stringToProxy("test:default -p 12010"));
-                test(c.opContext().equals(dflt));
-
-                dflt.put("a", "c");
-                MyClassPrx c2 = MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
-                test(c2.opContext().get("a").equals("c"));
-
-                dflt.clear();
-                MyClassPrx c3 = MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
-                test(c3.opContext().get("a") == null);
-
-                MyClassPrx c4 = MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
-                test(c4.opContext().get("a").equals("b"));
-
-                dflt.put("a", "d");
-                communicator.setDefaultContext(dflt);
-
-                MyClassPrx c5 = MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
-                test(c5.opContext().get("a").equals("d"));
-
-                communicator.setDefaultContext(new java.util.HashMap());
-*/
-            }
         }
         {
             //
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 55187ff821f..a7328294568 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1559,98 +1559,6 @@ class TwowaysAMI
                 p2.opContext_async(cb, ctx);
                 cb.check();
             }
-
-            {
-                //
-                // Test that default context is obtained correctly from communicator.
-                //
-/* DEPRECATED
-                java.util.HashMap<String, String> dflt = new java.util.HashMap<String, String>();
-                dflt.put("a", "b");
-                communicator.setDefaultContext(dflt);
-                {
-                    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(dflt);
-                    p.opContext_async(cb);
-                    cb.check();
-                }
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap<String, String>()));
-                {
-                    AMI_MyClass_opContextEqualI cb =
-                        new AMI_MyClass_opContextEqualI(new java.util.HashMap<String, String>());
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-                {
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(dflt);
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(new java.util.HashMap());
-                {
-                    AMI_MyClass_opContextNotEqualI cb =
-                        new AMI_MyClass_opContextNotEqualI(new java.util.HashMap<String, String>());
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(dflt);
-                MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                                communicator.stringToProxy("test:default -p 12010"));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "b");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.put("a", "c");
-                MyClassPrx c2 = MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "c");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c2.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.clear();
-                MyClassPrx c3 = MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c3.opContext_async(cb);
-                    cb.check();
-                }
-
-                MyClassPrx c4 = MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "b");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c4.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.put("a", "d");
-                communicator.setDefaultContext(dflt);
-
-                MyClassPrx c5 = MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "d");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c5.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(new java.util.HashMap<String, String>());
-*/
-            }
         }
 
         {