Bug 4244 - simplify callback demo

4 files changed, 10 insertions, 83 deletions

diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index 4928f346213..43847ea951b 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -32,13 +32,7 @@ public class Client extends Ice.Application
     {
         System.out.println(
             "usage:\n" +
-            "t: send callback as twoway\n" +
-            "o: send callback as oneway\n" +
-            "O: send callback as batch oneway\n" +
-            "d: send callback as datagram\n" +
-            "D: send callback as batch datagram\n" +
-            "f: flush all batch requests\n" +
-            "S: switch secure mode on/off\n" +
+            "t: send callback\n" +
             "s: shutdown server\n" +
             "x: exit\n" +
             "?: help\n");
@@ -60,31 +54,22 @@ public class Client extends Ice.Application
         //
         setInterruptHook(new ShutdownHook());
 
-        CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast(
+        CallbackSenderPrx sender = CallbackSenderPrxHelper.checkedCast(
             communicator().propertyToProxy("CallbackSender.Proxy").
                 ice_twoway().ice_timeout(-1).ice_secure(false));
-        if(twoway == null)
+        if(sender == null)
         {
             System.err.println("invalid proxy");
             return 1;
         }
-        CallbackSenderPrx oneway = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_oneway());
-        CallbackSenderPrx batchOneway = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_batchOneway());
-        CallbackSenderPrx datagram = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_datagram());
-        CallbackSenderPrx batchDatagram = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_batchDatagram());
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Client");
         adapter.add(new CallbackReceiverI(), communicator().stringToIdentity("callbackReceiver"));
         adapter.activate();
 
-        CallbackReceiverPrx twowayR = 
+        CallbackReceiverPrx receiver = 
             CallbackReceiverPrxHelper.uncheckedCast(adapter.createProxy(
                 communicator().stringToIdentity("callbackReceiver")));
-        CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
-        CallbackReceiverPrx datagramR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_datagram());
-
-        boolean secure = false;
-        String secureStr = "";
 
         menu();
 
@@ -104,69 +89,11 @@ public class Client extends Ice.Application
                 }
                 if(line.equals("t"))
                 {
-                    twoway.initiateCallback(twowayR);
-                }
-                else if(line.equals("o"))
-                {
-                    oneway.initiateCallback(onewayR);
-                }
-                else if(line.equals("O"))
-                {
-                    batchOneway.initiateCallback(onewayR);
-                }
-                else if(line.equals("d"))
-                {
-                    if(secure)
-                    {
-                        System.out.println("secure datagrams are not supported");
-                    }
-                    else
-                    {
-                        datagram.initiateCallback(datagramR);
-                    }
-                }
-                else if(line.equals("D"))
-                {
-                    if(secure)
-                    {
-                        System.out.println("secure datagrams are not supported");
-                    }
-                    else
-                    {
-                        batchDatagram.initiateCallback(datagramR);
-                    }
-                }
-                else if(line.equals("S"))
-                {
-                    secure = !secure;
-                    secureStr = secure ? "s" : "";
-
-                    twoway = CallbackSenderPrxHelper.uncheckedCast(twoway.ice_secure(secure));
-                    oneway = CallbackSenderPrxHelper.uncheckedCast(oneway.ice_secure(secure));
-                    batchOneway = CallbackSenderPrxHelper.uncheckedCast(batchOneway.ice_secure(secure));
-                    datagram = CallbackSenderPrxHelper.uncheckedCast(datagram.ice_secure(secure));
-                    batchDatagram = CallbackSenderPrxHelper.uncheckedCast(batchDatagram.ice_secure(secure));
-
-                    twowayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_secure(secure));
-                    onewayR = CallbackReceiverPrxHelper.uncheckedCast(onewayR.ice_secure(secure));
-                    datagramR = CallbackReceiverPrxHelper.uncheckedCast(datagramR.ice_secure(secure));
-
-                    if(secure)
-                    {
-                        System.out.println("secure mode is now on");
-                    }
-                    else
-                    {
-                        System.out.println("secure mode is now off");
-                    }
-                }
-                else if(line.equals("f"))
-                {
-                    communicator().flushBatchRequests();
+                    sender.initiateCallback(receiver);
                 }
                 else if(line.equals("s"))
                 {
-                    twoway.shutdown();
+                    sender.shutdown();
                 }
                 else if(line.equals("x"))
                 {
diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java
index 293f95f002c..3c93bf3fe13 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/Server.java
@@ -21,7 +21,7 @@ public class Server extends Ice.Application
         }
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server");
-        adapter.add(new CallbackSenderI(), communicator().stringToIdentity("callback"));
+        adapter.add(new CallbackSenderI(), communicator().stringToIdentity("callbackSender"));
         adapter.activate();
         communicator().waitForShutdown();
         return 0;
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
index 19804b15607..d138919f5a3 100644
--- a/java/demo/Ice/callback/config.client
+++ b/java/demo/Ice/callback/config.client
@@ -2,14 +2,14 @@
 # The client reads this property to create the reference to the
 # "CallbackSender" object in the server.
 #
-CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+CallbackSender.Proxy=callbackSender:default -p 10000
 
 #
 # The client creates one single object adapter with the name
 # "Callback.Client". The following line sets the endpoints for this
 # adapter.
 #
-Callback.Client.Endpoints=tcp:udp:ssl
+Callback.Client.Endpoints=default
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index 8cbf6a72a4b..b7c69a101f7 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -3,7 +3,7 @@
 # "Callback.Server". The following line sets the endpoints for this
 # adapter.
 #
-Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Callback.Server.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions