diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
| commit | 883edab4361e58957796f25d5fc55cfb41f0f6ea (patch) | |
| tree | fc90adc372b66bf0becf4c0912794c64af250a29 /csharp | |
| parent | ICE-7242 - Cross test updates (diff) | |
| download | ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.bz2 ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.xz ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.zip | |
Deprecate Communicator::stringToIdentity and identityToString
Diffstat (limited to 'csharp')
83 files changed, 164 insertions, 169 deletions
diff --git a/csharp/src/Ice/CommunicatorI.cs b/csharp/src/Ice/CommunicatorI.cs index e2e1f0015f4..dade480ecc5 100644 --- a/csharp/src/Ice/CommunicatorI.cs +++ b/csharp/src/Ice/CommunicatorI.cs @@ -60,12 +60,12 @@ namespace Ice public Ice.Identity stringToIdentity(string s) { - return instance_.stringToIdentity(s); + return Ice.Util.stringToIdentity(s); } public string identityToString(Ice.Identity ident) { - return instance_.identityToString(ident); + return Ice.Util.identityToString(ident); } public ObjectAdapter createObjectAdapter(string name) diff --git a/csharp/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs index 47d892986af..4fdf734e0b6 100644 --- a/csharp/src/Ice/Incoming.cs +++ b/csharp/src/Ice/Incoming.cs @@ -222,7 +222,7 @@ namespace IceInternal IceUtilInternal.OutputBase output = new IceUtilInternal.OutputBase(sw); output.setUseTab(false); output.print("dispatch exception:"); - output.print("\nidentity: " + instance_.identityToString(current_.id)); + output.print("\nidentity: " + Ice.Util.identityToString(current_.id)); output.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(current_.facet, "")); output.print("\noperation: " + current_.operation); if(current_.con != null) diff --git a/csharp/src/Ice/Instance.cs b/csharp/src/Ice/Instance.cs index 09d3a9a83b1..2f910483385 100644 --- a/csharp/src/Ice/Instance.cs +++ b/csharp/src/Ice/Instance.cs @@ -359,17 +359,6 @@ namespace IceInternal return _implicitContext; } - public Ice.Identity stringToIdentity(string s) - { - return Ice.Util.stringToIdentity(s); - } - - public string identityToString(Ice.Identity ident) - { - return Ice.Util.identityToString(ident); - } - - public Ice.ObjectPrx createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity) { diff --git a/csharp/src/Ice/InstrumentationI.cs b/csharp/src/Ice/InstrumentationI.cs index 3eca65b7ed6..a6d733af7fe 100644 --- a/csharp/src/Ice/InstrumentationI.cs +++ b/csharp/src/Ice/InstrumentationI.cs @@ -395,7 +395,7 @@ namespace IceInternal public string getIdentity() { - return _current.adapter.getCommunicator().identityToString(_current.id); + return Ice.Util.identityToString(_current.id); } readonly private Ice.Current _current; @@ -500,7 +500,7 @@ namespace IceInternal catch(Ice.Exception) { // Either a fixed proxy or the communicator is destroyed. - os.Append(_proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity())); + os.Append(Ice.Util.identityToString(_proxy.ice_getIdentity())); os.Append(" [").Append(_operation).Append(']'); } _id = os.ToString(); @@ -532,7 +532,7 @@ namespace IceInternal { if(_proxy != null) { - return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity()); + return Ice.Util.identityToString(_proxy.ice_getIdentity()); } else { diff --git a/csharp/src/Ice/LocatorInfo.cs b/csharp/src/Ice/LocatorInfo.cs index 92497315fa1..01c064b9f4e 100644 --- a/csharp/src/Ice/LocatorInfo.cs +++ b/csharp/src/Ice/LocatorInfo.cs @@ -523,7 +523,7 @@ namespace IceInternal } else { - s.Append("object = " + r.getInstance().identityToString(r.getIdentity()) + "\n"); + s.Append("object = " + Ice.Util.identityToString(r.getIdentity()) + "\n"); } s.Append("endpoints = "); @@ -569,13 +569,13 @@ namespace IceInternal { System.Text.StringBuilder s = new System.Text.StringBuilder(); s.Append("object not found\n"); - s.Append("object = " + instance.identityToString(@ref.getIdentity())); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } Ice.NotRegisteredException e = new Ice.NotRegisteredException(ex); e.kindOfObject = "object"; - e.id = instance.identityToString(@ref.getIdentity()); + e.id = Ice.Util.identityToString(@ref.getIdentity()); throw e; } catch(Ice.NotRegisteredException) @@ -595,7 +595,7 @@ namespace IceInternal } else { - s.Append("object = " + instance.identityToString(@ref.getIdentity()) + "\n"); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity()) + "\n"); } s.Append("reason = " + ex); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); @@ -634,7 +634,7 @@ namespace IceInternal else { s.Append("object\n"); - s.Append("object = " + instance.identityToString(@ref.getIdentity())); + s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity())); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } @@ -674,7 +674,7 @@ namespace IceInternal Instance instance = @ref.getInstance(); System.Text.StringBuilder s = new System.Text.StringBuilder(); s.Append("searching for object by id\nobject = "); - s.Append(instance.identityToString(@ref.getIdentity())); + s.Append(Ice.Util.identityToString(@ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString()); } diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs index 50bdc56ad33..03c3ff6333e 100644 --- a/csharp/src/Ice/ObjectAdapterI.cs +++ b/csharp/src/Ice/ObjectAdapterI.cs @@ -926,7 +926,7 @@ namespace Ice { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); ex.kindOfObject = "object adapter with router"; - ex.id = instance_.identityToString(router.ice_getIdentity()); + ex.id = Ice.Util.identityToString(router.ice_getIdentity()); throw ex; } diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs index 5b827fc0935..37644c85a6e 100644 --- a/csharp/src/Ice/Reference.cs +++ b/csharp/src/Ice/Reference.cs @@ -295,7 +295,7 @@ namespace IceInternal // the reference parser uses as separators, then we enclose // the identity string in quotes. // - string id = instance_.identityToString(identity_); + string id = Ice.Util.identityToString(identity_); if(IceUtilInternal.StringUtil.findFirstOf(id, " :@") != -1) { s.Append('"'); diff --git a/csharp/src/Ice/ReferenceFactory.cs b/csharp/src/Ice/ReferenceFactory.cs index 0bbdbc5a23c..1e106659258 100644 --- a/csharp/src/Ice/ReferenceFactory.cs +++ b/csharp/src/Ice/ReferenceFactory.cs @@ -134,7 +134,7 @@ namespace IceInternal // // Parsing the identity may raise IdentityParseException. // - Ice.Identity ident = instance_.stringToIdentity(idstr); + Ice.Identity ident = Ice.Util.stringToIdentity(idstr); if(ident.name.Length == 0) { diff --git a/csharp/src/Ice/ServantManager.cs b/csharp/src/Ice/ServantManager.cs index d1f5353d54c..a369af5ef1d 100644 --- a/csharp/src/Ice/ServantManager.cs +++ b/csharp/src/Ice/ServantManager.cs @@ -37,7 +37,7 @@ public sealed class ServantManager if(m.ContainsKey(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = instance_.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.Length > 0) { diff --git a/csharp/src/Ice/TraceUtil.cs b/csharp/src/Ice/TraceUtil.cs index e191dfe7e05..f815b712473 100644 --- a/csharp/src/Ice/TraceUtil.cs +++ b/csharp/src/Ice/TraceUtil.cs @@ -177,7 +177,7 @@ namespace IceInternal { Ice.Identity identity = new Ice.Identity(); identity.read__(str); - s.Write("\nidentity = " + str.instance().identityToString(identity)); + s.Write("\nidentity = " + Ice.Util.identityToString(identity)); string[] facet = str.readStringSeq(); s.Write("\nfacet = "); diff --git a/csharp/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs index 2ec46a07d96..740256af9fd 100644 --- a/csharp/src/IceDiscovery/PluginI.cs +++ b/csharp/src/IceDiscovery/PluginI.cs @@ -115,7 +115,7 @@ namespace IceDiscovery // Add lookup and lookup reply Ice objects // LookupI lookup = new LookupI(locatorRegistry, LookupPrxHelper.uncheckedCast(lookupPrx), properties); - _multicastAdapter.add(lookup, _communicator.stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter.add(lookup, Ice.Util.stringToIdentity("IceDiscovery/Lookup")); Ice.ObjectPrx lookupReply = _replyAdapter.addWithUUID(new LookupReplyI(lookup)).ice_datagram(); lookup.setLookupReply(LookupReplyPrxHelper.uncheckedCast(lookupReply)); diff --git a/csharp/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs index 064fcdccfb8..a767709c22c 100644 --- a/csharp/test/Glacier2/router/Client.cs +++ b/csharp/test/Glacier2/router/Client.cs @@ -284,7 +284,7 @@ public class Client Dictionary<string, string> context = new Dictionary<string, string>(); context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c2/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); Console.Out.WriteLine("ok"); @@ -298,7 +298,7 @@ public class Client try { CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c3/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); test(false); } @@ -314,7 +314,7 @@ public class Client Dictionary<string, string> context = new Dictionary<string, string>(); context["_fwd"] = "t"; CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("_userid/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); Console.Out.WriteLine("ok"); diff --git a/csharp/test/Glacier2/router/Server.cs b/csharp/test/Glacier2/router/Server.cs index 78312e1fbcf..4f8ae5a9e1c 100644 --- a/csharp/test/Glacier2/router/Server.cs +++ b/csharp/test/Glacier2/router/Server.cs @@ -26,13 +26,13 @@ public class Server communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), - communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. + Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c2/callback")); // The test allows "c2" as category. + Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c3/callback")); // The test rejects "c3" as category. + Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("_userid/callback")); // The test allows the prefixed userid. + Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid. adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/csharp/test/Glacier2/sessionHelper/Server.cs b/csharp/test/Glacier2/sessionHelper/Server.cs index c35bd550b28..0b518572cbf 100644 --- a/csharp/test/Glacier2/sessionHelper/Server.cs +++ b/csharp/test/Glacier2/sessionHelper/Server.cs @@ -27,7 +27,7 @@ public class Server communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); - adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); + adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/csharp/test/Ice/acm/Server.cs b/csharp/test/Ice/acm/Server.cs index b833ebccce9..1482464c5cb 100644 --- a/csharp/test/Ice/acm/Server.cs +++ b/csharp/test/Ice/acm/Server.cs @@ -24,7 +24,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/csharp/test/Ice/acm/TestI.cs b/csharp/test/Ice/acm/TestI.cs index f44180bbf82..0dd3455daf7 100644 --- a/csharp/test/Ice/acm/TestI.cs +++ b/csharp/test/Ice/acm/TestI.cs @@ -50,7 +50,7 @@ public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_ { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/csharp/test/Ice/admin/AllTests.cs b/csharp/test/Ice/admin/AllTests.cs index 6e1efb732eb..198232d96ec 100644 --- a/csharp/test/Ice/admin/AllTests.cs +++ b/csharp/test/Ice/admin/AllTests.cs @@ -138,7 +138,7 @@ public class AllTests : TestCommon.TestApp init.properties.setProperty("Ice.Admin.Enabled", "1"); Ice.Communicator com = Ice.Util.initialize(init); test(com.getAdmin() == null); - Ice.Identity id = com.stringToIdentity("test-admin"); + Ice.Identity id = Ice.Util.stringToIdentity("test-admin"); try { com.createAdmin(null, id); diff --git a/csharp/test/Ice/admin/Server.cs b/csharp/test/Ice/admin/Server.cs index 43680df866e..048d076412c 100644 --- a/csharp/test/Ice/admin/Server.cs +++ b/csharp/test/Ice/admin/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new RemoteCommunicatorFactoryI(), id); adapter.activate(); diff --git a/csharp/test/Ice/ami/Collocated.cs b/csharp/test/Ice/ami/Collocated.cs index 580ed4c1c09..0627679d450 100644 --- a/csharp/test/Ice/ami/Collocated.cs +++ b/csharp/test/Ice/ami/Collocated.cs @@ -27,9 +27,9 @@ public class Collocated Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Collocated test doesn't need to activate the OA - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Collocated test doesn't need to activate the OA AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/ami/Server.cs b/csharp/test/Ice/ami/Server.cs index 7c29d688946..db75ec934e8 100644 --- a/csharp/test/Ice/ami/Server.cs +++ b/csharp/test/Ice/ami/Server.cs @@ -27,9 +27,9 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/background/Server.cs b/csharp/test/Ice/background/Server.cs index fa302ba146d..0ced20a0176 100644 --- a/csharp/test/Ice/background/Server.cs +++ b/csharp/test/Ice/background/Server.cs @@ -27,7 +27,7 @@ public class Server { _controller.checkCallPause(current); Ice.Communicator communicator = current.adapter.getCommunicator(); - response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); + response(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy"))); } public override void @@ -100,12 +100,12 @@ public class Server BackgroundControllerI backgroundController = new BackgroundControllerI(adapter); - adapter.add(new BackgroundI(backgroundController), communicator.stringToIdentity("background")); - adapter.add(new LocatorI(backgroundController), communicator.stringToIdentity("locator")); - adapter.add(new RouterI(backgroundController), communicator.stringToIdentity("router")); + adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background")); + adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator")); + adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router")); adapter.activate(); - adapter2.add(backgroundController, communicator.stringToIdentity("backgroundController")); + adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/binding/AllTests.cs b/csharp/test/Ice/binding/AllTests.cs index e064321f7cb..5ccfa828986 100644 --- a/csharp/test/Ice/binding/AllTests.cs +++ b/csharp/test/Ice/binding/AllTests.cs @@ -893,7 +893,7 @@ public class AllTests : TestCommon.TestApp continue; // IP version not supported. } - Ice.ObjectPrx prx = oa.createProxy(serverCommunicator.stringToIdentity("dummy")); + Ice.ObjectPrx prx = oa.createProxy(Ice.Util.stringToIdentity("dummy")); try { prx.ice_collocationOptimized(false).ice_ping(); diff --git a/csharp/test/Ice/binding/RemoteObjectAdapterI.cs b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs index 3b7b500422d..f4b054f0f9a 100644 --- a/csharp/test/Ice/binding/RemoteObjectAdapterI.cs +++ b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs @@ -15,7 +15,7 @@ public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_ { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/csharp/test/Ice/binding/Server.cs b/csharp/test/Ice/binding/Server.cs index d1d5df94367..f427698fbd3 100644 --- a/csharp/test/Ice/binding/Server.cs +++ b/csharp/test/Ice/binding/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/csharp/test/Ice/checksum/server/Server.cs b/csharp/test/Ice/checksum/server/Server.cs index a06e801cb97..50cde4c714f 100644 --- a/csharp/test/Ice/checksum/server/Server.cs +++ b/csharp/test/Ice/checksum/server/Server.cs @@ -16,7 +16,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new Test.ChecksumI(); - adapter.add(@object, communicator.stringToIdentity("test")); + adapter.add(@object, Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/dictMapping/Collocated.cs b/csharp/test/Ice/dictMapping/Collocated.cs index a6b640699b3..d2edaf61525 100644 --- a/csharp/test/Ice/dictMapping/Collocated.cs +++ b/csharp/test/Ice/dictMapping/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/dictMapping/Server.cs b/csharp/test/Ice/dictMapping/Server.cs index c43e83854d8..e1485f81a45 100644 --- a/csharp/test/Ice/dictMapping/Server.cs +++ b/csharp/test/Ice/dictMapping/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/dispatcher/Collocated.cs b/csharp/test/Ice/dispatcher/Collocated.cs index 583795d3367..ae25fc29faf 100644 --- a/csharp/test/Ice/dispatcher/Collocated.cs +++ b/csharp/test/Ice/dispatcher/Collocated.cs @@ -27,9 +27,9 @@ public class Collocated Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator); diff --git a/csharp/test/Ice/dispatcher/Server.cs b/csharp/test/Ice/dispatcher/Server.cs index 82ceaa711c6..f0f87059499 100644 --- a/csharp/test/Ice/dispatcher/Server.cs +++ b/csharp/test/Ice/dispatcher/Server.cs @@ -27,9 +27,9 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator.stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/echo/Server.cs b/csharp/test/Ice/echo/Server.cs index 3d717db85b9..28cd7d37aaa 100644 --- a/csharp/test/Ice/echo/Server.cs +++ b/csharp/test/Ice/echo/Server.cs @@ -49,7 +49,7 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); BlobjectI blob = new BlobjectI(); adapter.addDefaultServant(blob, ""); - adapter.add(new EchoI(blob), communicator.stringToIdentity("__echo")); + adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/enums/Server.cs b/csharp/test/Ice/enums/Server.cs index 1612c8c6814..8a34cfd5a48 100644 --- a/csharp/test/Ice/enums/Server.cs +++ b/csharp/test/Ice/enums/Server.cs @@ -25,7 +25,7 @@ public class Server Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/exceptions/AllTests.cs b/csharp/test/Ice/exceptions/AllTests.cs index b1a1a14a922..ab9b1a9ee6f 100644 --- a/csharp/test/Ice/exceptions/AllTests.cs +++ b/csharp/test/Ice/exceptions/AllTests.cs @@ -98,10 +98,10 @@ public class AllTests : TestCommon.TestApp communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); try { - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.AlreadyRegisteredException) @@ -110,7 +110,7 @@ public class AllTests : TestCommon.TestApp try { - adapter.add(obj, communicator.stringToIdentity("")); + adapter.add(obj, Ice.Util.stringToIdentity("")); test(false); } catch(Ice.IllegalIdentityException e) @@ -120,17 +120,17 @@ public class AllTests : TestCommon.TestApp try { - adapter.add(null, communicator.stringToIdentity("x")); + adapter.add(null, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.IllegalServantException) { } - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); try { - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.NotRegisteredException) @@ -456,7 +456,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); try { ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); @@ -908,7 +908,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback cb = new Callback(); thrower2.begin_throwAasA(1).whenCompleted( @@ -1179,7 +1179,7 @@ public class AllTests : TestCommon.TestApp Flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback cb = new Callback(); thrower2.begin_throwAasA(1).whenCompleted( diff --git a/csharp/test/Ice/exceptions/Collocated.cs b/csharp/test/Ice/exceptions/Collocated.cs index 9a391f35513..f5b4787dc7a 100644 --- a/csharp/test/Ice/exceptions/Collocated.cs +++ b/csharp/test/Ice/exceptions/Collocated.cs @@ -23,7 +23,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new ThrowerI(); - adapter.add(obj, communicator.stringToIdentity("thrower")); + adapter.add(obj, Ice.Util.stringToIdentity("thrower")); AllTests.allTests(communicator); return 0; } diff --git a/csharp/test/Ice/exceptions/Server.cs b/csharp/test/Ice/exceptions/Server.cs index 0b8885256a4..a8af5586552 100644 --- a/csharp/test/Ice/exceptions/Server.cs +++ b/csharp/test/Ice/exceptions/Server.cs @@ -53,9 +53,9 @@ public class Server Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object obj = new ThrowerI(); - adapter.add(obj, communicator.stringToIdentity("thrower")); - adapter2.add(obj, communicator.stringToIdentity("thrower")); - adapter3.add(obj, communicator.stringToIdentity("thrower")); + adapter.add(obj, Ice.Util.stringToIdentity("thrower")); + adapter2.add(obj, Ice.Util.stringToIdentity("thrower")); + adapter3.add(obj, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/csharp/test/Ice/facets/AllTests.cs b/csharp/test/Ice/facets/AllTests.cs index d32bd75bd47..d0f94544531 100644 --- a/csharp/test/Ice/facets/AllTests.cs +++ b/csharp/test/Ice/facets/AllTests.cs @@ -42,20 +42,20 @@ public class AllTests : TestCommon.TestApp communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("d")); - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(obj, Ice.Util.stringToIdentity("d")); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.AlreadyRegisteredException) { } - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.NotRegisteredException) @@ -66,26 +66,26 @@ public class AllTests : TestCommon.TestApp Write("testing removeAllFacets... "); Ice.Object obj1 = new EmptyI(); Ice.Object obj2 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2"); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2"); Ice.Object obj3 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2"); - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), ""); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2"); + adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), ""); Dictionary<string, Ice.Object> fm - = adapter.removeAllFacets(communicator.stringToIdentity("id1")); + = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(fm.Count == 2); test(fm["f1"] == obj1); test(fm["f2"] == obj2); try { - adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(false); } catch(Ice.NotRegisteredException) { } - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")); + fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2")); test(fm.Count == 3); test(fm["f1"] == obj1); test(fm["f2"] == obj2); diff --git a/csharp/test/Ice/facets/Collocated.cs b/csharp/test/Ice/facets/Collocated.cs index 8cdd1772075..5d8c3f63257 100644 --- a/csharp/test/Ice/facets/Collocated.cs +++ b/csharp/test/Ice/facets/Collocated.cs @@ -23,12 +23,12 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); AllTests.allTests(communicator); diff --git a/csharp/test/Ice/facets/Server.cs b/csharp/test/Ice/facets/Server.cs index 74fe1ad5ece..63d297d9e8b 100644 --- a/csharp/test/Ice/facets/Server.cs +++ b/csharp/test/Ice/facets/Server.cs @@ -23,12 +23,12 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/faultTolerance/Server.cs b/csharp/test/Ice/faultTolerance/Server.cs index 97f0e735174..57101bf3edf 100644 --- a/csharp/test/Ice/faultTolerance/Server.cs +++ b/csharp/test/Ice/faultTolerance/Server.cs @@ -64,7 +64,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("test")); + adapter.add(obj, Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/hold/Server.cs b/csharp/test/Ice/hold/Server.cs index 495ad52658a..1b3ad90b04b 100644 --- a/csharp/test/Ice/hold/Server.cs +++ b/csharp/test/Ice/hold/Server.cs @@ -28,7 +28,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0"); Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1"); - adapter1.add(new HoldI(timer, adapter1), communicator.stringToIdentity("hold")); + adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold")); communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5"); @@ -36,7 +36,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); - adapter2.add(new HoldI(timer, adapter2), communicator.stringToIdentity("hold")); + adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold")); adapter1.activate(); adapter2.activate(); diff --git a/csharp/test/Ice/info/Server.cs b/csharp/test/Ice/info/Server.cs index fc3fb6f7116..82b0a7d08ef 100644 --- a/csharp/test/Ice/info/Server.cs +++ b/csharp/test/Ice/info/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs index 779da94a22d..ab0cfc4951f 100644 --- a/csharp/test/Ice/inheritance/Collocated.cs +++ b/csharp/test/Ice/inheritance/Collocated.cs @@ -24,7 +24,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); - adapter.add(obj, communicator.stringToIdentity("initial")); + adapter.add(obj, Ice.Util.stringToIdentity("initial")); AllTests.allTests(communicator); return 0; } diff --git a/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs index 17129734766..d4988c372b9 100644 --- a/csharp/test/Ice/inheritance/Server.cs +++ b/csharp/test/Ice/inheritance/Server.cs @@ -23,7 +23,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); - adapter.add(@object, communicator.stringToIdentity("initial")); + adapter.add(@object, Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/location/AllTests.cs b/csharp/test/Ice/location/AllTests.cs index 129737c3073..707520b4e36 100644 --- a/csharp/test/Ice/location/AllTests.cs +++ b/csharp/test/Ice/location/AllTests.cs @@ -603,7 +603,7 @@ public class AllTests : TestCommon.TestApp adapter.activate(); HelloPrx helloPrx = HelloPrxHelper.checkedCast( - communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); + communicator.stringToProxy("\"" + Ice.Util.identityToString(id) + "\"")); test(helloPrx.ice_getConnection() == null); adapter.deactivate(); diff --git a/csharp/test/Ice/location/Server.cs b/csharp/test/Ice/location/Server.cs index 279acfb5192..902f536f7f5 100644 --- a/csharp/test/Ice/location/Server.cs +++ b/csharp/test/Ice/location/Server.cs @@ -39,13 +39,13 @@ public class Server // ServerLocatorRegistry registry = new ServerLocatorRegistry(); Ice.Object @object = new ServerManagerI(registry, initData); - adapter.add(@object, communicator.stringToIdentity("ServerManager")); - registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager"))); + adapter.add(@object, Ice.Util.stringToIdentity("ServerManager")); + registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager"))); Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast( - adapter.add(registry, communicator.stringToIdentity("registry"))); + adapter.add(registry, Ice.Util.stringToIdentity("registry"))); ServerLocator locator = new ServerLocator(registry, registryPrx); - adapter.add(locator, communicator.stringToIdentity("locator")); + adapter.add(locator, Ice.Util.stringToIdentity("locator")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/location/ServerManagerI.cs b/csharp/test/Ice/location/ServerManagerI.cs index 27d82f0d55f..3e5458e43ac 100644 --- a/csharp/test/Ice/location/ServerManagerI.cs +++ b/csharp/test/Ice/location/ServerManagerI.cs @@ -58,9 +58,9 @@ public class ServerManagerI : ServerManagerDisp_ adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); Ice.Object @object = new TestI(adapter, adapter2, _registry); - _registry.addObject(adapter.add(@object, serverCommunicator.stringToIdentity("test"))); - _registry.addObject(adapter.add(@object, serverCommunicator.stringToIdentity("test2"))); - adapter.add(@object, serverCommunicator.stringToIdentity("test3")); + _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test"))); + _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test2"))); + adapter.add(@object, Ice.Util.stringToIdentity("test3")); adapter.activate(); adapter2.activate(); diff --git a/csharp/test/Ice/location/TestI.cs b/csharp/test/Ice/location/TestI.cs index 665afb4bcc8..685fb0347fe 100644 --- a/csharp/test/Ice/location/TestI.cs +++ b/csharp/test/Ice/location/TestI.cs @@ -17,7 +17,7 @@ public class TestI : TestIntfDisp_ _adapter2 = adapter2; _registry = registry; - _registry.addObject(_adapter1.add(new HelloI(), adapter1.getCommunicator().stringToIdentity("hello"))); + _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello"))); } public override void shutdown(Ice.Current current) @@ -28,18 +28,18 @@ public class TestI : TestIntfDisp_ public override HelloPrx getHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } public override HelloPrx getReplicatedHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } public override void migrateHello(Ice.Current current) { - Ice.Identity id = _adapter1.getCommunicator().stringToIdentity("hello"); + Ice.Identity id = Ice.Util.stringToIdentity("hello"); try { _registry.addObject(_adapter2.add(_adapter1.remove(id), id)); diff --git a/csharp/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs index a89d462bf07..4d7c5ed6a6e 100644 --- a/csharp/test/Ice/metrics/Collocated.cs +++ b/csharp/test/Ice/metrics/Collocated.cs @@ -22,12 +22,12 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); //adapter.activate(); // Don't activate OA to ensure collocation is used. communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used. Test.MetricsPrx metrics = AllTests.allTests(communicator, _observer); diff --git a/csharp/test/Ice/metrics/Server.cs b/csharp/test/Ice/metrics/Server.cs index e969f4b8cfa..d76fbd4c8cf 100644 --- a/csharp/test/Ice/metrics/Server.cs +++ b/csharp/test/Ice/metrics/Server.cs @@ -22,12 +22,12 @@ public class Server public static int run(string[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/networkProxy/Server.cs b/csharp/test/Ice/networkProxy/Server.cs index ca2511d8e43..59d35c7831a 100644 --- a/csharp/test/Ice/networkProxy/Server.cs +++ b/csharp/test/Ice/networkProxy/Server.cs @@ -30,7 +30,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/objects/Collocated.cs b/csharp/test/Ice/objects/Collocated.cs index d401a85e47f..a18cbdba27f 100644 --- a/csharp/test/Ice/objects/Collocated.cs +++ b/csharp/test/Ice/objects/Collocated.cs @@ -24,9 +24,9 @@ public class Client communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); - adapter.add(initial, communicator.stringToIdentity("initial")); + adapter.add(initial, Ice.Util.stringToIdentity("initial")); UnexpectedObjectExceptionTestI uet = new UnexpectedObjectExceptionTestI(); - adapter.add(uet, communicator.stringToIdentity("uoet")); + adapter.add(uet, Ice.Util.stringToIdentity("uoet")); AllTests.allTests(communicator); // We must call shutdown even in the collocated case for cyclic dependency cleanup initial.shutdown(); diff --git a/csharp/test/Ice/objects/Server.cs b/csharp/test/Ice/objects/Server.cs index 494f9c300d1..58a5a7962b5 100644 --- a/csharp/test/Ice/objects/Server.cs +++ b/csharp/test/Ice/objects/Server.cs @@ -46,9 +46,9 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); - adapter.add(@object, communicator.stringToIdentity("initial")); + adapter.add(@object, Ice.Util.stringToIdentity("initial")); @object = new UnexpectedObjectExceptionTestI(); - adapter.add(@object, communicator.stringToIdentity("uoet")); + adapter.add(@object, Ice.Util.stringToIdentity("uoet")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/operations/Collocated.cs b/csharp/test/Ice/operations/Collocated.cs index d4c195517b4..91a9f66514e 100644 --- a/csharp/test/Ice/operations/Collocated.cs +++ b/csharp/test/Ice/operations/Collocated.cs @@ -23,7 +23,7 @@ public class Collocated communicator.getProperties().setProperty("TestAdapter.AdapterId", "test"); communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. if(prx.ice_getConnection() != null) diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs index 2b3ff2af6b8..cbaee32685b 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs @@ -314,7 +314,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { var p2 = p1; var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); response(new MyClass_OpMyClassResult( MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs index 3a7655e5878..bdba0cd1a3f 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs @@ -265,7 +265,7 @@ public sealed class MyDerivedClassTieI : MyDerivedClassOperations_ { var p2 = p1; var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); response(new MyClass_OpMyClassResult( MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassI.cs b/csharp/test/Ice/operations/MyDerivedClassI.cs index 9832f3ba57e..0ee8d245cb3 100644 --- a/csharp/test/Ice/operations/MyDerivedClassI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassI.cs @@ -223,7 +223,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { p2 = p1; p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/csharp/test/Ice/operations/MyDerivedClassTieI.cs b/csharp/test/Ice/operations/MyDerivedClassTieI.cs index 4ad9d672d48..9d349e125f8 100644 --- a/csharp/test/Ice/operations/MyDerivedClassTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassTieI.cs @@ -199,7 +199,7 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ { p2 = p1; p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( - current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + Ice.Util.stringToIdentity("noSuchIdentity"))); return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/csharp/test/Ice/operations/Server.cs b/csharp/test/Ice/operations/Server.cs index b59c2a4f9e2..75f43e12218 100644 --- a/csharp/test/Ice/operations/Server.cs +++ b/csharp/test/Ice/operations/Server.cs @@ -27,7 +27,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/operations/Twoways.cs b/csharp/test/Ice/operations/Twoways.cs index 968fc07a835..62052f924d5 100644 --- a/csharp/test/Ice/operations/Twoways.cs +++ b/csharp/test/Ice/operations/Twoways.cs @@ -248,9 +248,9 @@ class Twoways test(Ice.Util.proxyIdentityAndFacetCompare(c1, p) == 0); test(Ice.Util.proxyIdentityAndFacetCompare(c2, p) != 0); test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0); - test(c1.ice_getIdentity().Equals(communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().Equals(communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().Equals(communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); r.opVoid(); c1.opVoid(); try diff --git a/csharp/test/Ice/operations/TwowaysAMI.cs b/csharp/test/Ice/operations/TwowaysAMI.cs index bc7402a8745..73689588663 100644 --- a/csharp/test/Ice/operations/TwowaysAMI.cs +++ b/csharp/test/Ice/operations/TwowaysAMI.cs @@ -190,9 +190,9 @@ public class TwowaysAMI public void opMyClass(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2) { - test(c1.ice_getIdentity().Equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().Equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().Equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test"))); // // We can't do the callbacks below in connection serialization mode. diff --git a/csharp/test/Ice/optional/Server.cs b/csharp/test/Ice/optional/Server.cs index b4900b7e07a..dee39c8c23c 100644 --- a/csharp/test/Ice/optional/Server.cs +++ b/csharp/test/Ice/optional/Server.cs @@ -23,7 +23,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/optional/ServerAMD.cs b/csharp/test/Ice/optional/ServerAMD.cs index d23b4060462..814404845b2 100644 --- a/csharp/test/Ice/optional/ServerAMD.cs +++ b/csharp/test/Ice/optional/ServerAMD.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator.stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs index 0c4764650bd..c210c86cd57 100644 --- a/csharp/test/Ice/proxy/AllTests.cs +++ b/csharp/test/Ice/proxy/AllTests.cs @@ -254,11 +254,11 @@ public class AllTests : TestCommon.TestApp // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice.Identity id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\"); - Ice.Identity id2 = communicator.stringToIdentity(communicator.identityToString(id)); + Ice.Identity id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.Equals(id2)); id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"); - id2 = communicator.stringToIdentity(communicator.identityToString(id)); + id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.Equals(id2)); WriteLine("ok"); @@ -450,8 +450,14 @@ public class AllTests : TestCommon.TestApp WriteLine("ok"); Write("testing proxy methods... "); + +// Disable Obsolete warning/error +#pragma warning disable 612, 618 test(communicator.identityToString( baseProxy.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).Equals("other")); +#pragma warning restore 612, 618 + test(Ice.Util.identityToString( + baseProxy.ice_identity(Ice.Util.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()); diff --git a/csharp/test/Ice/proxy/Collocated.cs b/csharp/test/Ice/proxy/Collocated.cs index c161aa41a24..b13cb01b8ba 100644 --- a/csharp/test/Ice/proxy/Collocated.cs +++ b/csharp/test/Ice/proxy/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator); diff --git a/csharp/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs index 7015c9de392..4c30820cbb7 100644 --- a/csharp/test/Ice/proxy/Server.cs +++ b/csharp/test/Ice/proxy/Server.cs @@ -28,7 +28,7 @@ public class Server communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/retry/Collocated.cs b/csharp/test/Ice/retry/Collocated.cs index 6791089ceef..2fd9b6b8e8a 100644 --- a/csharp/test/Ice/retry/Collocated.cs +++ b/csharp/test/Ice/retry/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated private static void setupObjectAdapter(Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(""); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); } public static int run(string[] args, Ice.Communicator communicator, Ice.Communicator communicator2) diff --git a/csharp/test/Ice/retry/Server.cs b/csharp/test/Ice/retry/Server.cs index 5e2ef77792f..f0796f26ca9 100644 --- a/csharp/test/Ice/retry/Server.cs +++ b/csharp/test/Ice/retry/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/seqMapping/Collocated.cs b/csharp/test/Ice/seqMapping/Collocated.cs index 383d149ece2..4662e271666 100644 --- a/csharp/test/Ice/seqMapping/Collocated.cs +++ b/csharp/test/Ice/seqMapping/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, true); diff --git a/csharp/test/Ice/seqMapping/Server.cs b/csharp/test/Ice/seqMapping/Server.cs index cae559bf0c9..8e19d27c13f 100644 --- a/csharp/test/Ice/seqMapping/Server.cs +++ b/csharp/test/Ice/seqMapping/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/seqMapping/ServerAMD.cs b/csharp/test/Ice/seqMapping/ServerAMD.cs index cae559bf0c9..8e19d27c13f 100644 --- a/csharp/test/Ice/seqMapping/ServerAMD.cs +++ b/csharp/test/Ice/seqMapping/ServerAMD.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/servantLocator/Collocated.cs b/csharp/test/Ice/servantLocator/Collocated.cs index 66e39874c4a..b3acd7dfb99 100644 --- a/csharp/test/Ice/servantLocator/Collocated.cs +++ b/csharp/test/Ice/servantLocator/Collocated.cs @@ -28,8 +28,8 @@ public class Collocated Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); AllTests.allTests(communicator()); diff --git a/csharp/test/Ice/servantLocator/Server.cs b/csharp/test/Ice/servantLocator/Server.cs index 6c5d86bfc60..59d8df36ccd 100644 --- a/csharp/test/Ice/servantLocator/Server.cs +++ b/csharp/test/Ice/servantLocator/Server.cs @@ -28,8 +28,8 @@ public class Server Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); adapter.waitForDeactivate(); return 0; diff --git a/csharp/test/Ice/slicing/exceptions/Server.cs b/csharp/test/Ice/slicing/exceptions/Server.cs index bdd28e784e0..56bf9f925fb 100644 --- a/csharp/test/Ice/slicing/exceptions/Server.cs +++ b/csharp/test/Ice/slicing/exceptions/Server.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(); - adapter.add(@object, communicator.stringToIdentity("Test")); + adapter.add(@object, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/exceptions/ServerAMD.cs b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs index bdd28e784e0..56bf9f925fb 100644 --- a/csharp/test/Ice/slicing/exceptions/ServerAMD.cs +++ b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(); - adapter.add(@object, communicator.stringToIdentity("Test")); + adapter.add(@object, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/objects/Server.cs b/csharp/test/Ice/slicing/objects/Server.cs index 54109e72e98..89cca96fb72 100644 --- a/csharp/test/Ice/slicing/objects/Server.cs +++ b/csharp/test/Ice/slicing/objects/Server.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("Test")); + adapter.add(obj, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/slicing/objects/ServerAMD.cs b/csharp/test/Ice/slicing/objects/ServerAMD.cs index 54109e72e98..89cca96fb72 100644 --- a/csharp/test/Ice/slicing/objects/ServerAMD.cs +++ b/csharp/test/Ice/slicing/objects/ServerAMD.cs @@ -18,7 +18,7 @@ public class Server properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(); - adapter.add(obj, communicator.stringToIdentity("Test")); + adapter.add(obj, Ice.Util.stringToIdentity("Test")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/csharp/test/Ice/threadPoolPriority/Server.cs b/csharp/test/Ice/threadPoolPriority/Server.cs index 01b0638f3c7..fd2118c8587 100644 --- a/csharp/test/Ice/threadPoolPriority/Server.cs +++ b/csharp/test/Ice/threadPoolPriority/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new PriorityI(), communicator.stringToIdentity("test")); + adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs index 31e15a6e868..1acfd29bd16 100644 --- a/csharp/test/Ice/timeout/Server.cs +++ b/csharp/test/Ice/timeout/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); + adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout")); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/Ice/udp/Server.cs b/csharp/test/Ice/udp/Server.cs index 49886019a36..e43620fcaee 100644 --- a/csharp/test/Ice/udp/Server.cs +++ b/csharp/test/Ice/udp/Server.cs @@ -32,14 +32,14 @@ public class Server } properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter"); - adapter.add(new TestIntfI(), communicator.stringToIdentity("control")); + adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control")); adapter.activate(); if(port == 12010) { properties.setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter"); - adapter2.add(new TestIntfI(), communicator.stringToIdentity("test")); + adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); adapter2.activate(); } @@ -61,7 +61,7 @@ public class Server } properties.setProperty("McastTestAdapter.Endpoints", endpoint); Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter"); - mcastAdapter.add(new TestIntfI(), communicator.stringToIdentity("test")); + mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); mcastAdapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/IceBox/configuration/TestServiceI.cs b/csharp/test/IceBox/configuration/TestServiceI.cs index e4cda36804e..ae0754be56d 100644 --- a/csharp/test/IceBox/configuration/TestServiceI.cs +++ b/csharp/test/IceBox/configuration/TestServiceI.cs @@ -15,7 +15,7 @@ class TestServiceI : IceBox.Service start(string name, Ice.Communicator communicator, string[] args) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name + "OA"); - adapter.add(new TestI(args), communicator.stringToIdentity("test")); + adapter.add(new TestI(args), Ice.Util.stringToIdentity("test")); adapter.activate(); } diff --git a/csharp/test/IceDiscovery/simple/Server.cs b/csharp/test/IceDiscovery/simple/Server.cs index 998df8ca95d..4f423af28e8 100644 --- a/csharp/test/IceDiscovery/simple/Server.cs +++ b/csharp/test/IceDiscovery/simple/Server.cs @@ -36,7 +36,7 @@ public class Server properties.setProperty("ControlAdapter.ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter"); - adapter.add(new ControllerI(), communicator.stringToIdentity("controller" + num)); + adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num)); adapter.activate(); communicator.waitForShutdown(); diff --git a/csharp/test/IceGrid/simple/Server.cs b/csharp/test/IceGrid/simple/Server.cs index 34713234936..e5318a46cc1 100644 --- a/csharp/test/IceGrid/simple/Server.cs +++ b/csharp/test/IceGrid/simple/Server.cs @@ -25,7 +25,7 @@ public class Server args = communicator().getProperties().parseCommandLineOptions("TestAdapter", args); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); string id = communicator().getProperties().getPropertyWithDefault("Identity", "test"); - adapter.add(new TestI(), communicator().stringToIdentity(id)); + adapter.add(new TestI(), Ice.Util.stringToIdentity(id)); shutdownOnInterrupt(); try { diff --git a/csharp/test/IceSSL/configuration/Server.cs b/csharp/test/IceSSL/configuration/Server.cs index d0aed55ac65..636c41a8188 100644 --- a/csharp/test/IceSSL/configuration/Server.cs +++ b/csharp/test/IceSSL/configuration/Server.cs @@ -22,7 +22,7 @@ public class Server { communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new ServerFactoryI(), id); adapter.activate(); diff --git a/csharp/test/Slice/keyword/Client.cs b/csharp/test/Slice/keyword/Client.cs index 2d0728a94ee..686c7c3d6c4 100644 --- a/csharp/test/Slice/keyword/Client.cs +++ b/csharp/test/Slice/keyword/Client.cs @@ -145,26 +145,26 @@ public class Client { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new decimalI(), communicator.stringToIdentity("test")); - adapter.add(new Test1I(), communicator.stringToIdentity("test1")); - adapter.add(new Test2I(), communicator.stringToIdentity("test2")); + adapter.add(new decimalI(), Ice.Util.stringToIdentity("test")); + adapter.add(new Test1I(), Ice.Util.stringToIdentity("test1")); + adapter.add(new Test2I(), Ice.Util.stringToIdentity("test2")); adapter.activate(); Console.Out.Write("testing operation name... "); Console.Out.Flush(); @abstract.@decimalPrx p = @abstract.@decimalPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test"))); + adapter.createProxy(Ice.Util.stringToIdentity("test"))); p.@default(); Console.Out.WriteLine("ok"); Console.Out.Write("testing System as module name... "); Console.Out.Flush(); @abstract.System.TestPrx t1 = @abstract.System.TestPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test1"))); + adapter.createProxy(Ice.Util.stringToIdentity("test1"))); t1.op(); System.TestPrx t2 = System.TestPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test2"))); + adapter.createProxy(Ice.Util.stringToIdentity("test2"))); t2.op(); Console.Out.WriteLine("ok"); |