remove timeout test from proxy test. Cleanup of operations test.

60 files changed, 67 insertions, 1024 deletions

diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 15df53511d6..799560a8d5d 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -17,203 +17,10 @@ using namespace std;
 Test::MyClassPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
-    cout << "testing stringToProxy... " << flush;
     string ref = "test:default -p 12010 -t 10000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
-    test(base);
-    cout << "ok" << endl;
-
-    cout << "testing ice_getCommunicator... " << flush;
-    test(base->ice_getCommunicator() == communicator);
-    cout << "ok" << endl;
-
-    cout << "testing proxy methods... " << flush;
-    test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity())
-         == "other");
-    test(base->ice_facet("facet")->ice_getFacet() == "facet");
-    test(base->ice_adapterId("id")->ice_getAdapterId() == "id");
-    test(base->ice_twoway()->ice_isTwoway());
-    test(base->ice_oneway()->ice_isOneway());
-    test(base->ice_batchOneway()->ice_isBatchOneway());
-    test(base->ice_datagram()->ice_isDatagram());
-    test(base->ice_batchDatagram()->ice_isBatchDatagram());
-    test(base->ice_secure(true)->ice_isSecure());
-    test(!base->ice_secure(false)->ice_isSecure());
-    test(base->ice_collocationOptimized(true)->ice_isCollocationOptimized());
-    test(!base->ice_collocationOptimized(false)->ice_isCollocationOptimized());
-    cout << "ok" << endl;
-
-    cout << "testing proxy comparison... " << flush;
-
-    test(communicator->stringToProxy("foo") == communicator->stringToProxy("foo"));
-    test(communicator->stringToProxy("foo") != communicator->stringToProxy("foo2"));
-    test(communicator->stringToProxy("foo") < communicator->stringToProxy("foo2"));
-    test(!(communicator->stringToProxy("foo2") < communicator->stringToProxy("foo")));
-
-    Ice::ObjectPrx compObj = communicator->stringToProxy("foo");
-
-    test(compObj->ice_facet("facet") == compObj->ice_facet("facet"));
-    test(compObj->ice_facet("facet") != compObj->ice_facet("facet1"));
-    test(compObj->ice_facet("facet") < compObj->ice_facet("facet1"));
-    test(!(compObj->ice_facet("facet") < compObj->ice_facet("facet")));
-
-    test(compObj->ice_oneway() == compObj->ice_oneway());
-    test(compObj->ice_oneway() != compObj->ice_twoway());
-    test(compObj->ice_twoway() < compObj->ice_oneway());
-    test(!(compObj->ice_oneway() < compObj->ice_twoway()));
-
-    test(compObj->ice_secure(true) == compObj->ice_secure(true));
-    test(compObj->ice_secure(false) != compObj->ice_secure(true));
-    test(compObj->ice_secure(false) < compObj->ice_secure(true));
-    test(!(compObj->ice_secure(true) < compObj->ice_secure(false)));
-
-    test(compObj->ice_collocationOptimized(true) == compObj->ice_collocationOptimized(true));
-    test(compObj->ice_collocationOptimized(false) != compObj->ice_collocationOptimized(true));
-    test(compObj->ice_collocationOptimized(false) < compObj->ice_collocationOptimized(true));
-    test(!(compObj->ice_collocationOptimized(true) < compObj->ice_collocationOptimized(false)));
-
-    test(compObj->ice_connectionCached(true) == compObj->ice_connectionCached(true));
-    test(compObj->ice_connectionCached(false) != compObj->ice_connectionCached(true));
-    test(compObj->ice_connectionCached(false) < compObj->ice_connectionCached(true));
-    test(!(compObj->ice_connectionCached(true) < compObj->ice_connectionCached(false)));
-
-    test(compObj->ice_endpointSelection(Ice::Random) == compObj->ice_endpointSelection(Ice::Random));
-    test(compObj->ice_endpointSelection(Ice::Random) != compObj->ice_endpointSelection(Ice::Ordered));
-    test(compObj->ice_endpointSelection(Ice::Random) < compObj->ice_endpointSelection(Ice::Ordered));
-    test(!(compObj->ice_endpointSelection(Ice::Ordered) < compObj->ice_endpointSelection(Ice::Random)));
-
-    test(compObj->ice_connectionId("id2") == compObj->ice_connectionId("id2"));
-    test(compObj->ice_connectionId("id1") != compObj->ice_connectionId("id2"));
-    test(compObj->ice_connectionId("id1") < compObj->ice_connectionId("id2"));
-    test(!(compObj->ice_connectionId("id2") < compObj->ice_connectionId("id1")));
-
-    test(compObj->ice_compress(true) == compObj->ice_compress(true));
-    test(compObj->ice_compress(false) != compObj->ice_compress(true));
-    test(compObj->ice_compress(false) < compObj->ice_compress(true));
-    test(!(compObj->ice_compress(true) < compObj->ice_compress(false)));
-
-    test(compObj->ice_timeout(20) == compObj->ice_timeout(20));
-    test(compObj->ice_timeout(10) != compObj->ice_timeout(20));
-    test(compObj->ice_timeout(10) < compObj->ice_timeout(20));
-    test(!(compObj->ice_timeout(20) < compObj->ice_timeout(10)));
-
-    Ice::ObjectPrx compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
-    Ice::ObjectPrx compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
-    test(compObj1 != compObj2);
-    test(compObj1 < compObj2);
-    test(!(compObj2 < compObj1));
-
-    compObj1 = communicator->stringToProxy("foo@MyAdapter1");
-    compObj2 = communicator->stringToProxy("foo@MyAdapter2");
-    test(compObj1 != compObj2);
-    test(compObj1 < compObj2);
-    test(!(compObj2 < compObj1));
-
-    test(compObj1->ice_locatorCacheTimeout(20) == compObj1->ice_locatorCacheTimeout(20));
-    test(compObj1->ice_locatorCacheTimeout(10) != compObj1->ice_locatorCacheTimeout(20));
-    test(compObj1->ice_locatorCacheTimeout(10) < compObj1->ice_locatorCacheTimeout(20));
-    test(!(compObj1->ice_locatorCacheTimeout(20) < compObj1->ice_locatorCacheTimeout(10)));
-
-    compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
-    compObj2 = communicator->stringToProxy("foo@MyAdapter1");
-    test(compObj1 != compObj2);
-    test(compObj1 < compObj2);
-    test(!(compObj2 < compObj1));
-
-    //
-    // TODO: Ideally we should also test comparison of fixed proxies.
-    //
-
-    cout << "ok" << endl;
-
-    cout << "testing checked cast... " << flush;
     Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base);
-    test(cl);
-    
     Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl);
-    test(derived);
-    test(cl == base);
-    test(derived == base);
-    test(cl == derived);
-    
-    Ice::LocatorPrx loc = Ice::LocatorPrx::checkedCast(base);
-    test(loc == 0);
-
-    //
-    // Upcasting
-    //
-    Test::MyClassPrx cl2 = Test::MyClassPrx::checkedCast(derived);
-    Ice::ObjectPrx obj = Ice::ObjectPrx::checkedCast(derived);
-    test(cl2);
-    test(obj);
-    test(cl2 == obj);
-    test(cl2 == derived);
-
-    //
-    // Now with alternate API
-    //
-    cl = checkedCast<Test::MyClassPrx>(base);
-    test(cl);
-    derived = checkedCast<Test::MyDerivedClassPrx>(cl);
-    test(derived);
-    test(cl == base);
-    test(derived == base);
-    test(cl == derived);
-    
-    loc = checkedCast<Ice::LocatorPrx>(base);
-    test(loc == 0);
-
-    cl2 = checkedCast<Test::MyClassPrx>(derived);
-    obj = checkedCast<Ice::ObjectPrx>(derived);
-    test(cl2);
-    test(obj);
-    test(cl2 == obj);
-    test(cl2 == derived);
-
-    cout << "ok" << endl;
-
-    cout << "testing checked cast with context... " << flush;
-    string cref = "context:default -p 12010 -t 10000";
-    Ice::ObjectPrx cbase = communicator->stringToProxy(cref);
-    test(cbase);
-
-    Test::TestCheckedCastPrx tccp = Test::TestCheckedCastPrx::checkedCast(cbase);
-    Ice::Context c = tccp->getContext();
-    test(c.size() == 0);
-
-    c["one"] = "hello";
-    c["two"] = "world";
-    tccp = Test::TestCheckedCastPrx::checkedCast(cbase, c);
-    Ice::Context c2 = tccp->getContext();
-    test(c == c2);
-
-    //
-    // Now with alternate API
-    //
-    tccp = checkedCast<Test::TestCheckedCastPrx>(cbase);
-    c = tccp->getContext();
-    test(c.size() == 0);
-
-    tccp = checkedCast<Test::TestCheckedCastPrx>(cbase, c);
-    c2 = tccp->getContext();
-    test(c == c2);
-
-    cout << "ok" << endl;
-
-    if(!collocated)
-    {
-        cout << "testing timeout... " << flush;
-        Test::MyClassPrx clTimeout = Test::MyClassPrx::uncheckedCast(cl->ice_timeout(500));
-        try
-        {
-            clTimeout->opSleep(2000);
-            test(false);
-        }
-        catch(const Ice::TimeoutException&)
-        {
-        }
-        cout << "ok" << endl;
-    }
 
     cout << "testing twoway operations... " << flush;
     void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index d0394e5cd51..f5242c3dee4 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -23,7 +23,6 @@ batchOneways(const Test::MyClassPrx& p)
     try
     {
         p->opByteSOneway(bs1);
-        test(true);
     }
     catch(const Ice::MemoryLimitException&)
     {
@@ -33,7 +32,6 @@ batchOneways(const Test::MyClassPrx& p)
     try
     {
         p->opByteSOneway(bs2);
-        test(true);
     }
     catch(const Ice::MemoryLimitException&)
     {
@@ -47,7 +45,6 @@ batchOneways(const Test::MyClassPrx& p)
     }
     catch(const Ice::MemoryLimitException&)
     {
-        test(true);
     }
     
     Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway());
@@ -59,7 +56,6 @@ batchOneways(const Test::MyClassPrx& p)
         try
         {
             batch->opByteSOneway(bs1);
-            test(true);
         }
         catch(const Ice::MemoryLimitException&)
         {
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index b421a629cf5..2c4479a373e 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -60,11 +60,6 @@ main(int argc, char* argv[])
         //
         initData.properties->setProperty("Ice.MessageSizeMax", "100");
 
-        //
-        // We don't want connection warnings because of the timeout test.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
         communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator, initData);
     }
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 1a6af6b7876..f27d5051d8c 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -18,9 +18,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::Identity id = communicator->stringToIdentity("test");
-    adapter->add(new MyDerivedClassI(adapter, id), id);
-    adapter->add(new TestCheckedCastI, communicator->stringToIdentity("context"));
+    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
 
     Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index f78fda34785..d99c8aafb5b 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -17,9 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::Identity id = communicator->stringToIdentity("test");
-    adapter->add(new MyDerivedClassI(adapter, id), id);
-    adapter->add(new TestCheckedCastI, communicator->stringToIdentity("context"));
+    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
 
     communicator->waitForShutdown();
@@ -36,7 +34,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
 
         communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator);
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 9f28e51268a..12145e8c37f 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -34,7 +34,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
+        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
         communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator);
 
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index 043060a5d93..34850a8733a 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -72,8 +72,6 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     void opVoid();
 
-    void opSleep(int duration);
-
     byte opByte(byte p1, byte p2,
                 out byte p3);
 
@@ -159,11 +157,6 @@ dictionary<string, MyEnum> StringMyEnumD;
     void opDerived();
 };
 
-interface TestCheckedCast
-{
-    Ice::Context getContext();
-};
-
 };
 
 #endif
diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice
index 9bdc8c6fe3b..5634afdf823 100644
--- a/cpp/test/Ice/operations/TestAMD.ice
+++ b/cpp/test/Ice/operations/TestAMD.ice
@@ -72,8 +72,6 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     void opVoid();
     
-    void opSleep(int duration);
-    
     byte opByte(byte p1, byte p2,
                 out byte p3);
 
@@ -159,11 +157,6 @@ dictionary<string, MyEnum> StringMyEnumD;
     void opDerived();
 };
 
-["ami", "amd"] interface TestCheckedCast
-{
-    Ice::Context getContext();
-};
-
 };
 
 #endif
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 028993f910a..0227c30075f 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -31,17 +31,11 @@ public:
 
 private:
 
-    Test::AMD_MyClass_opVoidPtr _cb;
+    const Test::AMD_MyClass_opVoidPtr _cb;
 };
 
-MyDerivedClassI::MyDerivedClassI(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity) :
-    _adapter(adapter),
-    _identity(identity)
-{
-}
-
 void
-MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current&)
+MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current& current)
 {
     if(_opVoidThread)
     {
@@ -49,7 +43,7 @@ MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const I
         _opVoidThread = 0;
     }
 
-    _adapter->getCommunicator()->shutdown();
+    current.adapter->getCommunicator()->shutdown();
     cb->ice_response();
 }
 
@@ -67,15 +61,6 @@ MyDerivedClassI::opVoid_async(const Test::AMD_MyClass_opVoidPtr& cb, const Ice::
 }
 
 void
-MyDerivedClassI::opSleep_async(const Test::AMD_MyClass_opSleepPtr& cb, 
-                               int duration, 
-                               const Ice::Current&)
-{
-    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(duration));
-    cb->ice_response();
-}
-
-void
 MyDerivedClassI::opByte_async(const Test::AMD_MyClass_opBytePtr& cb,
                               Ice::Byte p1,
                               Ice::Byte p2,
@@ -132,12 +117,12 @@ MyDerivedClassI::opMyEnum_async(const Test::AMD_MyClass_opMyEnumPtr& cb,
 void
 MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb,
                                  const Test::MyClassPrx& p1,
-                                 const Ice::Current&)
+                                 const Ice::Current& current)
 {
     Test::MyClassPrx p2 = p1;
-    Test::MyClassPrx p3 = Test::MyClassPrx::uncheckedCast(_adapter->createProxy(
-                                        _adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
-    cb->ice_response(Test::MyClassPrx::uncheckedCast(_adapter->createProxy(_identity)), p2, p3);
+    Test::MyClassPrx p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(
+                                        current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
+    cb->ice_response(Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id)), p2, p3);
 }
 
 void
@@ -411,20 +396,3 @@ MyDerivedClassI::opDerived_async(const Test::AMD_MyDerivedClass_opDerivedPtr& cb
 {
     cb->ice_response();
 }
-
-void
-TestCheckedCastI::getContext_async(const Test::AMD_TestCheckedCast_getContextPtr& cb, const Ice::Current&)
-{
-    cb->ice_response(_ctx);
-}
-
-bool
-TestCheckedCastI::ice_isA(const std::string& s, const Ice::Current& current) const
-{
-    _ctx = current.ctx;
-#ifdef __BCPLUSPLUS__
-    return Test::TestCheckedCast::ice_isA(s, current);
-#else
-    return TestCheckedCast::ice_isA(s, current);
-#endif
-}
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 87098048a1e..7931398b7e8 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.h
@@ -17,18 +17,12 @@ class MyDerivedClassI : public Test::MyDerivedClass
 {
 public:
 
-    MyDerivedClassI(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
-    
     virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&,
                                 const Ice::Current&);
 
     virtual void opVoid_async(const Test::AMD_MyClass_opVoidPtr&,
                               const Ice::Current&);
 
-    virtual void opSleep_async(const Test::AMD_MyClass_opSleepPtr&,
-                               int,
-                               const Ice::Current&);
-
     virtual void opByte_async(const Test::AMD_MyClass_opBytePtr&,
                               Ice::Byte, Ice::Byte,
                               const Ice::Current&);
@@ -140,22 +134,7 @@ public:
     
 private:
 
-    Ice::ObjectAdapterPtr _adapter;
-    Ice::Identity _identity;
     IceUtil::ThreadPtr _opVoidThread;
 };
 
-class TestCheckedCastI : public Test::TestCheckedCast
-{
-public:
-
-    virtual void getContext_async(const Test::AMD_TestCheckedCast_getContextPtr& cb,
-                                                    const Ice::Current&);
-    virtual bool ice_isA(const std::string&, const Ice::Current&) const;
-
-private:
-
-    mutable Ice::Context _ctx;
-};
-
 #endif
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index e6415f93a87..9830ce1931c 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -16,16 +16,10 @@
 #  include <iterator>
 #endif
 
-MyDerivedClassI::MyDerivedClassI(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity) :
-    _adapter(adapter),
-    _identity(identity)
-{
-}
-
 void
-MyDerivedClassI::shutdown(const Ice::Current&)
+MyDerivedClassI::shutdown(const Ice::Current& current)
 {
-    _adapter->getCommunicator()->shutdown();
+    current.adapter->getCommunicator()->shutdown();
 }
 
 void
@@ -33,12 +27,6 @@ MyDerivedClassI::opVoid(const Ice::Current&)
 {
 }
 
-void
-MyDerivedClassI::opSleep(int duration, const Ice::Current&)
-{
-    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(duration));
-}
-
 Ice::Byte
 MyDerivedClassI::opByte(Ice::Byte p1,
                         Ice::Byte p2,
@@ -109,12 +97,12 @@ Test::MyClassPrx
 MyDerivedClassI::opMyClass(const Test::MyClassPrx& p1,
                            Test::MyClassPrx& p2,
                            Test::MyClassPrx& p3,
-                           const Ice::Current&)
+                           const Ice::Current& current)
 {
     p2 = p1;
-    p3 = Test::MyClassPrx::uncheckedCast(_adapter->createProxy(
-                                _adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
-    return Test::MyClassPrx::uncheckedCast(_adapter->createProxy(_identity));
+    p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(
+                                current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
+    return Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id));
 }
 
 Test::Structure
@@ -382,20 +370,3 @@ void
 MyDerivedClassI::opDerived(const Ice::Current&)
 {
 }
-
-Ice::Context
-TestCheckedCastI::getContext(const Ice::Current& c)
-{
-    return _ctx;
-}
-
-bool
-TestCheckedCastI::ice_isA(const std::string& s, const Ice::Current& current) const
-{
-    _ctx = current.ctx;
-#ifdef __BCPLUSPLUS__
-    return Test::TestCheckedCast::ice_isA(s, current);
-#else
-    return TestCheckedCast::ice_isA(s, current);
-#endif
-}
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index d5f8be15477..1b3ecdf8678 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -16,14 +16,10 @@ class MyDerivedClassI : public Test::MyDerivedClass
 {
 public:
 
-    MyDerivedClassI(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
-
     virtual void shutdown(const Ice::Current&);
 
     virtual void opVoid(const Ice::Current&);
 
-    virtual void opSleep(int, const Ice::Current&);
-
     virtual Ice::Byte opByte(Ice::Byte,
                              Ice::Byte,
                              Ice::Byte&,
@@ -157,23 +153,6 @@ public:
     virtual void opDoubleMarshaling(Ice::Double, const Test::DoubleS&, const Ice::Current&);
 
     virtual void opDerived(const Ice::Current&);
-
-private:
-
-    Ice::ObjectAdapterPtr _adapter;
-    Ice::Identity _identity;
-};
-
-class TestCheckedCastI : public Test::TestCheckedCast
-{
-public:
-
-    virtual Ice::Context getContext(const Ice::Current&);
-    virtual bool ice_isA(const std::string&, const Ice::Current&) const;
-
-private:
-
-    mutable Ice::Context _ctx;
 };
 
 #endif
diff --git a/cpp/test/Ice/proxy/.depend b/cpp/test/Ice/proxy/.depend
index 3706ff8aa51..26839c4f56b 100644
--- a/cpp/test/Ice/proxy/.depend
+++ b/cpp/test/Ice/proxy/.depend
@@ -2,13 +2,13 @@ Test$(OBJEXT): Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../incl
 Client$(OBJEXT): Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h ../../include/TestCommon.h Test.h
 AllTests$(OBJEXT): AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h ../../../include/Ice/Router.h ../../include/TestCommon.h Test.h
 Test$(OBJEXT): Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/StreamF.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/Ice/StringConverter.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/IceUtil/Iterator.h ../../../include/IceUtil/ScopedArray.h
-TestI$(OBJEXT): TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Algorithm.h ../../../include/IceUtil/ArgVector.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/Cache.h ../../../include/IceUtil/CountDownLatch.h ../../../include/IceUtil/CtrlCHandler.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/Iterator.h ../../../include/IceUtil/MD5.h ../../../include/IceUtil/Options.h ../../../include/IceUtil/OutputUtil.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Random.h ../../../include/IceUtil/ScopedArray.h ../../../include/IceUtil/StringUtil.h ../../../include/IceUtil/UUID.h TestI.h Test.h ../../include/TestCommon.h
+TestI$(OBJEXT): TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestI.h Test.h ../../include/TestCommon.h
 Server$(OBJEXT): Server.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestI.h Test.h
 TestAMD$(OBJEXT): TestAMD.cpp TestAMD.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/StreamF.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/Ice/StringConverter.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/IceUtil/Iterator.h ../../../include/IceUtil/ScopedArray.h
-TestAMDI$(OBJEXT): TestAMDI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestAMDI.h ../../../include/IceUtil/Thread.h TestAMD.h ../../include/TestCommon.h
-ServerAMD$(OBJEXT): ServerAMD.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestAMDI.h ../../../include/IceUtil/Thread.h TestAMD.h
+TestAMDI$(OBJEXT): TestAMDI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestAMDI.h TestAMD.h ../../include/TestCommon.h
+ServerAMD$(OBJEXT): ServerAMD.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestAMDI.h TestAMD.h
 Test$(OBJEXT): Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/StreamF.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/Ice/StringConverter.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/IceUtil/Iterator.h ../../../include/IceUtil/ScopedArray.h
-TestI$(OBJEXT): TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Algorithm.h ../../../include/IceUtil/ArgVector.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/Cache.h ../../../include/IceUtil/CountDownLatch.h ../../../include/IceUtil/CtrlCHandler.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/Iterator.h ../../../include/IceUtil/MD5.h ../../../include/IceUtil/Options.h ../../../include/IceUtil/OutputUtil.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Random.h ../../../include/IceUtil/ScopedArray.h ../../../include/IceUtil/StringUtil.h ../../../include/IceUtil/UUID.h TestI.h Test.h ../../include/TestCommon.h
+TestI$(OBJEXT): TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestI.h Test.h ../../include/TestCommon.h
 Collocated$(OBJEXT): Collocated.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h TestI.h Test.h
 AllTests$(OBJEXT): AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ObjectF.h ../../../include/Ice/GCCountMap.h ../../../include/Ice/GCShared.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/UndefSysMacros.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/LoggerF.h ../../../include/Ice/StreamF.h ../../../include/Ice/StatsF.h ../../../include/Ice/StringConverter.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionIF.h ../../../include/Ice/EndpointIF.h ../../../include/Ice/Endpoint.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/Identity.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ImplicitContextF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/Buffer.h ../../../include/Ice/Protocol.h ../../../include/IceUtil/Unicode.h ../../../include/Ice/OutgoingAsync.h ../../../include/IceUtil/RecMutex.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactoryF.h ../../../include/Ice/FacetMap.h ../../../include/Ice/Locator.h ../../../include/Ice/ProcessF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Process.h ../../../include/Ice/Application.h ../../../include/Ice/Connection.h ../../../include/Ice/Functional.h ../../../include/IceUtil/Functional.h ../../../include/Ice/Stream.h ../../../include/Ice/ImplicitContext.h ../../../include/Ice/Router.h ../../include/TestCommon.h Test.h
 Test.cpp: Test.ice ../../../slice/Ice/Current.ice ../../../slice/Ice/ObjectAdapterF.ice ../../../slice/Ice/ConnectionF.ice ../../../slice/Ice/Identity.ice
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 484258ae6b2..dfc1bf022fe 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -16,7 +16,7 @@
 using namespace std;
 
 Test::MyClassPrx
-allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
+allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = "test:default -p 12010 -t 10000";
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index 854d01df137..5edff282efd 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -18,8 +18,8 @@ run(int argc, char* argv[],
     const Ice::CommunicatorPtr& communicator,
     const Ice::InitializationData& initData)
 {
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
-    Test::MyClassPrx myClass = allTests(communicator, false);
+    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
+    Test::MyClassPrx myClass = allTests(communicator);
 
     myClass->shutdown();
 
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index f27d5051d8c..886b173e4c9 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -21,8 +21,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
 
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
-    allTests(communicator, true);
+    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
+    allTests(communicator);
 
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/proxy/Test.ice b/cpp/test/Ice/proxy/Test.ice
index e10a511f151..ee3b6bdb724 100644
--- a/cpp/test/Ice/proxy/Test.ice
+++ b/cpp/test/Ice/proxy/Test.ice
@@ -19,7 +19,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
     Ice::Context getContext();
 };
 
diff --git a/cpp/test/Ice/proxy/TestAMD.ice b/cpp/test/Ice/proxy/TestAMD.ice
index f67d0685d8e..18c243b3d65 100644
--- a/cpp/test/Ice/proxy/TestAMD.ice
+++ b/cpp/test/Ice/proxy/TestAMD.ice
@@ -19,7 +19,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
     Ice::Context getContext();
 };
 
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index bcec57f5c14..b70d01bce65 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -10,10 +10,6 @@
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
 #include <TestCommon.h>
-#include <functional>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
 
 MyDerivedClassI::MyDerivedClassI()
 {
@@ -27,15 +23,6 @@ MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const I
 }
 
 void
-MyDerivedClassI::opSleep_async(const Test::AMD_MyClass_opSleepPtr& cb, 
-                               int duration, 
-                               const Ice::Current&)
-{
-    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(duration));
-    cb->ice_response();
-}
-
-void
 MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, const Ice::Current&)
 {
     cb->ice_response(_ctx);
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index e0e9b7f5acb..04780eb4b4d 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -10,7 +10,6 @@
 #ifndef TEST_AMD_I_H
 #define TEST_AMD_I_H
 
-#include <IceUtil/Thread.h>
 #include <TestAMD.h>
 
 class MyDerivedClassI : public Test::MyDerivedClass
@@ -22,10 +21,6 @@ public:
     virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&,
                                 const Ice::Current&);
 
-    virtual void opSleep_async(const Test::AMD_MyClass_opSleepPtr&,
-                               int,
-                               const Ice::Current&);
-
     virtual void getContext_async(const Test::AMD_MyClass_getContextPtr& cb,
                                   const Ice::Current&);
     virtual bool ice_isA(const std::string&, const Ice::Current&) const;
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index f3618acd34a..8be4c334520 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -8,13 +8,8 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceUtil/IceUtil.h>
 #include <TestI.h>
 #include <TestCommon.h>
-#include <functional>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
 
 MyDerivedClassI::MyDerivedClassI()
 {
@@ -26,12 +21,6 @@ MyDerivedClassI::shutdown(const Ice::Current& c)
     c.adapter->getCommunicator()->shutdown();
 }
 
-void
-MyDerivedClassI::opSleep(int duration, const Ice::Current&)
-{
-    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(duration));
-}
-
 Ice::Context
 MyDerivedClassI::getContext(const Ice::Current& c)
 {
diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h
index 81420fbf40b..a558e5b6823 100644
--- a/cpp/test/Ice/proxy/TestI.h
+++ b/cpp/test/Ice/proxy/TestI.h
@@ -19,7 +19,6 @@ public:
     MyDerivedClassI();
 
     virtual void shutdown(const Ice::Current&);
-    virtual void opSleep(int, const Ice::Current&);
     virtual Ice::Context getContext(const Ice::Current&);
     virtual bool ice_isA(const std::string&, const Ice::Current&) const;
 
diff --git a/cs/test/Ice/operations/AllTests.cs b/cs/test/Ice/operations/AllTests.cs
index f1358cee926..e1d4ac23358 100755
--- a/cs/test/Ice/operations/AllTests.cs
+++ b/cs/test/Ice/operations/AllTests.cs
@@ -11,144 +11,13 @@ using System;
 
 public class AllTests
 {
-    private static void test(bool b)
-    {
-        if (!b)
-        {
-            throw new Exception();
-        }
-    }
-    
     public static Test.MyClassPrx allTests(Ice.Communicator communicator, bool collocated)
     {
-        Console.Out.Write("testing stringToProxy... ");
         Console.Out.Flush();
         string rf = "test:default -p 12010 -t 10000";
         Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        test(baseProxy != null);
-        Console.Out.WriteLine("ok");
-        Console.Out.Write("testing ice_getCommunicator... ");
-        Console.Out.Flush();
-        test(baseProxy.ice_getCommunicator() == communicator);
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing proxy methods... ");
-        test(communicator.identityToString(
-                 baseProxy.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).Equals("other"));
-        test(baseProxy.ice_facet("facet").ice_getFacet().Equals("facet"));
-        test(baseProxy.ice_adapterId("id").ice_getAdapterId().Equals("id"));
-        test(baseProxy.ice_twoway().ice_isTwoway());
-        test(baseProxy.ice_oneway().ice_isOneway());
-        test(baseProxy.ice_batchOneway().ice_isBatchOneway());
-        test(baseProxy.ice_datagram().ice_isDatagram());
-        test(baseProxy.ice_batchDatagram().ice_isBatchDatagram());
-        test(baseProxy.ice_secure(true).ice_isSecure());
-        test(!baseProxy.ice_secure(false).ice_isSecure());
-        test(baseProxy.ice_collocationOptimized(true).ice_isCollocationOptimized());
-        test(!baseProxy.ice_collocationOptimized(false).ice_isCollocationOptimized());
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing proxy comparison... ");
-        Console.Out.Flush();
-
-        test(communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo")));
-        test(!communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo2")));
-
-        Ice.ObjectPrx compObj = communicator.stringToProxy("foo");
-
-        test(compObj.ice_facet("facet").Equals(compObj.ice_facet("facet")));
-        test(!compObj.ice_facet("facet").Equals(compObj.ice_facet("facet1")));
-
-        test(compObj.ice_oneway().Equals(compObj.ice_oneway()));
-        test(!compObj.ice_oneway().Equals(compObj.ice_twoway()));
-
-        test(compObj.ice_secure(true).Equals(compObj.ice_secure(true)));
-        test(!compObj.ice_secure(false).Equals(compObj.ice_secure(true)));
-
-        test(compObj.ice_collocationOptimized(true).Equals(compObj.ice_collocationOptimized(true)));
-        test(!compObj.ice_collocationOptimized(false).Equals(compObj.ice_collocationOptimized(true)));
-
-        test(compObj.ice_connectionCached(true).Equals(compObj.ice_connectionCached(true)));
-        test(!compObj.ice_connectionCached(false).Equals(compObj.ice_connectionCached(true)));
-
-        test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
-        test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
-
-        test(compObj.ice_connectionId("id2").Equals(compObj.ice_connectionId("id2")));
-        test(!compObj.ice_connectionId("id1").Equals(compObj.ice_connectionId("id2")));
-
-        test(compObj.ice_compress(true).Equals(compObj.ice_compress(true)));
-        test(!compObj.ice_compress(false).Equals(compObj.ice_compress(true)));
-
-        test(compObj.ice_timeout(20).Equals(compObj.ice_timeout(20)));
-        test(!compObj.ice_timeout(10).Equals(compObj.ice_timeout(20)));
-
-        Ice.ObjectPrx compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
-        Ice.ObjectPrx compObj2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
-        test(!compObj1.Equals(compObj2));
-
-        compObj1 = communicator.stringToProxy("foo@MyAdapter1");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter2");
-        test(!compObj1.Equals(compObj2));
-
-        test(compObj1.ice_locatorCacheTimeout(20).Equals(compObj1.ice_locatorCacheTimeout(20)));
-        test(!compObj1.ice_locatorCacheTimeout(10).Equals(compObj1.ice_locatorCacheTimeout(20)));
-
-        compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter1");
-        test(!compObj1.Equals(compObj2));
-
-        //
-        // TODO: Ideally we should also test comparison of fixed proxies.
-        //
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing checked cast... ");
-        Console.Out.Flush();
         Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
-        test(cl != null);
         Test.MyDerivedClassPrx derivedProxy = Test.MyDerivedClassPrxHelper.checkedCast(cl);
-        test(derivedProxy != null);
-        test(cl.Equals(baseProxy));
-        test(derivedProxy.Equals(baseProxy));
-        test(cl.Equals(derivedProxy));
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing checked cast with context... ");
-        Console.Out.Flush();
-        string cref = "context:default -p 12010 -t 10000";
-        Ice.ObjectPrx cbase = communicator.stringToProxy(cref);
-        test(cbase != null);
-
-        Test.TestCheckedCastPrx tccp = Test.TestCheckedCastPrxHelper.checkedCast(cbase);
-        Ice.Context c = tccp.getContext();
-        test(c == null || c.Count == 0);
-
-        c = new Ice.Context();
-        c["one"] = "hello";
-        c["two"] = "world";
-        tccp = Test.TestCheckedCastPrxHelper.checkedCast(cbase, c);
-        Ice.Context c2 = tccp.getContext();
-        test(c.Equals(c2));
-        Console.Out.WriteLine("ok");
-
-        if(!collocated)
-        {
-            Console.Out.Write("testing timeout... ");
-            Console.Out.Flush();
-            try
-            {
-                Test.MyClassPrx clTimeout = Test.MyClassPrxHelper.uncheckedCast(cl.ice_timeout(500));
-                clTimeout.opSleep(1000);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-            }
-            Console.Out.WriteLine("ok");
-        }
         
         Console.Out.Write("testing twoway operations... ");
         Console.Out.Flush();
diff --git a/cs/test/Ice/operations/Client.cs b/cs/test/Ice/operations/Client.cs
index e4d323a33e3..195f009ad52 100755
--- a/cs/test/Ice/operations/Client.cs
+++ b/cs/test/Ice/operations/Client.cs
@@ -50,11 +50,6 @@ public class Client
             //
             initData.properties.setProperty("Ice.MessageSizeMax", "100");
 
-            //
-            // We don't want connection warnings because of the timeout test.
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-
             communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
diff --git a/cs/test/Ice/operations/Collocated.cs b/cs/test/Ice/operations/Collocated.cs
index 4c53de6652e..fc1915e7e3f 100755
--- a/cs/test/Ice/operations/Collocated.cs
+++ b/cs/test/Ice/operations/Collocated.cs
@@ -13,11 +13,9 @@ public class Collocated
 {
     private static int run(String[] args, Ice.Communicator communicator)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 5000");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = communicator.stringToIdentity("test");
-        adapter.add(new MyDerivedClassI(adapter, id), id);
-        adapter.add(new TestCheckedCastI(), communicator.stringToIdentity("context"));
+        adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
 
         AllTests.allTests(communicator, true);
diff --git a/cs/test/Ice/operations/Makefile b/cs/test/Ice/operations/Makefile
index 26f2f2a2081..34501e55d60 100644
--- a/cs/test/Ice/operations/Makefile
+++ b/cs/test/Ice/operations/Makefile
@@ -12,10 +12,9 @@ top_srcdir	= ../../..
 TARGETS		= client.exe server.exe collocated.exe serveramd.exe
 
 C_SRCS		= AllTests.cs Client.cs Twoways.cs TwowaysAMI.cs BatchOneways.cs
-S_SRCS		= MyDerivedClassI.cs Server.cs TestCheckedCastI.cs
-COL_SRCS	= AllTests.cs Collocated.cs MyDerivedClassI.cs TestCheckedCastI.cs \
-		  Twoways.cs TwowaysAMI.cs BatchOneways.cs
-SAMD_SRCS	= MyDerivedClassAMDI.cs Server.cs TestCheckedCastAMDI.cs
+S_SRCS		= MyDerivedClassI.cs Server.cs
+COL_SRCS	= AllTests.cs Collocated.cs MyDerivedClassI.cs Twoways.cs TwowaysAMI.cs BatchOneways.cs
+SAMD_SRCS	= MyDerivedClassAMDI.cs Server.cs
 
 SLICE_SRCS	= $(SDIR)/Test.ice
 SLICE_AMD_SRCS	= $(SDIR)/TestAMD.ice
diff --git a/cs/test/Ice/operations/Makefile.mak b/cs/test/Ice/operations/Makefile.mak
index d7322f51f2a..de063129f65 100644
--- a/cs/test/Ice/operations/Makefile.mak
+++ b/cs/test/Ice/operations/Makefile.mak
@@ -12,10 +12,9 @@ top_srcdir	= ..\..\..
 TARGETS		= client.exe server.exe collocated.exe serveramd.exe
 
 C_SRCS		= AllTests.cs Client.cs Twoways.cs TwowaysAMI.cs BatchOneways.cs
-S_SRCS		= MyDerivedClassI.cs Server.cs TestCheckedCastI.cs
-COL_SRCS	= AllTests.cs Collocated.cs MyDerivedClassI.cs TestCheckedCastI.cs \
-		  Twoways.cs TwowaysAMI.cs BatchOneways.cs
-SAMD_SRCS	= MyDerivedClassAMDI.cs Server.cs TestCheckedCastAMDI.cs
+S_SRCS		= MyDerivedClassI.cs Server.cs
+COL_SRCS	= AllTests.cs Collocated.cs MyDerivedClassI.cs Twoways.cs TwowaysAMI.cs BatchOneways.cs
+SAMD_SRCS	= MyDerivedClassAMDI.cs Server.cs
 
 GEN_SRCS	= $(GDIR)\Test.cs
 GEN_AMD_SRCS	= $(GDIR)\TestAMD.cs
diff --git a/cs/test/Ice/operations/MyDerivedClassAMDI.cs b/cs/test/Ice/operations/MyDerivedClassAMDI.cs
index 50680b35633..80d1f5688b5 100755
--- a/cs/test/Ice/operations/MyDerivedClassAMDI.cs
+++ b/cs/test/Ice/operations/MyDerivedClassAMDI.cs
@@ -53,12 +53,6 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
         private Thread _thread;
     }
     
-    public MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-    
     public override void shutdown_async(Test.AMD_MyClass_shutdown cb, Ice.Current current)
     {
         while(_opVoidThread != null)
@@ -67,7 +61,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
             _opVoidThread = null;
         }
         
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
     
@@ -214,9 +208,9 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
     public override void opMyClass_async(Test.AMD_MyClass_opMyClass cb, Test.MyClassPrx p1, Ice.Current current)
     {
         Test.MyClassPrx p2 = p1;
-        Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(
-                                                _adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity)), p2, p3);
+        Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3);
     }
     
     public override void opMyEnum_async(Test.AMD_MyClass_opMyEnum cb, Test.MyEnum p1, Ice.Current current)
@@ -377,7 +371,5 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
         cb.ice_response();
     }
     
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
     private Thread_opVoid _opVoidThread;
 }
diff --git a/cs/test/Ice/operations/MyDerivedClassI.cs b/cs/test/Ice/operations/MyDerivedClassI.cs
index 115727d07cd..dbeedf75298 100755
--- a/cs/test/Ice/operations/MyDerivedClassI.cs
+++ b/cs/test/Ice/operations/MyDerivedClassI.cs
@@ -19,26 +19,15 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
         }
     }
 
-    public MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-    
     public override void shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
     
     public override void opVoid(Ice.Current current)
     {
     }
     
-    public override void opSleep(int duration, Ice.Current current)
-    {
-        System.Threading.Thread.Sleep(duration);
-    }
-
     public override bool opBool(bool p1, bool p2, out bool p3, Ice.Current current)
     {
         p3 = p1;
@@ -170,9 +159,9 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
                                               Ice.Current current)
     {
         p2 = p1;
-        p3 = Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(
-                                                _adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity));
+        p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
     }
     
     public override Test.MyEnum opMyEnum(Test.MyEnum p1, out Test.MyEnum p2, Ice.Current current)
@@ -342,7 +331,4 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
     public override void opDerived(Ice.Current current)
     {
     }
-    
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
 }
diff --git a/cs/test/Ice/operations/Server.cs b/cs/test/Ice/operations/Server.cs
index 91f74d8df58..848c0a3cb90 100755
--- a/cs/test/Ice/operations/Server.cs
+++ b/cs/test/Ice/operations/Server.cs
@@ -18,11 +18,9 @@ public class Server
         //
         communicator.getProperties().setProperty("Ice.Warn.Connections", "0");
         
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 5000:udp");
+        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = communicator.stringToIdentity("test");
-        adapter.add(new MyDerivedClassI(adapter, id), id);
-        adapter.add(new TestCheckedCastI(), communicator.stringToIdentity("context"));
+        adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
 
         communicator.waitForShutdown();
@@ -36,7 +34,10 @@ public class Server
         
         try
         {
-            communicator = Ice.Util.initialize(ref args);
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = Ice.Util.createProperties(ref args);
+            initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+            communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/cs/test/Ice/operations/Test.ice b/cs/test/Ice/operations/Test.ice
index 3a9939957a3..559d70f53ee 100644
--- a/cs/test/Ice/operations/Test.ice
+++ b/cs/test/Ice/operations/Test.ice
@@ -72,8 +72,6 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     void opVoid();
 
-    void opSleep(int duration);
-    
     byte opByte(byte p1, byte p2,
                 out byte p3);
 
@@ -159,11 +157,6 @@ dictionary<string, MyEnum> StringMyEnumD;
     void opDerived();
 };
 
-interface TestCheckedCast
-{
-    Ice::Context getContext();
-};
-
 };
 
 #endif
diff --git a/cs/test/Ice/operations/TestCheckedCastAMDI.cs b/cs/test/Ice/operations/TestCheckedCastAMDI.cs
deleted file mode 100644
index 168d7d18a91..00000000000
--- a/cs/test/Ice/operations/TestCheckedCastAMDI.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public sealed class TestCheckedCastI : Test.TestCheckedCastDisp_
-{
-    public override void
-    getContext_async(Test.AMD_TestCheckedCast_getContext cb, Ice.Current current)
-    {
-        cb.ice_response(_ctx);
-    }
-
-    public override bool
-    ice_isA(string s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return base.ice_isA(s, current);
-    }
-
-    private Ice.Context _ctx;
-}
diff --git a/cs/test/Ice/operations/TestCheckedCastI.cs b/cs/test/Ice/operations/TestCheckedCastI.cs
deleted file mode 100644
index 36d7df27c05..00000000000
--- a/cs/test/Ice/operations/TestCheckedCastI.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public sealed class TestCheckedCastI : Test.TestCheckedCastDisp_
-{
-    public override Ice.Context
-    getContext(Ice.Current current)
-    {
-        return _ctx;
-    }
-
-    public override bool
-    ice_isA(string s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return base.ice_isA(s, current);
-    }
-
-    private Ice.Context _ctx;
-}
diff --git a/cs/test/Ice/proxy/AllTests.cs b/cs/test/Ice/proxy/AllTests.cs
index a381854e3ee..980e06897c5 100644
--- a/cs/test/Ice/proxy/AllTests.cs
+++ b/cs/test/Ice/proxy/AllTests.cs
@@ -9,7 +9,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Threading;
 
 public class AllTests
 {
@@ -21,48 +20,7 @@ public class AllTests
         }
     }
 
-    class AMI_MyClass_opSleepI : Test.AMI_MyClass_opSleep
-    {
-        override public void
-        ice_response()
-        {
-            test(false);
-        }
-
-        override public void
-        ice_exception(Ice.Exception ex)
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-                test(ex is Ice.TimeoutException);
-            }
-        }
-
-        public bool check()
-        {
-            lock(this)
-            {
-                while(!_called)
-                {
-                    Monitor.Wait(this, 5000);
-
-                    if(!_called)
-                    {
-                        return false; // Must be timeout.
-                    }
-                }
-
-                _called = false;
-                return true;
-            }
-        }
-        private bool _called = false;
-    };
-    
-    public static Test.MyClassPrx allTests(Ice.Communicator communicator, bool collocated)
+    public static Test.MyClassPrx allTests(Ice.Communicator communicator)
     {
         Console.Out.Write("testing stringToProxy... ");
         Console.Out.Flush();
@@ -466,32 +424,6 @@ public class AllTests
         test(c.Equals(c2));
         Console.Out.WriteLine("ok");
 
-        if(!collocated)
-        {
-            Console.Out.Write("testing timeout... ");
-            Console.Out.Flush();
-            Test.MyClassPrx clTimeout = Test.MyClassPrxHelper.uncheckedCast(cl.ice_timeout(500));
-            try
-            {
-                clTimeout.opSleep(1000);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-            }
-            AMI_MyClass_opSleepI cb = new AMI_MyClass_opSleepI();
-            try
-            {
-                clTimeout.opSleep_async(cb, 2000);
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-            test(cb.check());
-            Console.Out.WriteLine("ok");
-        }
-        
         return cl;
     }
 }
diff --git a/cs/test/Ice/proxy/Client.cs b/cs/test/Ice/proxy/Client.cs
index 436c0f89ec1..4c3f08d6f2c 100644
--- a/cs/test/Ice/proxy/Client.cs
+++ b/cs/test/Ice/proxy/Client.cs
@@ -13,7 +13,7 @@ public class Client
 {
     private static int run(String[] args, Ice.Communicator communicator)
     {
-        Test.MyClassPrx myClass = AllTests.allTests(communicator, false);
+        Test.MyClassPrx myClass = AllTests.allTests(communicator);
         
         myClass.shutdown();
         
diff --git a/cs/test/Ice/proxy/Collocated.cs b/cs/test/Ice/proxy/Collocated.cs
index 256b26f13cc..2a67e81aaf1 100644
--- a/cs/test/Ice/proxy/Collocated.cs
+++ b/cs/test/Ice/proxy/Collocated.cs
@@ -18,7 +18,7 @@ public class Collocated
         adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
 
-        AllTests.allTests(communicator, true);
+        AllTests.allTests(communicator);
 
         return 0;
     }
diff --git a/cs/test/Ice/proxy/MyDerivedClassAMDI.cs b/cs/test/Ice/proxy/MyDerivedClassAMDI.cs
index 0a8a9d9a414..6b34cecf5cd 100644
--- a/cs/test/Ice/proxy/MyDerivedClassAMDI.cs
+++ b/cs/test/Ice/proxy/MyDerivedClassAMDI.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Threading;
 
 public sealed class MyDerivedClassI : Test.MyDerivedClass
 {
@@ -22,12 +21,6 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
         cb.ice_response();
     }
     
-    public override void opSleep_async(Test.AMD_MyClass_opSleep cb, int duration, Ice.Current current)
-    {
-        System.Threading.Thread.Sleep(duration);
-        cb.ice_response();
-    }
-
     public override void
     getContext_async(Test.AMD_MyClass_getContext cb, Ice.Current current)
     {
diff --git a/cs/test/Ice/proxy/MyDerivedClassI.cs b/cs/test/Ice/proxy/MyDerivedClassI.cs
index 6fa9dce948c..6b3fb42f504 100644
--- a/cs/test/Ice/proxy/MyDerivedClassI.cs
+++ b/cs/test/Ice/proxy/MyDerivedClassI.cs
@@ -20,11 +20,6 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass
         current.adapter.getCommunicator().shutdown();
     }
     
-    public override void opSleep(int duration, Ice.Current current)
-    {
-        System.Threading.Thread.Sleep(duration);
-    }
-
     public override Ice.Context
     getContext(Ice.Current current)
     {
diff --git a/cs/test/Ice/proxy/Server.cs b/cs/test/Ice/proxy/Server.cs
index db4a758aae6..5759b5b3e31 100644
--- a/cs/test/Ice/proxy/Server.cs
+++ b/cs/test/Ice/proxy/Server.cs
@@ -34,7 +34,10 @@ public class Server
         
         try
         {
-            communicator = Ice.Util.initialize(ref args);
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = Ice.Util.createProperties(ref args);
+            initData.properties.setProperty("Ice.Warn.Connections", "0");
+            communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
         catch(Ice.LocalException ex)
diff --git a/cs/test/Ice/proxy/Test.ice b/cs/test/Ice/proxy/Test.ice
index fef92a708ff..98df707e020 100644
--- a/cs/test/Ice/proxy/Test.ice
+++ b/cs/test/Ice/proxy/Test.ice
@@ -20,8 +20,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
-    
     Ice::Context getContext();
 };
 
diff --git a/cs/test/Ice/proxy/TestAMD.ice b/cs/test/Ice/proxy/TestAMD.ice
index 13dc113c4c7..3e80c283e25 100644
--- a/cs/test/Ice/proxy/TestAMD.ice
+++ b/cs/test/Ice/proxy/TestAMD.ice
@@ -20,8 +20,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
-
     Ice::Context getContext();
 };
 
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index 0bb47cda1b1..f72b6b831a7 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -9,148 +9,13 @@
 
 public class AllTests
 {
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     public static Test.MyClassPrx
     allTests(Ice.Communicator communicator, boolean collocated)
     {
-        System.out.print("testing stringToProxy... ");
-        System.out.flush();
         String ref = "test:default -p 12010 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
-        test(base != null);
-        System.out.println("ok");
-
-        System.out.print("testing ice_getCommunicator... ");
-        System.out.flush();
-        test(base.ice_getCommunicator() == communicator);
-        System.out.println("ok");
-
-        System.out.print("testing proxy methods... ");
-        System.out.flush();
-        test(communicator.identityToString(
-                 base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).equals("other"));
-        test(base.ice_facet("facet").ice_getFacet().equals("facet"));
-        test(base.ice_adapterId("id").ice_getAdapterId().equals("id"));
-        test(base.ice_twoway().ice_isTwoway());
-        test(base.ice_oneway().ice_isOneway());
-        test(base.ice_batchOneway().ice_isBatchOneway());
-        test(base.ice_datagram().ice_isDatagram());
-        test(base.ice_batchDatagram().ice_isBatchDatagram());
-        test(base.ice_secure(true).ice_isSecure());
-        test(!base.ice_secure(false).ice_isSecure());
-        test(base.ice_collocationOptimized(true).ice_isCollocationOptimized());
-        test(!base.ice_collocationOptimized(false).ice_isCollocationOptimized());
-        System.out.println("ok");
-
-        System.out.print("testing proxy comparison... ");
-        System.out.flush();
-
-        test(communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo")));
-        test(!communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo2")));
-
-        Ice.ObjectPrx compObj = communicator.stringToProxy("foo");
-
-        test(compObj.ice_facet("facet").equals(compObj.ice_facet("facet")));
-        test(!compObj.ice_facet("facet").equals(compObj.ice_facet("facet1")));
-
-        test(compObj.ice_oneway().equals(compObj.ice_oneway()));
-        test(!compObj.ice_oneway().equals(compObj.ice_twoway()));
-
-        test(compObj.ice_secure(true).equals(compObj.ice_secure(true)));
-        test(!compObj.ice_secure(false).equals(compObj.ice_secure(true)));
-
-        test(compObj.ice_collocationOptimized(true).equals(compObj.ice_collocationOptimized(true)));
-        test(!compObj.ice_collocationOptimized(false).equals(compObj.ice_collocationOptimized(true)));
-
-        test(compObj.ice_connectionCached(true).equals(compObj.ice_connectionCached(true)));
-        test(!compObj.ice_connectionCached(false).equals(compObj.ice_connectionCached(true)));
-
-        test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
-        test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
-
-        test(compObj.ice_connectionId("id2").equals(compObj.ice_connectionId("id2")));
-        test(!compObj.ice_connectionId("id1").equals(compObj.ice_connectionId("id2")));
-
-        test(compObj.ice_compress(true).equals(compObj.ice_compress(true)));
-        test(!compObj.ice_compress(false).equals(compObj.ice_compress(true)));
-
-        test(compObj.ice_timeout(20).equals(compObj.ice_timeout(20)));
-        test(!compObj.ice_timeout(10).equals(compObj.ice_timeout(20)));
-
-        Ice.ObjectPrx compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
-        Ice.ObjectPrx compObj2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
-        test(!compObj1.equals(compObj2));
-
-        compObj1 = communicator.stringToProxy("foo@MyAdapter1");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter2");
-        test(!compObj1.equals(compObj2));
-
-        test(compObj1.ice_locatorCacheTimeout(20).equals(compObj1.ice_locatorCacheTimeout(20)));
-        test(!compObj1.ice_locatorCacheTimeout(10).equals(compObj1.ice_locatorCacheTimeout(20)));
-
-        compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter1");
-        test(!compObj1.equals(compObj2));
-
-        //
-        // TODO: Ideally we should also test comparison of fixed proxies.
-        //
-        System.out.println("ok");
-
-        System.out.print("testing checked cast... ");
-        System.out.flush();
         Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(base);
-        test(cl != null);
         Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(cl);
-        test(derived != null);
-        test(cl.equals(base));
-        test(derived.equals(base));
-        test(cl.equals(derived));
-        System.out.println("ok");
-
-        System.out.print("testing checked cast with context... ");
-        System.out.flush();
-        String cref = "context:default -p 12010 -t 10000";
-        Ice.ObjectPrx cbase = communicator.stringToProxy(cref);
-        test(cbase != null);
-
-        Test.TestCheckedCastPrx tccp = Test.TestCheckedCastPrxHelper.checkedCast(cbase);
-        java.util.Map c = tccp.getContext();
-        test(c == null || c.size() == 0);
-
-        c = new java.util.HashMap();
-        c.put("one", "hello");
-        c.put("two", "world");
-        tccp = Test.TestCheckedCastPrxHelper.checkedCast(cbase, c);
-        java.util.Map c2 = tccp.getContext();
-        test(c.equals(c2));
-        System.out.println("ok");
-
-        if(!collocated)
-        {
-            System.out.print("testing timeout... ");
-            System.out.flush();
-            try
-            {
-                Test.MyClassPrx clTimeout = Test.MyClassPrxHelper.uncheckedCast(cl.ice_timeout(500));
-                clTimeout.opSleep(1000);
-                test(false);
-            }
-            catch(Ice.TimeoutException ex)
-            {
-            }
-            System.out.println("ok");
-        }
 
         System.out.print("testing twoway operations... ");
         System.out.flush();
diff --git a/java/test/Ice/operations/BatchOneways.java b/java/test/Ice/operations/BatchOneways.java
index 86944c0b9c9..8418a033b82 100644
--- a/java/test/Ice/operations/BatchOneways.java
+++ b/java/test/Ice/operations/BatchOneways.java
@@ -28,7 +28,6 @@ class BatchOneways
         try
         {
             p.opByteSOneway(bs1);
-            test(true);
         }
         catch(Ice.MemoryLimitException ex)
         {
@@ -38,7 +37,6 @@ class BatchOneways
         try
         {
             p.opByteSOneway(bs2);
-            test(true);
         }
         catch(Ice.MemoryLimitException ex)
         {
@@ -52,7 +50,6 @@ class BatchOneways
         }
         catch(Ice.MemoryLimitException ex)
         {
-            test(true);
         }
 
         Test.MyClassPrx batch = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
@@ -62,7 +59,6 @@ class BatchOneways
             try
             {
                 batch.opByteSOneway(bs1);
-                test(true);
             }
             catch(Ice.MemoryLimitException ex)
             {
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 280d6791d65..fa220272edc 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -55,11 +55,6 @@ public class Client
             //
             initData.properties.setProperty("Ice.MessageSizeMax", "100");
 
-            //
-            // We don't want connection warnings because of the timeout test.
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index ae944e9222e..75c4d5ea7d3 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -14,9 +14,7 @@ public class Collocated
     {
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = communicator.stringToIdentity("test");
-        adapter.add(new MyDerivedClassI(adapter, id), id);
-        adapter.add(new TestCheckedCastI(), communicator.stringToIdentity("context"));
+        adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
 
         AllTests.allTests(communicator, true);
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 7e44f5be060..0650751b39d 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -18,17 +18,10 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         }
     }
 
-    public
-    MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public void
@@ -36,22 +29,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
     }
 
-    public void
-    opSleep(int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
     public boolean
     opBool(boolean p1, boolean p2,
            Ice.BooleanHolder p3,
@@ -216,8 +193,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
         p2.value = p1;
         p3.value = Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(_adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity));
+            current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
     }
 
     public Test.MyEnum
@@ -417,7 +394,4 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     opDerived(Ice.Current current)
     {
     }
-
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
 }
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index 83b6c48698a..f38353da4b6 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -32,7 +32,7 @@ public class Server
             Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties(argsH);
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
+            initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
diff --git a/java/test/Ice/operations/Test.ice b/java/test/Ice/operations/Test.ice
index aaaa2975345..34850a8733a 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/Ice/operations/Test.ice
@@ -72,8 +72,6 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     void opVoid();
 
-    void opSleep(int duration);
-    
     byte opByte(byte p1, byte p2,
                 out byte p3);
 
@@ -159,11 +157,6 @@ dictionary<string, MyEnum> StringMyEnumD;
     void opDerived();
 };
 
-interface TestCheckedCast
-{
-    Ice::Context getContext();
-};
-
 };
 
 #endif
diff --git a/java/test/Ice/operations/TestCheckedCastI.java b/java/test/Ice/operations/TestCheckedCastI.java
deleted file mode 100644
index 25b45621f8f..00000000000
--- a/java/test/Ice/operations/TestCheckedCastI.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public final class TestCheckedCastI extends Test._TestCheckedCastDisp
-{
-    public java.util.Map
-    getContext(Ice.Current current)
-    {
-        return _ctx;
-    }
-
-    public boolean
-    ice_isA(String s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return super.ice_isA(s, current);
-    }
-
-    private java.util.Map _ctx;
-}
diff --git a/java/test/Ice/operationsAMD/MyDerivedClassI.java b/java/test/Ice/operationsAMD/MyDerivedClassI.java
index d97d0eb3225..6383fab12e0 100644
--- a/java/test/Ice/operationsAMD/MyDerivedClassI.java
+++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java
@@ -35,13 +35,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         private Test.AMD_MyClass_opVoid _cb;
     }
 
-    public
-    MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-
     public void
     shutdown_async(Test.AMD_MyClass_shutdown cb,
                    Ice.Current current)
@@ -58,7 +51,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
             }
         }
 
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
 
@@ -83,23 +76,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public void
-    opSleep_async(Test.AMD_MyClass_opSleep cb, int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                cb.ice_response();
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
-    public void
     opBool_async(Test.AMD_MyClass_opBool cb,
                  boolean p1, boolean p2,
                  Ice.Current current)
@@ -259,8 +235,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
         Test.MyClassPrx p2 = p1;
         Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(_adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity)), p2, p3);
+            current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3);
     }
 
     public void
@@ -460,7 +436,5 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         cb.ice_response();
     }
 
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
     private Thread _opVoidThread;
 }
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index 07f4f92ec98..badfc158e8f 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -33,7 +33,7 @@ public class Server
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties(argsH);
 
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
+            initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
diff --git a/java/test/Ice/operationsAMD/TestAMD.ice b/java/test/Ice/operationsAMD/TestAMD.ice
index 8efa097d48a..da6f87f89f4 100644
--- a/java/test/Ice/operationsAMD/TestAMD.ice
+++ b/java/test/Ice/operationsAMD/TestAMD.ice
@@ -72,8 +72,6 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     void opVoid();
 
-    void opSleep(int duration);
-    
     byte opByte(byte p1, byte p2,
                 out byte p3);
 
@@ -159,11 +157,6 @@ dictionary<string, MyEnum> StringMyEnumD;
     void opDerived();
 };
 
-["ami", "amd"] interface TestCheckedCast
-{
-    Ice::Context getContext();
-};
-
 };
 
 #endif
diff --git a/java/test/Ice/operationsAMD/TestCheckedCastI.java b/java/test/Ice/operationsAMD/TestCheckedCastI.java
deleted file mode 100644
index 780fa91b22b..00000000000
--- a/java/test/Ice/operationsAMD/TestCheckedCastI.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public final class TestCheckedCastI extends Test._TestCheckedCastDisp
-{
-    public void
-    getContext_async(Test.AMD_TestCheckedCast_getContext cb, Ice.Current current)
-    {
-        cb.ice_response(_ctx);
-    }
-
-    public boolean
-    ice_isA(String s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return super.ice_isA(s, current);
-    }
-
-    private java.util.Map _ctx;
-}
diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java
index 7df5c53074f..5b6b39c1759 100644
--- a/java/test/Ice/proxy/AllTests.java
+++ b/java/test/Ice/proxy/AllTests.java
@@ -19,7 +19,7 @@ public class AllTests
     }
 
     public static Test.MyClassPrx
-    allTests(Ice.Communicator communicator, boolean collocated)
+    allTests(Ice.Communicator communicator)
     {
         System.out.print("testing stringToProxy... ");
         System.out.flush();
diff --git a/java/test/Ice/proxy/Client.java b/java/test/Ice/proxy/Client.java
index edbeac8bd1f..cfe7f4e0608 100644
--- a/java/test/Ice/proxy/Client.java
+++ b/java/test/Ice/proxy/Client.java
@@ -12,7 +12,7 @@ public class Client
     private static int
     run(String[] args, Ice.Communicator communicator)
     {
-        Test.MyClassPrx myClass = AllTests.allTests(communicator, false);
+        Test.MyClassPrx myClass = AllTests.allTests(communicator);
         myClass.shutdown();
         return 0;
     }
diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java
index 75c4d5ea7d3..4392b66d3e0 100644
--- a/java/test/Ice/proxy/Collocated.java
+++ b/java/test/Ice/proxy/Collocated.java
@@ -17,7 +17,7 @@ public class Collocated
         adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
         adapter.activate();
 
-        AllTests.allTests(communicator, true);
+        AllTests.allTests(communicator);
 
         return 0;
     }
diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/Ice/proxy/MyDerivedClassI.java
index 57ee7406cb7..db4084975cf 100644
--- a/java/test/Ice/proxy/MyDerivedClassI.java
+++ b/java/test/Ice/proxy/MyDerivedClassI.java
@@ -20,22 +20,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         c.adapter.getCommunicator().shutdown();
     }
 
-    public void
-    opSleep(int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
     public java.util.Map
     getContext(Ice.Current current)
     {
diff --git a/java/test/Ice/proxy/Test.ice b/java/test/Ice/proxy/Test.ice
index b22f136bde2..ee3b6bdb724 100644
--- a/java/test/Ice/proxy/Test.ice
+++ b/java/test/Ice/proxy/Test.ice
@@ -19,8 +19,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
-    
     Ice::Context getContext();
 };
 
diff --git a/java/test/Ice/proxyAMD/MyDerivedClassI.java b/java/test/Ice/proxyAMD/MyDerivedClassI.java
index 0bdcd154685..bd1a1314abc 100644
--- a/java/test/Ice/proxyAMD/MyDerivedClassI.java
+++ b/java/test/Ice/proxyAMD/MyDerivedClassI.java
@@ -23,23 +23,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public void
-    opSleep_async(Test.AMD_MyClass_opSleep cb, int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                cb.ice_response();
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
-    public void
     getContext_async(Test.AMD_MyClass_getContext cb, Ice.Current current)
     {
         cb.ice_response(_ctx);
diff --git a/java/test/Ice/proxyAMD/TestAMD.ice b/java/test/Ice/proxyAMD/TestAMD.ice
index 24167e40e42..6ffe76a4597 100644
--- a/java/test/Ice/proxyAMD/TestAMD.ice
+++ b/java/test/Ice/proxyAMD/TestAMD.ice
@@ -19,8 +19,6 @@ module Test
 {
     void shutdown();
 
-    void opSleep(int duration);
-    
     Ice::Context getContext();
 };