diff options
153 files changed, 863 insertions, 6 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Client.cpp b/cpp/demo/Database/Oracle/occi/Client.cpp index 569fdf620fc..d0501a5c9e4 100644 --- a/cpp/demo/Database/Oracle/occi/Client.cpp +++ b/cpp/demo/Database/Oracle/occi/Client.cpp @@ -159,6 +159,12 @@ HRClient::help() const int HRClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectPrx base = communicator()->propertyToProxy("HR.DeptFactory"); _factory = DeptFactoryPrx::checkedCast(base); if(_factory == 0) diff --git a/cpp/demo/Database/Oracle/occi/Server.cpp b/cpp/demo/Database/Oracle/occi/Server.cpp index c9ae7f42d0b..461f1b3de0c 100644 --- a/cpp/demo/Database/Oracle/occi/Server.cpp +++ b/cpp/demo/Database/Oracle/occi/Server.cpp @@ -33,6 +33,12 @@ main(int argc, char* argv[]) int HRServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + const string username = communicator()->getProperties()->getPropertyWithDefault("Oracle.Username", "scott"); const string password = communicator()->getProperties()->getPropertyWithDefault("Oracle.Password", "password"); const string connectString = communicator()->getProperties()->getProperty("Oracle.ConnectString"); diff --git a/cpp/demo/Database/Oracle/proc/Client.cpp b/cpp/demo/Database/Oracle/proc/Client.cpp index 569fdf620fc..d0501a5c9e4 100644 --- a/cpp/demo/Database/Oracle/proc/Client.cpp +++ b/cpp/demo/Database/Oracle/proc/Client.cpp @@ -159,6 +159,12 @@ HRClient::help() const int HRClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectPrx base = communicator()->propertyToProxy("HR.DeptFactory"); _factory = DeptFactoryPrx::checkedCast(base); if(_factory == 0) diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp index 2c49ab7750a..81c69701b78 100644 --- a/cpp/demo/Freeze/backup/Client.cpp +++ b/cpp/demo/Freeze/backup/Client.cpp @@ -31,6 +31,11 @@ main(int argc, char* argv[]) initData.properties->load("config"); Ice::CommunicatorPtr communicator = Ice::initialize(argc, argv, initData); + if(argc > 1) + { + cerr << argv[0] << ": too many arguments" << endl; + return EXIT_FAILURE; + } Freeze::ConnectionPtr connection = Freeze::createConnection(communicator, "backup"); IntLongMap m(connection, "IntLongMap", true); diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 916e9938c48..e1ec5b2014e 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -718,6 +718,12 @@ typedef IceUtil::Handle<MyFactory> MyFactoryPtr; int TestApp::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Freeze/casino/Client.cpp b/cpp/demo/Freeze/casino/Client.cpp index 0e219fc25b3..9c13546750e 100644 --- a/cpp/demo/Freeze/casino/Client.cpp +++ b/cpp/demo/Freeze/casino/Client.cpp @@ -31,8 +31,13 @@ main(int argc, char* argv[]) int CasinoClient::run(int argc, char* argv[]) - { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + cout << "Retrieve bank and players... " << flush; Casino::BankPrx bank = Casino::BankPrx::uncheckedCast(communicator()->propertyToProxy("Bank.Proxy")); diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp index d43d0bbce18..c515a26609c 100644 --- a/cpp/demo/Freeze/casino/Server.cpp +++ b/cpp/demo/Freeze/casino/Server.cpp @@ -73,6 +73,12 @@ public: int CasinoServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); _bankEdge = properties->getPropertyAsInt("Bank.Edge"); diff --git a/cpp/demo/Freeze/customEvictor/Client.cpp b/cpp/demo/Freeze/customEvictor/Client.cpp index 45c0ddae829..66c3b804bdf 100644 --- a/cpp/demo/Freeze/customEvictor/Client.cpp +++ b/cpp/demo/Freeze/customEvictor/Client.cpp @@ -140,6 +140,12 @@ typedef IceUtil::Handle<WriterThread> WriterThreadPtr; int WarehouseClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Retrieve a proxy to one item (any item will do). // diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp index f7e729422f8..35bc9831c0b 100644 --- a/cpp/demo/Freeze/library/Server.cpp +++ b/cpp/demo/Freeze/library/Server.cpp @@ -39,6 +39,12 @@ main(int argc, char* argv[]) int LibraryServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); // diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp index a86f334225d..c6a69e0658d 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -40,6 +40,12 @@ main(int argc, char* argv[]) int PhoneBookServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); // diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index baf24c50747..e37e899c472 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -48,6 +48,12 @@ menu() int CallbackClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Glacier2/callback/Server.cpp b/cpp/demo/Glacier2/callback/Server.cpp index e87ea8d51cd..27378592325 100644 --- a/cpp/demo/Glacier2/callback/Server.cpp +++ b/cpp/demo/Glacier2/callback/Server.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server"); adapter->add(new CallbackI, communicator()->stringToIdentity("callback")); adapter->activate(); diff --git a/cpp/demo/Glacier2/callback/SessionServer.cpp b/cpp/demo/Glacier2/callback/SessionServer.cpp index 9a1a8b42603..87616b82bda 100644 --- a/cpp/demo/Glacier2/callback/SessionServer.cpp +++ b/cpp/demo/Glacier2/callback/SessionServer.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int SessionServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionServer"); adapter->add(new DummyPermissionsVerifierI, communicator()->stringToIdentity("verifier")); adapter->add(new SessionManagerI, communicator()->stringToIdentity("sessionmanager")); diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp index 3f56a9845f4..75aeac9e946 100755 --- a/cpp/demo/Glacier2/chat/Client.cpp +++ b/cpp/demo/Glacier2/chat/Client.cpp @@ -94,6 +94,12 @@ public: virtual int run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Glacier2/chat/Server.cpp b/cpp/demo/Glacier2/chat/Server.cpp index df7d382e3ab..2e6bf28d926 100755 --- a/cpp/demo/Glacier2/chat/Server.cpp +++ b/cpp/demo/Glacier2/chat/Server.cpp @@ -30,8 +30,14 @@ class ChatServer : public Ice::Application public: virtual int - run(int, char*[]) + run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("ChatServer"); adapter->add(new ChatSessionManagerI, communicator()->stringToIdentity("ChatSessionManager")); diff --git a/cpp/demo/Ice/async/Client.cpp b/cpp/demo/Ice/async/Client.cpp index 41d0ce37b8f..ae0f8127b00 100644 --- a/cpp/demo/Ice/async/Client.cpp +++ b/cpp/demo/Ice/async/Client.cpp @@ -49,6 +49,12 @@ main(int argc, char* argv[]) int AsyncClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + callbackOnInterrupt(); HelloPrx hello = HelloPrx::checkedCast(communicator()->propertyToProxy("Hello.Proxy")); diff --git a/cpp/demo/Ice/async/Server.cpp b/cpp/demo/Ice/async/Server.cpp index 86e9f3ef0c1..960a9021639 100644 --- a/cpp/demo/Ice/async/Server.cpp +++ b/cpp/demo/Ice/async/Server.cpp @@ -35,6 +35,12 @@ main(int argc, char* argv[]) int AsyncServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + callbackOnInterrupt(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp index af4d074ae19..83e10d076db 100644 --- a/cpp/demo/Ice/bidir/Client.cpp +++ b/cpp/demo/Ice/bidir/Client.cpp @@ -42,6 +42,12 @@ main(int argc, char* argv[]) int CallbackClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + CallbackSenderPrx server = CallbackSenderPrx::checkedCast(communicator()->propertyToProxy("Callback.Client.CallbackServer")); if(!server) diff --git a/cpp/demo/Ice/bidir/Server.cpp b/cpp/demo/Ice/bidir/Server.cpp index a9be1e67ced..e027eb97184 100644 --- a/cpp/demo/Ice/bidir/Server.cpp +++ b/cpp/demo/Ice/bidir/Server.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server"); CallbackSenderIPtr sender = new CallbackSenderI(communicator()); adapter->add(sender, communicator()->stringToIdentity("sender")); diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp index 86d0ddc8633..51e1ac627f0 100644 --- a/cpp/demo/Ice/callback/Client.cpp +++ b/cpp/demo/Ice/callback/Client.cpp @@ -55,6 +55,12 @@ main(int argc, char* argv[]) int CallbackClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp index 4ed8704cf33..86e99772f15 100644 --- a/cpp/demo/Ice/callback/Server.cpp +++ b/cpp/demo/Ice/callback/Server.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server"); adapter->add(new CallbackSenderI, communicator()->stringToIdentity("callback")); adapter->activate(); diff --git a/cpp/demo/Ice/converter/Client.cpp b/cpp/demo/Ice/converter/Client.cpp index 1632fbd6713..a0f27f15462 100644 --- a/cpp/demo/Ice/converter/Client.cpp +++ b/cpp/demo/Ice/converter/Client.cpp @@ -30,6 +30,12 @@ menu() int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator1, const Ice::CommunicatorPtr& communicator2) { + if(argc > 1) + { + cerr << argv[0] << ": too many arguments" << endl; + return EXIT_FAILURE; + } + const string proxyProperty = "Echo.Proxy"; EchoPrx echo1 = EchoPrx::checkedCast(communicator1->propertyToProxy(proxyProperty)); if(!echo1) diff --git a/cpp/demo/Ice/converter/Server.cpp b/cpp/demo/Ice/converter/Server.cpp index 6b8b34e7f8a..909881a6df6 100644 --- a/cpp/demo/Ice/converter/Server.cpp +++ b/cpp/demo/Ice/converter/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int EchoServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Echo"); adapter->add(new EchoI, communicator()->stringToIdentity("echo")); adapter->activate(); diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index dbf877722d9..1620c93f7c0 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -35,6 +35,12 @@ main(int argc, char* argv[]) int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp index 55ebb19bafb..b802ef77f4b 100644 --- a/cpp/demo/Ice/hello/Server.cpp +++ b/cpp/demo/Ice/hello/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int HelloServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); adapter->add(new HelloI, communicator()->stringToIdentity("hello")); adapter->activate(); diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp index ebaa4c59d40..37200231d12 100644 --- a/cpp/demo/Ice/invoke/Client.cpp +++ b/cpp/demo/Ice/invoke/Client.cpp @@ -53,6 +53,12 @@ operator<<(ostream& out, Demo::Color c) int InvokeClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/invoke/Server.cpp b/cpp/demo/Ice/invoke/Server.cpp index 19d4ce49db9..f52ee443f20 100644 --- a/cpp/demo/Ice/invoke/Server.cpp +++ b/cpp/demo/Ice/invoke/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int InvokeServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Printer"); adapter->add(new PrinterI, communicator()->stringToIdentity("printer")); adapter->activate(); diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp index f479159a5e7..ce5cae636d1 100644 --- a/cpp/demo/Ice/latency/Client.cpp +++ b/cpp/demo/Ice/latency/Client.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int LatencyClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectPrx base = communicator()->propertyToProxy("Latency.Ping"); PingPrx ping = PingPrx::checkedCast(base); if(!ping) diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index 661d4546285..42ca2801af0 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int LatencyServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Latency"); Ice::ObjectPtr object = new Ping; adapter->add(new Ping, communicator()->stringToIdentity("ping")); diff --git a/cpp/demo/Ice/minimal/Client.cpp b/cpp/demo/Ice/minimal/Client.cpp index 583379642ef..e585d82bb74 100644 --- a/cpp/demo/Ice/minimal/Client.cpp +++ b/cpp/demo/Ice/minimal/Client.cpp @@ -22,6 +22,11 @@ main(int argc, char* argv[]) try { communicator = Ice::initialize(argc, argv); + if(argc > 1) + { + cerr << argv[0] << ": too many arguments" << endl; + return EXIT_FAILURE; + } HelloPrx hello = HelloPrx::checkedCast(communicator->stringToProxy("hello:tcp -p 10000")); if(!hello) { diff --git a/cpp/demo/Ice/minimal/Server.cpp b/cpp/demo/Ice/minimal/Server.cpp index 7446f6fefa4..d1fb9a2c56e 100644 --- a/cpp/demo/Ice/minimal/Server.cpp +++ b/cpp/demo/Ice/minimal/Server.cpp @@ -43,6 +43,11 @@ main(int argc, char* argv[]) try { communicator = Ice::initialize(argc, argv); + if(argc > 1) + { + cerr << argv[0] << ": too many arguments" << endl; + return EXIT_FAILURE; + } Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("Hello", "tcp -p 10000"); adapter->add(new HelloI, communicator->stringToIdentity("hello")); adapter->activate(); diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index 54cb2291601..ee847b59b99 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -32,6 +32,12 @@ main(int argc, char* argv[]) int NestedClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp index 55e94593fdd..66e6e1d1f40 100644 --- a/cpp/demo/Ice/nested/Server.cpp +++ b/cpp/demo/Ice/nested/Server.cpp @@ -30,6 +30,12 @@ main(int argc, char* argv[]) int NestedServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Nested.Server"); NestedPrx self = NestedPrx::uncheckedCast(adapter->createProxy(communicator()->stringToIdentity("nestedServer"))); adapter->add(new NestedI(self), communicator()->stringToIdentity("nestedServer")); diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp index c8cf00f4d87..0918c345d5b 100755 --- a/cpp/demo/Ice/session/Client.cpp +++ b/cpp/demo/Ice/session/Client.cpp @@ -104,6 +104,12 @@ main(int argc, char* argv[]) int SessionClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/session/Server.cpp b/cpp/demo/Ice/session/Server.cpp index 26fac7a72fe..6480d8aa433 100644 --- a/cpp/demo/Ice/session/Server.cpp +++ b/cpp/demo/Ice/session/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int SessionServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionFactory"); ReapThreadPtr reaper = new ReapThread(); diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp index 6b7bb071aaa..82a3e621e69 100644 --- a/cpp/demo/Ice/throughput/Client.cpp +++ b/cpp/demo/Ice/throughput/Client.cpp @@ -37,6 +37,12 @@ main(int argc, char* argv[]) int ThroughputClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp index d48074ef88f..efe336cb22b 100644 --- a/cpp/demo/Ice/throughput/Server.cpp +++ b/cpp/demo/Ice/throughput/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int ThroughputServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Throughput"); adapter->add(new ThroughputI, communicator()->stringToIdentity("throughput")); adapter->activate(); diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index e37a48aa349..b8278e40d36 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -32,6 +32,12 @@ main(int argc, char* argv[]) int ValueClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp index a7e51791c21..7ef649c1a05 100644 --- a/cpp/demo/Ice/value/Server.cpp +++ b/cpp/demo/Ice/value/Server.cpp @@ -29,6 +29,12 @@ main(int argc, char* argv[]) int ValueServer::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Value"); adapter->add(new InitialI(adapter), communicator()->stringToIdentity("initial")); adapter->activate(); diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index 4b879387b9d..f7e9e331cd8 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -51,6 +51,12 @@ HelloClient::menu() int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp index 1ef1098d320..0931f7be051 100644 --- a/cpp/demo/IceGrid/allocate/Client.cpp +++ b/cpp/demo/IceGrid/allocate/Client.cpp @@ -93,6 +93,12 @@ main(int argc, char* argv[]) int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + int status = EXIT_SUCCESS; // diff --git a/cpp/demo/IceGrid/allocate/Server.cpp b/cpp/demo/IceGrid/allocate/Server.cpp index c28d440de70..a2a578e2b5e 100644 --- a/cpp/demo/IceGrid/allocate/Server.cpp +++ b/cpp/demo/IceGrid/allocate/Server.cpp @@ -31,6 +31,12 @@ main(int argc, char* argv[]) int Server::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity")); diff --git a/cpp/demo/IceGrid/replication/Client.cpp b/cpp/demo/IceGrid/replication/Client.cpp index 12d8f4634a1..1596e19c6b0 100644 --- a/cpp/demo/IceGrid/replication/Client.cpp +++ b/cpp/demo/IceGrid/replication/Client.cpp @@ -37,6 +37,12 @@ main(int argc, char* argv[]) int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/IceGrid/replication/Server.cpp b/cpp/demo/IceGrid/replication/Server.cpp index c28d440de70..a2a578e2b5e 100644 --- a/cpp/demo/IceGrid/replication/Server.cpp +++ b/cpp/demo/IceGrid/replication/Server.cpp @@ -31,6 +31,12 @@ main(int argc, char* argv[]) int Server::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity")); diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp index 7fe2f6a2283..bfbd01497c4 100644 --- a/cpp/demo/IceGrid/sessionActivation/Client.cpp +++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp @@ -93,6 +93,12 @@ main(int argc, char* argv[]) int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + int status = EXIT_SUCCESS; // diff --git a/cpp/demo/IceGrid/sessionActivation/Server.cpp b/cpp/demo/IceGrid/sessionActivation/Server.cpp index c28d440de70..a2a578e2b5e 100644 --- a/cpp/demo/IceGrid/sessionActivation/Server.cpp +++ b/cpp/demo/IceGrid/sessionActivation/Server.cpp @@ -31,6 +31,12 @@ main(int argc, char* argv[]) int Server::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity")); diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp index 5528bdad6b7..c865ef4d239 100644 --- a/cpp/demo/IceGrid/simple/Client.cpp +++ b/cpp/demo/IceGrid/simple/Client.cpp @@ -47,6 +47,12 @@ HelloClient::menu() int HelloClient::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + // // Since this is an interactive demo we want the custom interrupt // callback to be called when the process is interrupted. diff --git a/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp index c28d440de70..a2a578e2b5e 100644 --- a/cpp/demo/IceGrid/simple/Server.cpp +++ b/cpp/demo/IceGrid/simple/Server.cpp @@ -31,6 +31,12 @@ main(int argc, char* argv[]) int Server::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity")); diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp index 3ebe93ed502..bebf2b72b76 100644 --- a/cpp/demo/IceStorm/clock/Publisher.cpp +++ b/cpp/demo/IceStorm/clock/Publisher.cpp @@ -52,6 +52,13 @@ Publisher::run(int argc, char* argv[]) catch(const IceUtil::BadOptException& e) { cerr << argv[0] << ": " << e.reason << endl; + usage(appName()); + return EXIT_FAILURE; + } + if(remaining.size() > 1) + { + cerr << appName() << ": too many arguments" << endl; + usage(appName()); return EXIT_FAILURE; } diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp index dd520822900..9b757574841 100644 --- a/cpp/demo/IceStorm/clock/Subscriber.cpp +++ b/cpp/demo/IceStorm/clock/Subscriber.cpp @@ -70,6 +70,12 @@ Subscriber::run(int argc, char* argv[]) usage(appName()); return EXIT_FAILURE; } + if(remaining.size() > 1) + { + cerr << appName() << ": too many arguments" << endl; + usage(appName()); + return EXIT_FAILURE; + } IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast( communicator()->propertyToProxy("IceStorm.TopicManager.Proxy")); diff --git a/cpp/demo/IceStorm/counter/Client.cpp b/cpp/demo/IceStorm/counter/Client.cpp index 8e68c5e8ba0..1c683e1c95c 100644 --- a/cpp/demo/IceStorm/counter/Client.cpp +++ b/cpp/demo/IceStorm/counter/Client.cpp @@ -34,6 +34,12 @@ main(int argc, char* argv[]) int Client::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); const string proxyProperty = "Counter.Proxy"; diff --git a/cpp/demo/IceStorm/counter/Server.cpp b/cpp/demo/IceStorm/counter/Server.cpp index 58a3dd64824..e0a88ba157b 100644 --- a/cpp/demo/IceStorm/counter/Server.cpp +++ b/cpp/demo/IceStorm/counter/Server.cpp @@ -34,6 +34,12 @@ main(int argc, char* argv[]) int Server::run(int argc, char* argv[]) { + if(argc > 1) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); const string proxyProperty = "IceStorm.TopicManager.Proxy"; diff --git a/cpp/demo/IceStorm/replicated/Publisher.cpp b/cpp/demo/IceStorm/replicated/Publisher.cpp index b128421d38b..a66737882b8 100644 --- a/cpp/demo/IceStorm/replicated/Publisher.cpp +++ b/cpp/demo/IceStorm/replicated/Publisher.cpp @@ -34,6 +34,12 @@ main(int argc, char* argv[]) int Publisher::run(int argc, char* argv[]) { + if(argc > 2) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); IceStorm::TopicManagerPrx manager = diff --git a/cpp/demo/IceStorm/replicated/Subscriber.cpp b/cpp/demo/IceStorm/replicated/Subscriber.cpp index 839e8e40aca..34d036052f0 100644 --- a/cpp/demo/IceStorm/replicated/Subscriber.cpp +++ b/cpp/demo/IceStorm/replicated/Subscriber.cpp @@ -160,6 +160,12 @@ main(int argc, char* argv[]) int Subscriber::run(int argc, char* argv[]) { + if(argc > 2) + { + cerr << appName() << ": too many arguments" << endl; + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator()->getProperties(); IceGrid::QueryPrx query = IceGrid::QueryPrx::uncheckedCast(communicator()->stringToProxy("DemoIceGrid/Query")); diff --git a/cpp/test/Slice/keyword/.gitignore b/cpp/test/Slice/keyword/.gitignore new file mode 100644 index 00000000000..0e03bd06e7e --- /dev/null +++ b/cpp/test/Slice/keyword/.gitignore @@ -0,0 +1,6 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +client +Key.cpp +Key.h diff --git a/cppe/demo/IceE/bidir/Client.cpp b/cppe/demo/IceE/bidir/Client.cpp index fbf1672ca3f..0d25cfda889 100644 --- a/cppe/demo/IceE/bidir/Client.cpp +++ b/cppe/demo/IceE/bidir/Client.cpp @@ -27,6 +27,12 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator->getProperties(); const char* proxyProperty = "Callback.Client.CallbackServer"; string proxy = properties->getProperty(proxyProperty); diff --git a/cppe/demo/IceE/bidir/Server.cpp b/cppe/demo/IceE/bidir/Server.cpp index b36fcc060eb..4fe3b3fd912 100644 --- a/cppe/demo/IceE/bidir/Server.cpp +++ b/cppe/demo/IceE/bidir/Server.cpp @@ -15,6 +15,12 @@ using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Callback.Server"); CallbackSenderIPtr sender = new CallbackSenderI(communicator); adapter->add(sender, communicator->stringToIdentity("sender")); diff --git a/cppe/demo/IceE/callback/Client.cpp b/cppe/demo/IceE/callback/Client.cpp index b5141ecd724..628d01667f6 100644 --- a/cppe/demo/IceE/callback/Client.cpp +++ b/cppe/demo/IceE/callback/Client.cpp @@ -40,6 +40,12 @@ menu() int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator->getProperties(); const char* proxyProperty = "Callback.Client.CallbackServer"; string proxy = properties->getProperty(proxyProperty); diff --git a/cppe/demo/IceE/callback/Server.cpp b/cppe/demo/IceE/callback/Server.cpp index e773fb2d75e..e7a5b8478fe 100644 --- a/cppe/demo/IceE/callback/Server.cpp +++ b/cppe/demo/IceE/callback/Server.cpp @@ -16,6 +16,12 @@ using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Callback.Server"); adapter->add(new CallbackSenderI, communicator->stringToIdentity("callback")); adapter->activate(); diff --git a/cppe/demo/IceE/chat/Client.cpp b/cppe/demo/IceE/chat/Client.cpp index f8c94225f40..965c57913cc 100755 --- a/cppe/demo/IceE/chat/Client.cpp +++ b/cppe/demo/IceE/chat/Client.cpp @@ -49,6 +49,12 @@ trim(const string& s) int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::RouterPrx defaultRouter = communicator->getDefaultRouter(); if(!defaultRouter) { diff --git a/cppe/demo/IceE/hello/Client.cpp b/cppe/demo/IceE/hello/Client.cpp index c0a77e54c03..22e5a7805cf 100644 --- a/cppe/demo/IceE/hello/Client.cpp +++ b/cppe/demo/IceE/hello/Client.cpp @@ -33,6 +33,12 @@ menu() int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator->getProperties(); const char* proxyProperty = "Hello.Proxy"; string proxy = properties->getProperty(proxyProperty); diff --git a/cppe/demo/IceE/hello/Server.cpp b/cppe/demo/IceE/hello/Server.cpp index a9c5dcd8c7e..62b7bfbd82f 100644 --- a/cppe/demo/IceE/hello/Server.cpp +++ b/cppe/demo/IceE/hello/Server.cpp @@ -15,6 +15,12 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Hello"); Ice::ObjectPtr object = new HelloI; adapter->add(object, communicator->stringToIdentity("hello")); diff --git a/cppe/demo/IceE/latency/Client.cpp b/cppe/demo/IceE/latency/Client.cpp index cc5da096040..51c90353e92 100644 --- a/cppe/demo/IceE/latency/Client.cpp +++ b/cppe/demo/IceE/latency/Client.cpp @@ -16,6 +16,12 @@ using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator->getProperties(); const char* proxyProperty = "Latency.Proxy"; string proxy = properties->getProperty(proxyProperty); diff --git a/cppe/demo/IceE/latency/Server.cpp b/cppe/demo/IceE/latency/Server.cpp index 8f6074f5e3a..29c9feedff9 100644 --- a/cppe/demo/IceE/latency/Server.cpp +++ b/cppe/demo/IceE/latency/Server.cpp @@ -22,6 +22,12 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Latency"); adapter->add(new PingI, communicator->stringToIdentity("ping")); adapter->activate(); diff --git a/cppe/demo/IceE/minimal/Client.cpp b/cppe/demo/IceE/minimal/Client.cpp index b6d8a0a0138..06dfe344bdd 100644 --- a/cppe/demo/IceE/minimal/Client.cpp +++ b/cppe/demo/IceE/minimal/Client.cpp @@ -22,6 +22,12 @@ menu() int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::PropertiesPtr properties = communicator->getProperties(); const char* proxyProperty = "Hello.Proxy"; string proxy = properties->getProperty(proxyProperty); diff --git a/cppe/demo/IceE/minimal/Server.cpp b/cppe/demo/IceE/minimal/Server.cpp index 2d7545aaaba..e157f85df4c 100644 --- a/cppe/demo/IceE/minimal/Server.cpp +++ b/cppe/demo/IceE/minimal/Server.cpp @@ -27,6 +27,12 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { + if(argc > 1) + { + fprintf(stderr, "%s: too many arguments\n", argv[0]); + return EXIT_FAILURE; + } + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Hello"); Ice::ObjectPtr object = new HelloI; adapter->add(object, communicator->stringToIdentity("hello")); diff --git a/cs/demo/Glacier2/callback/Client.cs b/cs/demo/Glacier2/callback/Client.cs index c5f0fc9f1ee..2d0d1603d6d 100644 --- a/cs/demo/Glacier2/callback/Client.cs +++ b/cs/demo/Glacier2/callback/Client.cs @@ -30,6 +30,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.RouterPrx defaultRouter = communicator().getDefaultRouter(); if(defaultRouter == null) { diff --git a/cs/demo/Glacier2/callback/Server.cs b/cs/demo/Glacier2/callback/Server.cs index 6b8b66bdd2d..6c21d3aa2fa 100644 --- a/cs/demo/Glacier2/callback/Server.cs +++ b/cs/demo/Glacier2/callback/Server.cs @@ -13,6 +13,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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/cs/demo/Glacier2/callback/SessionServer.cs b/cs/demo/Glacier2/callback/SessionServer.cs index 760d9f93042..fae448e1ca3 100644 --- a/cs/demo/Glacier2/callback/SessionServer.cs +++ b/cs/demo/Glacier2/callback/SessionServer.cs @@ -23,6 +23,12 @@ public class SessionServer : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(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/cs/demo/Ice/async/Client.cs b/cs/demo/Ice/async/Client.cs index e1149f464fe..03e103907bd 100644 --- a/cs/demo/Ice/async/Client.cs +++ b/cs/demo/Ice/async/Client.cs @@ -45,6 +45,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + HelloPrx hello = HelloPrxHelper.checkedCast(communicator().propertyToProxy("Hello.Proxy")); if(hello == null) { diff --git a/cs/demo/Ice/async/Server.cs b/cs/demo/Ice/async/Server.cs index b48c51fb4d9..637ca4ecae5 100644 --- a/cs/demo/Ice/async/Server.cs +++ b/cs/demo/Ice/async/Server.cs @@ -11,6 +11,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + callbackOnInterrupt(); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello"); diff --git a/cs/demo/Ice/bidir/Client.cs b/cs/demo/Ice/bidir/Client.cs index aad7f1f82c6..ca67763b2bf 100755 --- a/cs/demo/Ice/bidir/Client.cs +++ b/cs/demo/Ice/bidir/Client.cs @@ -13,6 +13,12 @@ public class Client : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + CallbackSenderPrx server = CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer")); if(server == null) diff --git a/cs/demo/Ice/bidir/Server.cs b/cs/demo/Ice/bidir/Server.cs index 692ffc7e7cc..d0557d1f73e 100755 --- a/cs/demo/Ice/bidir/Server.cs +++ b/cs/demo/Ice/bidir/Server.cs @@ -14,6 +14,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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/cs/demo/Ice/callback/Client.cs b/cs/demo/Ice/callback/Client.cs index 0da8b352d0f..de2398bad9d 100755 --- a/cs/demo/Ice/callback/Client.cs +++ b/cs/demo/Ice/callback/Client.cs @@ -32,6 +32,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + try { communicator().getPluginManager().getPlugin("IceSSL"); diff --git a/cs/demo/Ice/callback/Server.cs b/cs/demo/Ice/callback/Server.cs index 3a0d39e5462..cf6161d43f7 100755 --- a/cs/demo/Ice/callback/Server.cs +++ b/cs/demo/Ice/callback/Server.cs @@ -13,6 +13,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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/cs/demo/Ice/hello/Client.cs b/cs/demo/Ice/hello/Client.cs index 98eef16d0d1..6d38d66a399 100755 --- a/cs/demo/Ice/hello/Client.cs +++ b/cs/demo/Ice/hello/Client.cs @@ -36,6 +36,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + try { communicator().getPluginManager().getPlugin("IceSSL"); diff --git a/cs/demo/Ice/hello/Server.cs b/cs/demo/Ice/hello/Server.cs index d448fcb08dd..a76ccdf91a9 100755 --- a/cs/demo/Ice/hello/Server.cs +++ b/cs/demo/Ice/hello/Server.cs @@ -11,6 +11,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello"); adapter.add(new HelloI(), communicator().stringToIdentity("hello")); adapter.activate(); diff --git a/cs/demo/Ice/invoke/Client.cs b/cs/demo/Ice/invoke/Client.cs index 32bd0a60679..de179a7623e 100644 --- a/cs/demo/Ice/invoke/Client.cs +++ b/cs/demo/Ice/invoke/Client.cs @@ -33,6 +33,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectPrx obj = communicator().propertyToProxy("Printer.Proxy"); menu(); diff --git a/cs/demo/Ice/invoke/Server.cs b/cs/demo/Ice/invoke/Server.cs index bc0756b6069..391da945ead 100644 --- a/cs/demo/Ice/invoke/Server.cs +++ b/cs/demo/Ice/invoke/Server.cs @@ -15,6 +15,12 @@ public class Server : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Printer"); adapter.add(new PrinterI(), communicator().stringToIdentity("printer")); adapter.activate(); diff --git a/cs/demo/Ice/latency/Client.cs b/cs/demo/Ice/latency/Client.cs index 8f6e1cca9f8..7ccc6030710 100755 --- a/cs/demo/Ice/latency/Client.cs +++ b/cs/demo/Ice/latency/Client.cs @@ -15,6 +15,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Latency.Ping")); if(ping == null) { diff --git a/cs/demo/Ice/latency/Server.cs b/cs/demo/Ice/latency/Server.cs index eda3b2dc289..b71d419b879 100755 --- a/cs/demo/Ice/latency/Server.cs +++ b/cs/demo/Ice/latency/Server.cs @@ -15,6 +15,12 @@ public class Server : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Latency"); adapter.add(new Ping(), communicator().stringToIdentity("ping")); adapter.activate(); diff --git a/cs/demo/Ice/minimal/Client.cs b/cs/demo/Ice/minimal/Client.cs index 5653bed8ac4..d12a510485c 100755 --- a/cs/demo/Ice/minimal/Client.cs +++ b/cs/demo/Ice/minimal/Client.cs @@ -20,6 +20,11 @@ public class Client try { communicator = Ice.Util.initialize(ref args); + if(args.Length > 0) + { + System.Console.Error.WriteLine("too many arguments"); + System.Environment.Exit(1); + } HelloPrx hello = HelloPrxHelper.checkedCast(communicator.stringToProxy("hello:tcp -p 10000")); if(hello == null) { diff --git a/cs/demo/Ice/minimal/Server.cs b/cs/demo/Ice/minimal/Server.cs index 2de0577c4b7..2e6239ef433 100755 --- a/cs/demo/Ice/minimal/Server.cs +++ b/cs/demo/Ice/minimal/Server.cs @@ -19,6 +19,11 @@ public class Server try { communicator = Ice.Util.initialize(ref args); + if(args.Length > 0) + { + Console.Error.WriteLine("too many arguments"); + System.Environment.Exit(1); + } Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -p 10000"); adapter.add(new HelloI(), communicator.stringToIdentity("hello")); adapter.activate(); diff --git a/cs/demo/Ice/nested/Client.cs b/cs/demo/Ice/nested/Client.cs index f7f8c302b5f..ed1e41a652e 100755 --- a/cs/demo/Ice/nested/Client.cs +++ b/cs/demo/Ice/nested/Client.cs @@ -14,6 +14,12 @@ public class Client : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.NestedServer")); if(nested == null) { diff --git a/cs/demo/Ice/nested/Server.cs b/cs/demo/Ice/nested/Server.cs index 5c879afe654..2582537332d 100755 --- a/cs/demo/Ice/nested/Server.cs +++ b/cs/demo/Ice/nested/Server.cs @@ -13,8 +13,15 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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/cs/demo/Ice/session/Client.cs b/cs/demo/Ice/session/Client.cs index bbb96a70e36..4d6fc17e4d6 100755 --- a/cs/demo/Ice/session/Client.cs +++ b/cs/demo/Ice/session/Client.cs @@ -64,6 +64,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + string name; do { diff --git a/cs/demo/Ice/session/Server.cs b/cs/demo/Ice/session/Server.cs index add922aa1ef..6d31f358d87 100755 --- a/cs/demo/Ice/session/Server.cs +++ b/cs/demo/Ice/session/Server.cs @@ -15,6 +15,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("SessionFactory"); ReapThread reaper = new ReapThread(); diff --git a/cs/demo/Ice/throughput/Client.cs b/cs/demo/Ice/throughput/Client.cs index 8175df170ce..0b56eafe68f 100755 --- a/cs/demo/Ice/throughput/Client.cs +++ b/cs/demo/Ice/throughput/Client.cs @@ -37,6 +37,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectPrx b = communicator().propertyToProxy("Throughput.Throughput"); ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(b); if(throughput == null) diff --git a/cs/demo/Ice/throughput/Server.cs b/cs/demo/Ice/throughput/Server.cs index 76133839033..b1ea35f76ed 100755 --- a/cs/demo/Ice/throughput/Server.cs +++ b/cs/demo/Ice/throughput/Server.cs @@ -12,6 +12,12 @@ public class Server : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Throughput"); adapter.add(new ThroughputI(), communicator().stringToIdentity("throughput")); adapter.activate(); diff --git a/cs/demo/Ice/value/Client.cs b/cs/demo/Ice/value/Client.cs index 3818ef3692b..6e3bc30d4c1 100755 --- a/cs/demo/Ice/value/Client.cs +++ b/cs/demo/Ice/value/Client.cs @@ -15,6 +15,12 @@ public class Client : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + Ice.ObjectPrx @base = communicator().propertyToProxy("Value.Initial"); InitialPrx initial = InitialPrxHelper.checkedCast(@base); if(initial == null) diff --git a/cs/demo/Ice/value/Server.cs b/cs/demo/Ice/value/Server.cs index 3ced46889d8..fb644450d8d 100755 --- a/cs/demo/Ice/value/Server.cs +++ b/cs/demo/Ice/value/Server.cs @@ -11,6 +11,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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/cs/demo/IceBox/hello/Client.cs b/cs/demo/IceBox/hello/Client.cs index 1da24eb192b..ce98cf97e69 100644 --- a/cs/demo/IceBox/hello/Client.cs +++ b/cs/demo/IceBox/hello/Client.cs @@ -33,6 +33,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + try { communicator().getPluginManager().getPlugin("IceSSL"); diff --git a/cs/demo/IceGrid/simple/Client.cs b/cs/demo/IceGrid/simple/Client.cs index 4b651059b38..b40385af6c3 100644 --- a/cs/demo/IceGrid/simple/Client.cs +++ b/cs/demo/IceGrid/simple/Client.cs @@ -24,6 +24,12 @@ public class Client : Ice.Application public override int run(string[] args) { + if(args.Length > 0) + { + Console.Error.WriteLine(appName() + ": too many arguments"); + return 1; + } + HelloPrx hello = null; try { diff --git a/cs/demo/IceGrid/simple/Server.cs b/cs/demo/IceGrid/simple/Server.cs index 12e42ed79a0..3d51776c79b 100644 --- a/cs/demo/IceGrid/simple/Server.cs +++ b/cs/demo/IceGrid/simple/Server.cs @@ -11,6 +11,12 @@ public class Server : Ice.Application { public override int run(string[] args) { + if(args.Length > 0) + { + System.Console.Error.WriteLine(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")); diff --git a/cs/test/Slice/keyword/generated/.gitignore b/cs/test/Slice/keyword/generated/.gitignore new file mode 100644 index 00000000000..39af5887579 --- /dev/null +++ b/cs/test/Slice/keyword/generated/.gitignore @@ -0,0 +1 @@ +# Dummy file, so that git retains this otherwise empty directory. 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")); 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")) diff --git a/rb/demo/Ice/hello/Client.rb b/rb/demo/Ice/hello/Client.rb index bbf610a44d5..d3091efb905 100644 --- a/rb/demo/Ice/hello/Client.rb +++ b/rb/demo/Ice/hello/Client.rb @@ -41,6 +41,11 @@ class Client < Ice::Application end def run(args) + if args.length > 0: + puts $0 + ": too many argumnets" + return 1 + end + # # Since this is an interactive demo we want the custom interrupt # callback to be called when the process is interrupted. diff --git a/rb/demo/Ice/latency/Client.rb b/rb/demo/Ice/latency/Client.rb index a1d6bd1e538..3e0bc7b65f3 100644 --- a/rb/demo/Ice/latency/Client.rb +++ b/rb/demo/Ice/latency/Client.rb @@ -14,6 +14,11 @@ Ice::loadSlice('Latency.ice') class Client < Ice::Application def run(args) + if args.length > 0: + puts $0 + ": too many argumnets" + return 1 + end + ping = Demo::PingPrx::checkedCast(Ice::Application::communicator().propertyToProxy('Latency.Ping')) if not ping puts "invalid proxy" diff --git a/rb/demo/Ice/session/Client.rb b/rb/demo/Ice/session/Client.rb index ce90216f07b..593f466fa67 100644 --- a/rb/demo/Ice/session/Client.rb +++ b/rb/demo/Ice/session/Client.rb @@ -73,6 +73,11 @@ class Client < Ice::Application end def run(args) + if args.length > 0: + puts $0 + ": too many argumnets" + return 1 + end + # # Since this is an interactive demo we want the custom interrupt # callback to be called when the process is interrupted. diff --git a/rb/demo/Ice/throughput/Client.rb b/rb/demo/Ice/throughput/Client.rb index dbe93acc648..48da98fd3c4 100644 --- a/rb/demo/Ice/throughput/Client.rb +++ b/rb/demo/Ice/throughput/Client.rb @@ -46,6 +46,11 @@ class Client < Ice::Application end def run(args) + if args.length > 0: + puts $0 + ": too many argumnets" + return 1 + end + # # Since this is an interactive demo we want the custom interrupt # callback to be called when the process is interrupted. diff --git a/rb/demo/Ice/value/Client.rb b/rb/demo/Ice/value/Client.rb index 299dfcaecd0..127bcbcf108 100644 --- a/rb/demo/Ice/value/Client.rb +++ b/rb/demo/Ice/value/Client.rb @@ -56,6 +56,11 @@ class Ice::Application end def run(args) + if args.length > 0: + puts $0 + ": too many argumnets" + return 1 + end + # # Since this is an interactive demo we want the custom interrupt # callback to be called when the process is interrupted. |