diff options
Diffstat (limited to 'cppe/demo')
22 files changed, 105 insertions, 80 deletions
diff --git a/cppe/demo/IceE/MFC/client/HelloClient.cpp b/cppe/demo/IceE/MFC/client/HelloClient.cpp index 00c19bf82dd..fbb5246fe0a 100644 --- a/cppe/demo/IceE/MFC/client/HelloClient.cpp +++ b/cppe/demo/IceE/MFC/client/HelloClient.cpp @@ -47,12 +47,13 @@ CHelloClientApp::InitInstance() try
{
int argc = 0;
- Ice::PropertiesPtr properties = Ice::createProperties();
+ Ice::InitializationData initData; + initData.properties = Ice::createProperties();
// // Set a default value for Hello.Proxy so that the demo will // run without a configuration file. // - properties->setProperty("Hello.Proxy", "hello:tcp -p 10000"); + initData.properties->setProperty("Hello.Proxy", "hello:tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -65,13 +66,13 @@ CHelloClientApp::InitInstance() #endif try { - properties->load(config); + initData.properties->load(config); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(argc, 0, properties);
+ communicator = Ice::initialize(argc, 0, initData);
}
catch(const Ice::Exception& ex)
{
diff --git a/cppe/demo/IceE/MFC/server/HelloServer.cpp b/cppe/demo/IceE/MFC/server/HelloServer.cpp index b4ff8999560..4fdd5fbb5db 100644 --- a/cppe/demo/IceE/MFC/server/HelloServer.cpp +++ b/cppe/demo/IceE/MFC/server/HelloServer.cpp @@ -51,13 +51,14 @@ BOOL CHelloServerApp::InitInstance() try
{
int argc = 0;
- Ice::PropertiesPtr properties = Ice::createProperties();
+ Ice::InitializationData initData; + initData.properties = Ice::createProperties();
// // Set a default value for Hello.Endpoints so that the demo // will run without a configuration file. // - properties->setProperty("Hello.Endpoints", "tcp -p 10000"); + initData.properties->setProperty("Hello.Endpoints", "tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -70,15 +71,16 @@ BOOL CHelloServerApp::InitInstance() #endif try { - properties->load(config); + initData.properties->load(config); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(argc, 0, properties);
log = new LogI;
- communicator->setLogger(log);
+ initData.logger = log; + + communicator = Ice::initializeWithProperties(argc, 0, initData);
adapter = communicator->createObjectAdapter("Hello");
}
catch(const IceUtil::Exception& ex)
diff --git a/cppe/demo/IceE/bidir/Client.cpp b/cppe/demo/IceE/bidir/Client.cpp index 63b82151152..8a1b16f3875 100644 --- a/cppe/demo/IceE/bidir/Client.cpp +++ b/cppe/demo/IceE/bidir/Client.cpp @@ -65,9 +65,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/bidir/Server.cpp b/cppe/demo/IceE/bidir/Server.cpp index 49a7a737b19..5ae67a7765d 100644 --- a/cppe/demo/IceE/bidir/Server.cpp +++ b/cppe/demo/IceE/bidir/Server.cpp @@ -44,9 +44,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/callback/Client.cpp b/cppe/demo/IceE/callback/Client.cpp index 70d71608ca4..39ab222f55d 100644 --- a/cppe/demo/IceE/callback/Client.cpp +++ b/cppe/demo/IceE/callback/Client.cpp @@ -132,9 +132,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/callback/Server.cpp b/cppe/demo/IceE/callback/Server.cpp index 8e74e9c0757..92a4ff9e786 100644 --- a/cppe/demo/IceE/callback/Server.cpp +++ b/cppe/demo/IceE/callback/Server.cpp @@ -31,9 +31,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/chat/ChatClient.cpp b/cppe/demo/IceE/chat/ChatClient.cpp index 87a05b93480..2cb282b8fb8 100644 --- a/cppe/demo/IceE/chat/ChatClient.cpp +++ b/cppe/demo/IceE/chat/ChatClient.cpp @@ -52,10 +52,12 @@ BOOL CChatClientApp::InitInstance() LogIPtr log; try { - int argc = 0; - communicator = Ice::initialize(argc, 0); + Ice::InitializationData initData; log = new LogI; - communicator->setLogger(log); + initData.logger = log; + + int argc = 0; + communicator = Ice::initialize(argc, 0, initData); } catch(const Ice::Exception& ex) { diff --git a/cppe/demo/IceE/chat/Client.cpp b/cppe/demo/IceE/chat/Client.cpp index 4e8d68de504..da7c38f1d7f 100755 --- a/cppe/demo/IceE/chat/Client.cpp +++ b/cppe/demo/IceE/chat/Client.cpp @@ -173,9 +173,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/hello/Client.cpp b/cppe/demo/IceE/hello/Client.cpp index 82b0b336360..ff5f5a44896 100644 --- a/cppe/demo/IceE/hello/Client.cpp +++ b/cppe/demo/IceE/hello/Client.cpp @@ -147,9 +147,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/hello/Server.cpp b/cppe/demo/IceE/hello/Server.cpp index 237855a6c85..924ba67ddd2 100644 --- a/cppe/demo/IceE/hello/Server.cpp +++ b/cppe/demo/IceE/hello/Server.cpp @@ -31,10 +31,11 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - properties->setProperty("Ice.Override.Timeout", "100"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + initData.properties->setProperty("Ice.Override.Timeout", "100"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/latency/Client.cpp b/cppe/demo/IceE/latency/Client.cpp index 5ef9881f3a6..674c4b4c834 100644 --- a/cppe/demo/IceE/latency/Client.cpp +++ b/cppe/demo/IceE/latency/Client.cpp @@ -61,9 +61,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/latency/Server.cpp b/cppe/demo/IceE/latency/Server.cpp index 36e63112e82..929359f5e09 100644 --- a/cppe/demo/IceE/latency/Server.cpp +++ b/cppe/demo/IceE/latency/Server.cpp @@ -37,9 +37,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/latency/WinCEClient.cpp b/cppe/demo/IceE/latency/WinCEClient.cpp index 4475acba3d1..ab3fd070251 100755 --- a/cppe/demo/IceE/latency/WinCEClient.cpp +++ b/cppe/demo/IceE/latency/WinCEClient.cpp @@ -108,13 +108,14 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for Latency.Proxy so that the demo will // run without a configuration file. // - properties->setProperty("Latency.Proxy", "ping:tcp -p 10000"); + initData.properties->setProperty("Latency.Proxy", "ping:tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -122,16 +123,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); const char* proxyProperty = "Latency.Proxy"; - string proxy = properties->getProperty(proxyProperty); + string proxy = initData.properties->getProperty(proxyProperty); PingPrx ping = PingPrx::checkedCast(communicator->stringToProxy(proxy)); if(!ping) diff --git a/cppe/demo/IceE/latency/WinCEServer.cpp b/cppe/demo/IceE/latency/WinCEServer.cpp index 85cbf568752..61a42284e16 100755 --- a/cppe/demo/IceE/latency/WinCEServer.cpp +++ b/cppe/demo/IceE/latency/WinCEServer.cpp @@ -117,12 +117,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for Latency.Endpoints so that the demo // will run without a configuration file. // - properties->setProperty("Latency.Endpoints","tcp -p 10000"); + initData.properties->setProperty("Latency.Endpoints","tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -130,13 +131,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Latency"); adapter->add(new PingI, Ice::stringToIdentity("ping")); diff --git a/cppe/demo/IceE/minimal/Client.cpp b/cppe/demo/IceE/minimal/Client.cpp index 2082888bdae..9934a1cea59 100644 --- a/cppe/demo/IceE/minimal/Client.cpp +++ b/cppe/demo/IceE/minimal/Client.cpp @@ -89,9 +89,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/minimal/Server.cpp b/cppe/demo/IceE/minimal/Server.cpp index a02cfd22eab..feb0cc1d6a3 100644 --- a/cppe/demo/IceE/minimal/Server.cpp +++ b/cppe/demo/IceE/minimal/Server.cpp @@ -44,9 +44,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/minimal/WinCEClient.cpp b/cppe/demo/IceE/minimal/WinCEClient.cpp index f4ebc3711f9..ba12b687f79 100644 --- a/cppe/demo/IceE/minimal/WinCEClient.cpp +++ b/cppe/demo/IceE/minimal/WinCEClient.cpp @@ -24,13 +24,14 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for "Hello.Proxy" so that the demo will // run without a configuration file. // - properties->setProperty("Hello.Proxy", "hello:tcp -p 10000"); + initData.properties->setProperty("Hello.Proxy", "hello:tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -38,15 +39,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); - HelloPrx hello = HelloPrx::checkedCast(communicator->stringToProxy(properties->getProperty("Hello.Proxy"))); + HelloPrx hello = + HelloPrx::checkedCast(communicator->stringToProxy(initData.properties->getProperty("Hello.Proxy"))); if(!hello) { MessageBox(NULL, L"invalid proxy", L"Minimal Client", MB_ICONEXCLAMATION | MB_OK); diff --git a/cppe/demo/IceE/minimal/WinCEServer.cpp b/cppe/demo/IceE/minimal/WinCEServer.cpp index f316d33a95b..12b2109245e 100644 --- a/cppe/demo/IceE/minimal/WinCEServer.cpp +++ b/cppe/demo/IceE/minimal/WinCEServer.cpp @@ -146,12 +146,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for Hello.Endpoints so that the demo // will run without a configuration file. // - properties->setProperty("Hello.Endpoints","tcp -p 10000"); + initData.properties->setProperty("Hello.Endpoints","tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -159,13 +160,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Hello"); adapter->add(new HelloI(mainWnd), Ice::stringToIdentity("hello")); diff --git a/cppe/demo/IceE/throughput/Client.cpp b/cppe/demo/IceE/throughput/Client.cpp index 87e85df9226..4fcd3be1a76 100644 --- a/cppe/demo/IceE/throughput/Client.cpp +++ b/cppe/demo/IceE/throughput/Client.cpp @@ -413,9 +413,10 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/throughput/Server.cpp b/cppe/demo/IceE/throughput/Server.cpp index c1445ab6d53..1604cb2c27e 100644 --- a/cppe/demo/IceE/throughput/Server.cpp +++ b/cppe/demo/IceE/throughput/Server.cpp @@ -42,10 +42,11 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(); - properties->load("config"); - properties->setProperty("Ice.Override.Timeout", "100"); - communicator = Ice::initializeWithProperties(argc, argv, properties); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + initData.properties->load("config"); + initData.properties->setProperty("Ice.Override.Timeout", "100"); + communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cppe/demo/IceE/throughput/WinCEClient.cpp b/cppe/demo/IceE/throughput/WinCEClient.cpp index 62beedbfe44..c0362300956 100755 --- a/cppe/demo/IceE/throughput/WinCEClient.cpp +++ b/cppe/demo/IceE/throughput/WinCEClient.cpp @@ -108,13 +108,14 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for Throughput.Proxy so that the demo will // run without a configuration file. // - properties->setProperty("Throughput.Proxy", "throughput:tcp -p 10000"); + initData.properties->setProperty("Throughput.Proxy", "throughput:tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -122,16 +123,16 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); const char* proxyProperty = "Throughput.Proxy"; - string proxy = properties->getProperty(proxyProperty); + string proxy = initData.properties->getProperty(proxyProperty); ThroughputPrx throughput = ThroughputPrx::checkedCast(communicator->stringToProxy(proxy)); if(!throughput) diff --git a/cppe/demo/IceE/throughput/WinCEServer.cpp b/cppe/demo/IceE/throughput/WinCEServer.cpp index 1a1462c95cf..d45b4c834da 100755 --- a/cppe/demo/IceE/throughput/WinCEServer.cpp +++ b/cppe/demo/IceE/throughput/WinCEServer.cpp @@ -111,13 +111,14 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd try { - Ice::PropertiesPtr properties = Ice::createProperties(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); // // Set a default value for Latency.Endpoints so that the demo // will run without a configuration file. // - properties->setProperty("Throughput.Endpoints","tcp -p 10000"); + initData.properties->setProperty("Throughput.Endpoints","tcp -p 10000"); // // Now, load the configuration file if present. Under WinCE we @@ -125,13 +126,13 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmd // try { - properties->load("config.txt"); + initData.properties->load("config.txt"); } catch(const Ice::FileException&) { } - communicator = Ice::initializeWithProperties(__argc, __argv, properties); + communicator = Ice::initialize(__argc, __argv, initData); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Throughput"); Ice::ObjectPtr object = new ThroughputI(100); |