bug 1831 - changed demos as well to warn about extra arguments

31 files changed, 188 insertions, 1 deletions

diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java
index 241094c10d5..95676245128 100644
--- a/java/demo/Freeze/bench/Client.java
+++ b/java/demo/Freeze/bench/Client.java
@@ -539,6 +539,12 @@ class TestApp extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         _connection = Freeze.Util.createConnection(communicator(), _envName);
 
         System.out.println("IntIntMap (Collections API)");
diff --git a/java/demo/Freeze/casino/Client.java b/java/demo/Freeze/casino/Client.java
index 22cbf451f48..51ec08da9f8 100644
--- a/java/demo/Freeze/casino/Client.java
+++ b/java/demo/Freeze/casino/Client.java
@@ -36,6 +36,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         java.util.Random random = new java.util.Random();
 
         System.out.print("Retrieve bank and players... ");
diff --git a/java/demo/Freeze/casino/Server.java b/java/demo/Freeze/casino/Server.java
index 197fca6d127..05536825f1d 100644
--- a/java/demo/Freeze/casino/Server.java
+++ b/java/demo/Freeze/casino/Server.java
@@ -53,6 +53,12 @@ class CasinoServer extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.Properties properties = communicator().getProperties();
 
         _bankEdge = properties.getPropertyAsInt("Bank.Edge");
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 5cc738ac37e..91e7fbf1039 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -12,6 +12,12 @@ class LibraryServer extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.Properties properties = communicator().getProperties();
     
         //
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 3e2e56144b8..bd4b3860875 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -12,6 +12,12 @@ class PhoneBookServer extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.Properties properties = communicator().getProperties();
 
         //
diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java
index 234da64efce..670518f1be0 100644
--- a/java/demo/Glacier2/callback/Client.java
+++ b/java/demo/Glacier2/callback/Client.java
@@ -46,6 +46,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Glacier2/callback/Server.java b/java/demo/Glacier2/callback/Server.java
index 6c994eec66a..9ba94be6397 100644
--- a/java/demo/Glacier2/callback/Server.java
+++ b/java/demo/Glacier2/callback/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server");
         adapter.add(new CallbackI(), communicator().stringToIdentity("callback"));
         adapter.activate();
diff --git a/java/demo/Glacier2/callback/SessionServer.java b/java/demo/Glacier2/callback/SessionServer.java
index 5f3bf6d1464..683e0bdf1eb 100644
--- a/java/demo/Glacier2/callback/SessionServer.java
+++ b/java/demo/Glacier2/callback/SessionServer.java
@@ -24,6 +24,12 @@ public class SessionServer
         public int
         run(String[] args)
         {
+            if(args.length > 0)
+            {
+                System.err.println(appName() + ": too many arguments");
+                return 1;
+            }
+
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("SessionServer");
             adapter.add(new DummyPermissionVerifierI(), communicator().stringToIdentity("verifier"));
             adapter.add(new SessionManagerI(), communicator().stringToIdentity("sessionmanager"));
diff --git a/java/demo/Ice/async/Client.java b/java/demo/Ice/async/Client.java
index 4d2a8c37027..6959206ce71 100644
--- a/java/demo/Ice/async/Client.java
+++ b/java/demo/Ice/async/Client.java
@@ -67,6 +67,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/async/Server.java b/java/demo/Ice/async/Server.java
index 20b023af2d5..f7ba0f127eb 100644
--- a/java/demo/Ice/async/Server.java
+++ b/java/demo/Ice/async/Server.java
@@ -24,6 +24,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         setInterruptHook(new ShutdownHook());
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java
index 84c4989a6e5..6940da54055 100755
--- a/java/demo/Ice/bidir/Client.java
+++ b/java/demo/Ice/bidir/Client.java
@@ -14,6 +14,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         CallbackSenderPrx server = 
             CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer"));
         if(server == null)
diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java
index 47106babf54..71a28bbc6c3 100755
--- a/java/demo/Ice/bidir/Server.java
+++ b/java/demo/Ice/bidir/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server");
         CallbackSenderI sender = new CallbackSenderI(communicator());
         adapter.add(sender, communicator().stringToIdentity("sender"));
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index 5bc4d0d6919..adc036dafd7 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -47,6 +47,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java
index f15d4b864c3..4da1acbeb93 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server");
         adapter.add(new CallbackSenderI(), communicator().stringToIdentity("callback"));
         adapter.activate();
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index 9b05b8f22ef..cb8f29a5e68 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -49,6 +49,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index 4ae8c229b5a..06f6576471c 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
         adapter.add(new HelloI(), communicator().stringToIdentity("hello"));
         adapter.activate();
diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index 1d6cb450fab..f9f5b97be9f 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -49,6 +49,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java
index 7ae4debe2ac..6f8bc9fde5b 100644
--- a/java/demo/Ice/invoke/Server.java
+++ b/java/demo/Ice/invoke/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Printer");
         adapter.add(new PrinterI(), communicator().stringToIdentity("printer"));
         adapter.activate();
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index f82adedd9df..62881a929f6 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -14,6 +14,12 @@ class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Latency.Ping"));
         if(ping == null)
         {
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index df4b7ae45c7..205b6409b5a 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Latency");
         adapter.add(new Ping(), communicator().stringToIdentity("ping"));
         adapter.activate();
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index bce1f84955b..fb40cf4ab4d 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -36,6 +36,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java
index 47be59b9127..2eb2a1bf102 100644
--- a/java/demo/Ice/nested/Server.java
+++ b/java/demo/Ice/nested/Server.java
@@ -14,8 +14,15 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Nested.Server");
-        NestedPrx self = NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedServer")));
+        NestedPrx self =
+            NestedPrxHelper.uncheckedCast(adapter.createProxy(communicator().stringToIdentity("nestedServer")));
         adapter.add(new NestedI(self), communicator().stringToIdentity("nestedServer"));
         adapter.activate();
         communicator().waitForShutdown();
diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java
index 75df4006336..9a94251341a 100644
--- a/java/demo/Ice/session/Client.java
+++ b/java/demo/Ice/session/Client.java
@@ -93,6 +93,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/session/Server.java b/java/demo/Ice/session/Server.java
index 59bd60dc08f..42a2a1a82ef 100644
--- a/java/demo/Ice/session/Server.java
+++ b/java/demo/Ice/session/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("SessionFactory");
         ReapThread reaper = new ReapThread();
         reaper.start();
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 5a5c431afaf..df257056665 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -54,6 +54,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java
index 00701cfff9b..ee6a5a9d73f 100644
--- a/java/demo/Ice/throughput/Server.java
+++ b/java/demo/Ice/throughput/Server.java
@@ -14,6 +14,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Throughput");
         adapter.add(new ThroughputI(), communicator().stringToIdentity("throughput"));
         adapter.activate();
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index f677b16e737..39a01f61aea 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -43,6 +43,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index 79bb4ed06de..b0d55dd443b 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -12,6 +12,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Value");
         Ice.Object object = new InitialI(adapter);
         adapter.add(object, communicator().stringToIdentity("initial"));
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index 57db06b79ca..10d4d523d6d 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -45,6 +45,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/IceGrid/simple/Client.java b/java/demo/IceGrid/simple/Client.java
index 58ed8b8a64d..a1df5507543 100644
--- a/java/demo/IceGrid/simple/Client.java
+++ b/java/demo/IceGrid/simple/Client.java
@@ -41,6 +41,12 @@ public class Client extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         //
         // Since this is an interactive demo we want to clear the
         // Application installed interrupt callback and install our
diff --git a/java/demo/IceGrid/simple/Server.java b/java/demo/IceGrid/simple/Server.java
index 1c7722e7a71..b7b67e2388c 100644
--- a/java/demo/IceGrid/simple/Server.java
+++ b/java/demo/IceGrid/simple/Server.java
@@ -12,6 +12,12 @@ public class Server extends Ice.Application
     public int
     run(String[] args)
     {
+        if(args.length > 0)
+        {
+            System.err.println(appName() + ": too many arguments");
+            return 1;
+        }
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
         Ice.Properties properties = communicator().getProperties();
         Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));