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

22 files changed, 86 insertions, 2 deletions

diff --git a/py/demo/Glacier2/callback/Client.py b/py/demo/Glacier2/callback/Client.py
index 6b5a2ed7de9..5fae89a493b 100644
--- a/py/demo/Glacier2/callback/Client.py
+++ b/py/demo/Glacier2/callback/Client.py
@@ -33,6 +33,10 @@ class CallbackReceiverI(Demo.CallbackReceiver):
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         defaultRouter = self.communicator().getDefaultRouter()
         if not defaultRouter:
             print self.appName() + ": no default router set"
diff --git a/py/demo/Glacier2/callback/Server.py b/py/demo/Glacier2/callback/Server.py
index 9e0a95b1407..d573b946b4d 100644
--- a/py/demo/Glacier2/callback/Server.py
+++ b/py/demo/Glacier2/callback/Server.py
@@ -27,6 +27,10 @@ class CallbackI(Demo.Callback):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Callback.Server")
         adapter.add(CallbackI(), self.communicator().stringToIdentity("callback"))
         adapter.activate()
diff --git a/py/demo/Glacier2/callback/SessionServer.py b/py/demo/Glacier2/callback/SessionServer.py
index 456e680b949..b00118ae3ac 100644
--- a/py/demo/Glacier2/callback/SessionServer.py
+++ b/py/demo/Glacier2/callback/SessionServer.py
@@ -31,6 +31,10 @@ class SessionManagerI(Glacier2.SessionManager):
 
 class SessionServer(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("SessionServer")
         adapter.add(DummyPermissionsVerifierI(), self.communicator().stringToIdentity("verifier"))
         adapter.add(SessionManagerI(), self.communicator().stringToIdentity("sessionmanager"))
diff --git a/py/demo/Ice/async/Client.py b/py/demo/Ice/async/Client.py
index 0c3f1e2782e..25dfc34fcbe 100644
--- a/py/demo/Ice/async/Client.py
+++ b/py/demo/Ice/async/Client.py
@@ -36,6 +36,10 @@ x: exit
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         hello = Demo.HelloPrx.checkedCast(self.communicator().propertyToProxy('Hello.Proxy'))
         if not hello:
             print args[0] + ": invalid proxy"
diff --git a/py/demo/Ice/async/Server.py b/py/demo/Ice/async/Server.py
index b753a1f1959..b6013a2d2c1 100755
--- a/py/demo/Ice/async/Server.py
+++ b/py/demo/Ice/async/Server.py
@@ -86,6 +86,10 @@ class HelloI(Demo.Hello):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         self.callbackOnInterrupt()
 
         adapter = self.communicator().createObjectAdapter("Hello")
diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py
index 464d77510ef..1e2df11d9ec 100644
--- a/py/demo/Ice/bidir/Client.py
+++ b/py/demo/Ice/bidir/Client.py
@@ -30,6 +30,10 @@ class CallbackReceiverI(Demo.CallbackReceiver):
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         server = Demo.CallbackSenderPrx.checkedCast(self.communicator().propertyToProxy('Callback.Client.CallbackServer'))
         if not server:
             print self.appName() + ": invalid proxy"
diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py
index 82a2c159948..ba020178dbc 100644
--- a/py/demo/Ice/bidir/Server.py
+++ b/py/demo/Ice/bidir/Server.py
@@ -88,6 +88,10 @@ class CallbackSenderI(Demo.CallbackSender, threading.Thread):
                         
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Callback.Server")
         sender = CallbackSenderI(self.communicator())
         adapter.add(sender, self.communicator().stringToIdentity("sender"))
diff --git a/py/demo/Ice/callback/Client.py b/py/demo/Ice/callback/Client.py
index 598fe413740..77f3f9679a5 100644
--- a/py/demo/Ice/callback/Client.py
+++ b/py/demo/Ice/callback/Client.py
@@ -34,6 +34,10 @@ class CallbackReceiverI(Demo.CallbackReceiver):
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         base = self.communicator().propertyToProxy('Callback.CallbackServer')
         twoway = Demo.CallbackSenderPrx.checkedCast(base.ice_twoway().ice_timeout(-1).ice_secure(False))
         if not twoway:
diff --git a/py/demo/Ice/callback/Server.py b/py/demo/Ice/callback/Server.py
index e17449e5cd5..ee4927b79fa 100644
--- a/py/demo/Ice/callback/Server.py
+++ b/py/demo/Ice/callback/Server.py
@@ -30,6 +30,10 @@ class CallbackSenderI(Demo.CallbackSender):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Callback.Server")
         adapter.add(CallbackSenderI(), self.communicator().stringToIdentity("callback"))
         adapter.activate()
diff --git a/py/demo/Ice/hello/Client.py b/py/demo/Ice/hello/Client.py
index 48e7711f2b9..e4c8b61f2f7 100644
--- a/py/demo/Ice/hello/Client.py
+++ b/py/demo/Ice/hello/Client.py
@@ -32,6 +32,10 @@ x: exit
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         twoway = Demo.HelloPrx.checkedCast(\
             self.communicator().propertyToProxy('Hello.Proxy').ice_twoway().ice_timeout(-1).ice_secure(False))
         if not twoway:
diff --git a/py/demo/Ice/hello/Server.py b/py/demo/Ice/hello/Server.py
index 950084036cb..e9448d47c65 100644
--- a/py/demo/Ice/hello/Server.py
+++ b/py/demo/Ice/hello/Server.py
@@ -24,6 +24,10 @@ class HelloI(Demo.Hello):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Hello")
         adapter.add(HelloI(), self.communicator().stringToIdentity("hello"))
         adapter.activate()
diff --git a/py/demo/Ice/latency/Client.py b/py/demo/Ice/latency/Client.py
index de05de06f20..c7152e3f7ff 100644
--- a/py/demo/Ice/latency/Client.py
+++ b/py/demo/Ice/latency/Client.py
@@ -15,6 +15,10 @@ import Demo
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         ping = Demo.PingPrx.checkedCast(self.communicator().propertyToProxy('Latency.Ping'))
         if not ping:
             print "invalid proxy"
diff --git a/py/demo/Ice/latency/Server.py b/py/demo/Ice/latency/Server.py
index 34e5af410ed..8d5ab6e9df0 100644
--- a/py/demo/Ice/latency/Server.py
+++ b/py/demo/Ice/latency/Server.py
@@ -15,6 +15,10 @@ import Demo
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Latency")
         adapter.add(Demo.Ping(), self.communicator().stringToIdentity("ping"))
         adapter.activate()
diff --git a/py/demo/Ice/minimal/Client.py b/py/demo/Ice/minimal/Client.py
index e28df0fa862..c1584eaef66 100644
--- a/py/demo/Ice/minimal/Client.py
+++ b/py/demo/Ice/minimal/Client.py
@@ -19,7 +19,7 @@ try:
     communicator = Ice.initialize(sys.argv)
     hello = Demo.HelloPrx.checkedCast(communicator.stringToProxy("hello:tcp -p 10000"))
     if not hello:
-        print args[0] + ": invalid proxy"
+        print sys.argv[0] + ": invalid proxy"
         status = 1
     else:
         hello.sayHello()
diff --git a/py/demo/Ice/session/Client.py b/py/demo/Ice/session/Client.py
index bcc83b3eadc..243c8f4f582 100644
--- a/py/demo/Ice/session/Client.py
+++ b/py/demo/Ice/session/Client.py
@@ -46,6 +46,10 @@ class SessionRefreshThread(threading.Thread):
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         while True:
             name = raw_input("Please enter your name ==> ").strip()
             if len(name) != 0:
diff --git a/py/demo/Ice/session/Server.py b/py/demo/Ice/session/Server.py
index 49180cdc6f3..f08be12f48b 100644
--- a/py/demo/Ice/session/Server.py
+++ b/py/demo/Ice/session/Server.py
@@ -166,6 +166,10 @@ class SessionFactoryI(Demo.SessionFactory):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("SessionFactory")
         reaper = ReapThread()
         reaper.start()
diff --git a/py/demo/Ice/throughput/Client.py b/py/demo/Ice/throughput/Client.py
index 6466304e129..1e647f50bd2 100644
--- a/py/demo/Ice/throughput/Client.py
+++ b/py/demo/Ice/throughput/Client.py
@@ -37,6 +37,10 @@ x: exit
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         throughput = Demo.ThroughputPrx.checkedCast(self.communicator().propertyToProxy('Throughput.Throughput'))
         if not throughput:
             print args[0] + ": invalid proxy"
diff --git a/py/demo/Ice/throughput/Server.py b/py/demo/Ice/throughput/Server.py
index 18ef839ccae..1bcd148b300 100644
--- a/py/demo/Ice/throughput/Server.py
+++ b/py/demo/Ice/throughput/Server.py
@@ -104,6 +104,10 @@ class ThroughputI(Demo.Throughput):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Throughput")
         adapter.add(ThroughputI(), self.communicator().stringToIdentity("throughput"))
         adapter.activate()
diff --git a/py/demo/Ice/value/Client.py b/py/demo/Ice/value/Client.py
index f226622e8ce..07458024745 100644
--- a/py/demo/Ice/value/Client.py
+++ b/py/demo/Ice/value/Client.py
@@ -29,6 +29,10 @@ class ObjectFactory(Ice.ObjectFactory):
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         base = self.communicator().propertyToProxy('Value.Initial')
         initial = Demo.InitialPrx.checkedCast(base)
         if not initial:
diff --git a/py/demo/Ice/value/Server.py b/py/demo/Ice/value/Server.py
index faa1b81c412..d36c15d8950 100644
--- a/py/demo/Ice/value/Server.py
+++ b/py/demo/Ice/value/Server.py
@@ -45,7 +45,11 @@ class InitialI(Demo.Initial):
         current.adapter.getCommunicator().shutdown()
 
 class Server(Ice.Application):
-    def run(self, argv):
+    def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         adapter = self.communicator().createObjectAdapter("Value")
         adapter.add(InitialI(adapter), self.communicator().stringToIdentity("initial"))
         adapter.activate()
diff --git a/py/demo/IceGrid/simple/Client.py b/py/demo/IceGrid/simple/Client.py
index 4da93c56a7c..28ab2de751c 100644
--- a/py/demo/IceGrid/simple/Client.py
+++ b/py/demo/IceGrid/simple/Client.py
@@ -25,6 +25,10 @@ x: exit
 
 class Client(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         hello = None
         try:
             hello = Demo.HelloPrx.checkedCast(self.communicator().stringToProxy("hello"))
diff --git a/py/demo/IceGrid/simple/Server.py b/py/demo/IceGrid/simple/Server.py
index bf2dc212601..908e3d9783c 100644
--- a/py/demo/IceGrid/simple/Server.py
+++ b/py/demo/IceGrid/simple/Server.py
@@ -26,6 +26,10 @@ class HelloI(Demo.Hello):
 
 class Server(Ice.Application):
     def run(self, args):
+        if len(args) > 1:
+            print self.appName() + ": too many arguments"
+            return 1
+
         properties = self.communicator().getProperties()
         adapter = self.communicator().createObjectAdapter("Hello")
         id = self.communicator().stringToIdentity(properties.getProperty("Identity"))