summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cppe/test/IceE/adapterDeactivation/Client.cpp4
-rw-r--r--cppe/test/IceE/adapterDeactivation/Collocated.cpp6
-rw-r--r--cppe/test/IceE/adapterDeactivation/Server.cpp6
-rw-r--r--cppe/test/IceE/exceptions/Client.cpp4
-rw-r--r--cppe/test/IceE/exceptions/Collocated.cpp3
-rw-r--r--cppe/test/IceE/exceptions/Server.cpp3
-rw-r--r--cppe/test/IceE/facets/Client.cpp4
-rw-r--r--cppe/test/IceE/facets/Collocated.cpp3
-rw-r--r--cppe/test/IceE/facets/Server.cpp3
-rw-r--r--cppe/test/IceE/faultTolerance/Client.cpp3
-rw-r--r--cppe/test/IceE/faultTolerance/Server.cpp6
-rw-r--r--cppe/test/IceE/inheritance/Client.cpp4
-rw-r--r--cppe/test/IceE/inheritance/Collocated.cpp3
-rw-r--r--cppe/test/IceE/inheritance/Server.cpp3
-rw-r--r--cppe/test/IceE/location/Client.cpp3
-rw-r--r--cppe/test/IceE/location/Server.cpp4
-rw-r--r--cppe/test/IceE/operations/Client.cpp2
-rw-r--r--cppe/test/IceE/operations/Collocated.cpp1
-rw-r--r--cppe/test/IceE/operations/Server.cpp1
-rw-r--r--cppe/test/IceE/slicing/Client.cpp4
-rw-r--r--cppe/test/IceE/slicing/Server.cpp5
21 files changed, 50 insertions, 25 deletions
diff --git a/cppe/test/IceE/adapterDeactivation/Client.cpp b/cppe/test/IceE/adapterDeactivation/Client.cpp
index bbdbc9be656..4bfa5580428 100644
--- a/cppe/test/IceE/adapterDeactivation/Client.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Client.cpp
@@ -27,7 +27,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
TestIntfPrx allTests(const CommunicatorPtr&);
TestIntfPrx obj = allTests(communicator());
diff --git a/cppe/test/IceE/adapterDeactivation/Collocated.cpp b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
index 7d999b908f0..4d85faf85b4 100644
--- a/cppe/test/IceE/adapterDeactivation/Collocated.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Collocated.cpp
@@ -27,9 +27,11 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
- communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+ properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new TestI;
adapter->add(object, Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/adapterDeactivation/Server.cpp b/cppe/test/IceE/adapterDeactivation/Server.cpp
index 7f71ecf0883..00f82a8d6b9 100644
--- a/cppe/test/IceE/adapterDeactivation/Server.cpp
+++ b/cppe/test/IceE/adapterDeactivation/Server.cpp
@@ -27,9 +27,11 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
- communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
+ properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new TestI;
adapter->add(object, Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/exceptions/Client.cpp b/cppe/test/IceE/exceptions/Client.cpp
index f3796fdd611..f6eba2d49c8 100644
--- a/cppe/test/IceE/exceptions/Client.cpp
+++ b/cppe/test/IceE/exceptions/Client.cpp
@@ -26,7 +26,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
ThrowerPrx allTests(const Ice::CommunicatorPtr&);
ThrowerPrx thrower = allTests(communicator());
diff --git a/cppe/test/IceE/exceptions/Collocated.cpp b/cppe/test/IceE/exceptions/Collocated.cpp
index 4ee3f17f4b4..1f7d1689dd7 100644
--- a/cppe/test/IceE/exceptions/Collocated.cpp
+++ b/cppe/test/IceE/exceptions/Collocated.cpp
@@ -31,7 +31,8 @@ public:
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
properties->setProperty("IceE.Warn.Dispatch", "0");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new ThrowerI(adapter);
diff --git a/cppe/test/IceE/exceptions/Server.cpp b/cppe/test/IceE/exceptions/Server.cpp
index 8d93293207e..ee2d76ca495 100644
--- a/cppe/test/IceE/exceptions/Server.cpp
+++ b/cppe/test/IceE/exceptions/Server.cpp
@@ -29,7 +29,8 @@ public:
properties->setProperty("IceE.Warn.Dispatch", "0");
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new ThrowerI(adapter);
diff --git a/cppe/test/IceE/facets/Client.cpp b/cppe/test/IceE/facets/Client.cpp
index 010c08d1554..bf0e3338741 100644
--- a/cppe/test/IceE/facets/Client.cpp
+++ b/cppe/test/IceE/facets/Client.cpp
@@ -26,7 +26,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
GPrx allTests(const Ice::CommunicatorPtr&);
GPrx g = allTests(communicator());
diff --git a/cppe/test/IceE/facets/Collocated.cpp b/cppe/test/IceE/facets/Collocated.cpp
index 11e1c18b4fd..54faeac14d6 100644
--- a/cppe/test/IceE/facets/Collocated.cpp
+++ b/cppe/test/IceE/facets/Collocated.cpp
@@ -29,7 +29,8 @@ public:
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr d = new DI;
diff --git a/cppe/test/IceE/facets/Server.cpp b/cppe/test/IceE/facets/Server.cpp
index b8e13538296..3f32595d35b 100644
--- a/cppe/test/IceE/facets/Server.cpp
+++ b/cppe/test/IceE/facets/Server.cpp
@@ -28,7 +28,8 @@ public:
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr d = new DI;
diff --git a/cppe/test/IceE/faultTolerance/Client.cpp b/cppe/test/IceE/faultTolerance/Client.cpp
index 4155adda499..7558976b99c 100644
--- a/cppe/test/IceE/faultTolerance/Client.cpp
+++ b/cppe/test/IceE/faultTolerance/Client.cpp
@@ -38,7 +38,8 @@ public:
//
properties->setProperty("IceE.Warn.Connections", "0");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
vector<int> ports;
for(int i = 1; i < argc; ++i)
diff --git a/cppe/test/IceE/faultTolerance/Server.cpp b/cppe/test/IceE/faultTolerance/Server.cpp
index 0fc7f5472d4..368273f14d5 100644
--- a/cppe/test/IceE/faultTolerance/Server.cpp
+++ b/cppe/test/IceE/faultTolerance/Server.cpp
@@ -31,7 +31,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
int port = 0;
for(int i = 1; i < argc; ++i)
@@ -62,7 +64,7 @@ public:
char buf[32];
sprintf(buf, "default -p %d", port);
- communicator()->getProperties()->setProperty("TestAdapter.Endpoints", buf);
+ properties->setProperty("TestAdapter.Endpoints", buf);
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new TestI(adapter);
adapter->add(object, Ice::stringToIdentity("test"));
diff --git a/cppe/test/IceE/inheritance/Client.cpp b/cppe/test/IceE/inheritance/Client.cpp
index 1229364f96a..7a733eadb9f 100644
--- a/cppe/test/IceE/inheritance/Client.cpp
+++ b/cppe/test/IceE/inheritance/Client.cpp
@@ -26,7 +26,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
InitialPrx allTests(const Ice::CommunicatorPtr&);
InitialPrx initial = allTests(communicator());
diff --git a/cppe/test/IceE/inheritance/Collocated.cpp b/cppe/test/IceE/inheritance/Collocated.cpp
index ea41867d2da..58080a38912 100644
--- a/cppe/test/IceE/inheritance/Collocated.cpp
+++ b/cppe/test/IceE/inheritance/Collocated.cpp
@@ -29,7 +29,8 @@ public:
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new InitialI(adapter);
diff --git a/cppe/test/IceE/inheritance/Server.cpp b/cppe/test/IceE/inheritance/Server.cpp
index 2b4d355b487..8c83cd81b1e 100644
--- a/cppe/test/IceE/inheritance/Server.cpp
+++ b/cppe/test/IceE/inheritance/Server.cpp
@@ -28,7 +28,8 @@ public:
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
Ice::ObjectPtr object = new InitialI(adapter);
diff --git a/cppe/test/IceE/location/Client.cpp b/cppe/test/IceE/location/Client.cpp
index bb751d3ce1f..2093f153982 100644
--- a/cppe/test/IceE/location/Client.cpp
+++ b/cppe/test/IceE/location/Client.cpp
@@ -31,7 +31,8 @@ public:
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("IceE.Default.Locator", "locator:default -p 12345");
- setCommunicator(Ice::initialize(argc, argv));
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
void allTests(const Ice::CommunicatorPtr&, const string&);
allTests(communicator(), "ServerManager:default -p 12345 -t 10000");
diff --git a/cppe/test/IceE/location/Server.cpp b/cppe/test/IceE/location/Server.cpp
index 5dab09c797e..13d88e381dd 100644
--- a/cppe/test/IceE/location/Server.cpp
+++ b/cppe/test/IceE/location/Server.cpp
@@ -31,7 +31,9 @@ public:
{
Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
properties->setProperty("ServerManager.Endpoints", "default -p 12345");
- setCommunicator(Ice::initialize(argc, argv));
+
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
//
// Register the server manager. The server manager creates a
diff --git a/cppe/test/IceE/operations/Client.cpp b/cppe/test/IceE/operations/Client.cpp
index 4a3b34d072e..818a6287713 100644
--- a/cppe/test/IceE/operations/Client.cpp
+++ b/cppe/test/IceE/operations/Client.cpp
@@ -37,8 +37,8 @@ public:
//properties->setProperty("IceE.Trace.Protocol", "5");
loadConfig(properties);
-
setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
+
Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
Test::MyClassPrx myClass = allTests(communicator());
diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp
index b5def014a03..0e4052540f4 100644
--- a/cppe/test/IceE/operations/Collocated.cpp
+++ b/cppe/test/IceE/operations/Collocated.cpp
@@ -39,7 +39,6 @@ public:
//properties->setProperty("IceE.Trace.Protocol", "5");
loadConfig(properties);
-
setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
diff --git a/cppe/test/IceE/operations/Server.cpp b/cppe/test/IceE/operations/Server.cpp
index 35cf77bbc75..1f2ef9254a9 100644
--- a/cppe/test/IceE/operations/Server.cpp
+++ b/cppe/test/IceE/operations/Server.cpp
@@ -33,7 +33,6 @@ public:
//properties->setProperty("IceE.Trace.Protocol", "5");
loadConfig(properties);
-
setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
diff --git a/cppe/test/IceE/slicing/Client.cpp b/cppe/test/IceE/slicing/Client.cpp
index a99b671c560..1bfd03e724e 100644
--- a/cppe/test/IceE/slicing/Client.cpp
+++ b/cppe/test/IceE/slicing/Client.cpp
@@ -26,7 +26,9 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
TestIntfPrx allTests(const Ice::CommunicatorPtr&);
TestIntfPrx Test = allTests(communicator());
diff --git a/cppe/test/IceE/slicing/Server.cpp b/cppe/test/IceE/slicing/Server.cpp
index 2fe19d61fb9..170fb362e92 100644
--- a/cppe/test/IceE/slicing/Server.cpp
+++ b/cppe/test/IceE/slicing/Server.cpp
@@ -25,9 +25,10 @@ public:
virtual int
run(int argc, char* argv[])
{
- setCommunicator(Ice::initialize(argc, argv));
+ Ice::PropertiesPtr properties = Ice::createProperties();
+ loadConfig(properties);
+ setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
- Ice::PropertiesPtr properties = communicator()->getProperties();
properties->setProperty("IceE.Warn.Dispatch", "0");
properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 09:30:00 +0000