diff options
Diffstat (limited to 'java/demo')
27 files changed, 41 insertions, 34 deletions
diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java index 6cecf6ed8c6..eef5dcdb598 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -35,7 +35,7 @@ class LibraryCollocated extends Ice.Application // Create the library, and add it to the Object Adapter. // LibraryI library = new LibraryI(communicator(), _envName, "authors", evictor); - adapter.add(library, Ice.Util.stringToIdentity("library")); + adapter.add(library, communicator().stringToIdentity("library")); // // Create and install a factory and initializer for books. diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index b5c6c536f67..957eae01534 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -35,7 +35,7 @@ class LibraryServer extends Ice.Application // Create the library, and add it to the object adapter. // LibraryI library = new LibraryI(communicator(), _envName, "authors", evictor); - adapter.add(library, Ice.Util.stringToIdentity("library")); + adapter.add(library, communicator().stringToIdentity("library")); // // Create and install a factory for books. diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java index 0be1002ea22..79e81882395 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -63,7 +63,7 @@ class PhoneBookCollocated extends Ice.Application // Create the phonebook, and add it to the Object Adapter. // PhoneBookI phoneBook = new PhoneBookI(evictor, contactFactory, index); - adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook")); + adapter.add(phoneBook, communicator().stringToIdentity("phonebook")); // // Everything ok, let's go. diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 91b3d558b55..dbb871fce97 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -63,7 +63,7 @@ class PhoneBookServer extends Ice.Application // Create the phonebook, and add it to the object adapter. // PhoneBookI phoneBook = new PhoneBookI(evictor, contactFactory, index); - adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook")); + adapter.add(phoneBook, communicator().stringToIdentity("phonebook")); // // Everything ok, let's go. diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java index f46a389f370..48020f1556a 100644 --- a/java/demo/Glacier2/callback/Client.java +++ b/java/demo/Glacier2/callback/Client.java @@ -195,7 +195,7 @@ public class Client extends Ice.Application } System.out.println("callback receiver identity: " + - Ice.Util.identityToString(twowayR.ice_getIdentity())); + communicator().identityToString(twowayR.ice_getIdentity())); } else if(line.equals("s")) { diff --git a/java/demo/Glacier2/callback/Server.java b/java/demo/Glacier2/callback/Server.java index 205a1f242c2..186cbcb47ec 100644 --- a/java/demo/Glacier2/callback/Server.java +++ b/java/demo/Glacier2/callback/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server"); - adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback")); + adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Glacier2/callback/SessionServer.java b/java/demo/Glacier2/callback/SessionServer.java index cc1e5d8a1ce..286a7ee7df4 100644 --- a/java/demo/Glacier2/callback/SessionServer.java +++ b/java/demo/Glacier2/callback/SessionServer.java @@ -25,8 +25,8 @@ public class SessionServer run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("SessionServer"); - adapter.add(new DummyPermissionVerifierI(), Ice.Util.stringToIdentity("verifier")); - adapter.add(new SessionManagerI(), Ice.Util.stringToIdentity("sessionmanager")); + adapter.add(new DummyPermissionVerifierI(), communicator().stringToIdentity("verifier")); + adapter.add(new SessionManagerI(), communicator().stringToIdentity("sessionmanager")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java index e0571088893..dfa01811ecb 100755 --- a/java/demo/Ice/bidir/CallbackSenderI.java +++ b/java/demo/Ice/bidir/CallbackSenderI.java @@ -11,6 +11,11 @@ import Demo.*; class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable { + CallbackSenderI(Ice.Communicator communicator) + { + _communicator = communicator; + } + synchronized public void destroy() { @@ -23,7 +28,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable synchronized public void addClient(Ice.Identity ident, Ice.Current current) { - System.out.println("adding client `" + Ice.Util.identityToString(ident) + "'"); + System.out.println("adding client `" + _communicator.identityToString(ident) + "'"); Ice.ObjectPrx base = current.con.createProxy(ident); CallbackReceiverPrx client = CallbackReceiverPrxHelper.uncheckedCast(base); @@ -57,7 +62,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable } catch(Exception ex) { - System.out.println("removing client `" + Ice.Util.identityToString(r.ice_getIdentity()) + "':"); + System.out.println("removing client `" + _communicator.identityToString(r.ice_getIdentity()) + "':"); ex.printStackTrace(); p.remove(); } @@ -66,6 +71,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable } } + private Ice.Communicator _communicator; private boolean _destroy = false; private int _num = 0; private java.util.Vector _clients = new java.util.Vector(); diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java index 950433cd3df..6e6df3aa858 100755 --- a/java/demo/Ice/bidir/Server.java +++ b/java/demo/Ice/bidir/Server.java @@ -16,7 +16,7 @@ public class Server extends Ice.Application { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server"); CallbackSenderI sender = new CallbackSenderI(); - adapter.add(sender, Ice.Util.stringToIdentity("sender")); + adapter.add(sender, communicator().stringToIdentity("sender")); adapter.activate(); Thread t = new Thread(sender); diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java index 025c6f4a5db..98beff052c8 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -53,12 +53,12 @@ public class Client extends Ice.Application CallbackSenderPrx batchDatagram = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_batchDatagram()); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Client"); - adapter.add(new CallbackReceiverI(), Ice.Util.stringToIdentity("callbackReceiver")); + adapter.add(new CallbackReceiverI(), communicator().stringToIdentity("callbackReceiver")); adapter.activate(); CallbackReceiverPrx twowayR = CallbackReceiverPrxHelper.uncheckedCast(adapter.createProxy( - Ice.Util.stringToIdentity("callbackReceiver"))); + communicator().stringToIdentity("callbackReceiver"))); CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway()); CallbackReceiverPrx datagramR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_datagram()); diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java index b743dbbad84..15d7ba964f8 100644 --- a/java/demo/Ice/callback/Server.java +++ b/java/demo/Ice/callback/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server"); - adapter.add(new CallbackSenderI(), Ice.Util.stringToIdentity("callback")); + adapter.add(new CallbackSenderI(), communicator().stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index 8d6b80a5536..f75aec33b8a 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello"); - adapter.add(new HelloI(), Ice.Util.stringToIdentity("hello")); + adapter.add(new HelloI(), communicator().stringToIdentity("hello")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java index 966f6aad221..cdf2104af92 100644 --- a/java/demo/Ice/invoke/Server.java +++ b/java/demo/Ice/invoke/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Printer"); - adapter.add(new PrinterI(), Ice.Util.stringToIdentity("printer")); + adapter.add(new PrinterI(), communicator().stringToIdentity("printer")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index ebfa99d0797..e21b610572f 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Latency"); - adapter.add(new Ping(), Ice.Util.stringToIdentity("ping")); + adapter.add(new Ping(), communicator().stringToIdentity("ping")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/minimal/Server.java b/java/demo/Ice/minimal/Server.java index 82fd99294e7..47a34498cdd 100755 --- a/java/demo/Ice/minimal/Server.java +++ b/java/demo/Ice/minimal/Server.java @@ -15,7 +15,7 @@ public class Server run(String[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -p 10000"); - adapter.add(new HelloI(), Ice.Util.stringToIdentity("hello")); + adapter.add(new HelloI(), communicator.stringToIdentity("hello")); adapter.activate(); communicator.waitForShutdown(); return 0; diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index c3215782ffd..96addcfb717 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -31,8 +31,8 @@ public class Client extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Nested.Client"); - NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("nestedClient"))); - adapter.add(new NestedI(self), Ice.Util.stringToIdentity("nestedClient")); + NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedClient"))); + adapter.add(new NestedI(self), communicator().stringToIdentity("nestedClient")); adapter.activate(); System.out.println("Note: The maximum nesting level is sz * 2, with sz being"); diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java index c305579ddce..af93218a5f8 100644 --- a/java/demo/Ice/nested/NestedClient.java +++ b/java/demo/Ice/nested/NestedClient.java @@ -31,8 +31,8 @@ class NestedClient extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Nested.Client"); - NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("nestedClient"))); - adapter.add(new NestedI(self), Ice.Util.stringToIdentity("nestedClient")); + NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedClient"))); + adapter.add(new NestedI(self), communicator().stringToIdentity("nestedClient")); adapter.activate(); System.out.println("Note: The maximum nesting level is sz * 2, with sz being"); diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java index 3fd560012ab..1259c0e8e81 100644 --- a/java/demo/Ice/nested/NestedServer.java +++ b/java/demo/Ice/nested/NestedServer.java @@ -15,8 +15,8 @@ class NestedServer extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Nested.Server"); - NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("nestedServer"))); - adapter.add(new NestedI(self), Ice.Util.stringToIdentity("nestedServer")); + NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedServer"))); + adapter.add(new NestedI(self), communicator().stringToIdentity("nestedServer")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java index 91cae195227..49c50f00525 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -15,8 +15,8 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Nested.Server"); - NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("nestedServer"))); - adapter.add(new NestedI(self), Ice.Util.stringToIdentity("nestedServer")); + NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedServer"))); + adapter.add(new NestedI(self), communicator().stringToIdentity("nestedServer")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/session/Server.java b/java/demo/Ice/session/Server.java index 58877b9fe9e..7129f757488 100644 --- a/java/demo/Ice/session/Server.java +++ b/java/demo/Ice/session/Server.java @@ -18,7 +18,7 @@ public class Server extends Ice.Application ReapThread reaper = new ReapThread(); reaper.start(); - adapter.add(new SessionFactoryI(reaper), Ice.Util.stringToIdentity("SessionFactory")); + adapter.add(new SessionFactoryI(reaper), communicator().stringToIdentity("SessionFactory")); adapter.activate(); communicator().waitForShutdown(); diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java index 8caf6b71d53..7bba2ca9488 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -15,7 +15,7 @@ public class Server extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Throughput"); - adapter.add(new ThroughputI(), Ice.Util.stringToIdentity("throughput")); + adapter.add(new ThroughputI(), communicator().stringToIdentity("throughput")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java index 2e725928e9d..f9634900f68 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -14,7 +14,7 @@ public class Server extends Ice.Application { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Value"); Ice.Object object = new InitialI(adapter); - adapter.add(object, Ice.Util.stringToIdentity("initial")); + adapter.add(object, communicator().stringToIdentity("initial")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/demo/IceBox/hello/HelloServiceI.java b/java/demo/IceBox/hello/HelloServiceI.java index a6c6bd22001..040f0321a31 100644 --- a/java/demo/IceBox/hello/HelloServiceI.java +++ b/java/demo/IceBox/hello/HelloServiceI.java @@ -13,7 +13,7 @@ public class HelloServiceI extends Ice.LocalObjectImpl implements IceBox.Service start(String name, Ice.Communicator communicator, String[] args) { _adapter = communicator.createObjectAdapter(name); - _adapter.add(new HelloI(), Ice.Util.stringToIdentity("hello")); + _adapter.add(new HelloI(), communicator.stringToIdentity("hello")); _adapter.activate(); } diff --git a/java/demo/IceGrid/simple/Server.java b/java/demo/IceGrid/simple/Server.java index c069bc00ad1..5ad0ec96c4d 100644 --- a/java/demo/IceGrid/simple/Server.java +++ b/java/demo/IceGrid/simple/Server.java @@ -14,7 +14,7 @@ public class Server extends Ice.Application { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello"); Ice.Properties properties = communicator().getProperties(); - Ice.Identity id = Ice.Util.stringToIdentity(properties.getProperty("Identity")); + Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity")); adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id); adapter.activate(); communicator().waitForShutdown(); diff --git a/java/demo/book/printer/Server.java b/java/demo/book/printer/Server.java index d1919a97e06..0547d76058a 100755 --- a/java/demo/book/printer/Server.java +++ b/java/demo/book/printer/Server.java @@ -21,7 +21,7 @@ public class Server { Ice.Object object = new PrinterI(); adapter.add( object, - Ice.Util.stringToIdentity("SimplePrinter")); + ic.stringToIdentity("SimplePrinter")); adapter.activate(); ic.waitForShutdown(); } catch (Exception e) { diff --git a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java b/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java index 44e6c5a9a3e..e4200b11ac8 100755 --- a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java +++ b/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java @@ -21,7 +21,8 @@ public final class DirectoryI extends _DirectoryDisp // Create an identity. The parent has the fixed identity "/" // - Ice.Identity myID = Ice.Util.stringToIdentity(_parent != null ? Ice.Util.generateUUID() : "RootDir"); + Ice.Identity myID = + _adapter.getCommunicator().stringToIdentity(_parent != null ? Ice.Util.generateUUID() : "RootDir"); // Add the identity to the object adapter // diff --git a/java/demo/book/simple_filesystem/Filesystem/FileI.java b/java/demo/book/simple_filesystem/Filesystem/FileI.java index b8a7b888141..d77fa50ac1d 100755 --- a/java/demo/book/simple_filesystem/Filesystem/FileI.java +++ b/java/demo/book/simple_filesystem/Filesystem/FileI.java @@ -23,7 +23,7 @@ public class FileI extends _FileDisp // Create an identity // - Ice.Identity myID = Ice.Util.stringToIdentity(Ice.Util.generateUUID()); + Ice.Identity myID = _adapter.getCommunicator().stringToIdentity(Ice.Util.generateUUID()); // Add the identity to the object adapter // |