summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp9
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp9
-rw-r--r--cpp/src/Ice/PropertyNames.cpp7
-rw-r--r--cpp/src/Ice/PropertyNames.h2
-rw-r--r--cpp/src/IceBox/Admin.cpp7
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp6
-rw-r--r--cpp/src/IcePatch2/Server.cpp17
7 files changed, 10 insertions, 47 deletions
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index cc0c5c6860d..749e6554f3b 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -269,13 +269,8 @@ Glacier2::RouterService::start(int argc, char* argv[])
//
if(adminAdapter)
{
- const string adminIdProperty = "Glacier2.AdminIdentity";
- string adminId = properties->getProperty(adminIdProperty);
- if(adminId.empty())
- {
- const string instanceNameProperty = "Glacier2.InstanceName";
- adminId = properties->getPropertyWithDefault(instanceNameProperty, "Glacier2") + "/admin";
- }
+ const string instanceNameProperty = "Glacier2.InstanceName";
+ string adminId = properties->getPropertyWithDefault(instanceNameProperty, "Glacier2") + "/admin";
Identity id = communicator()->stringToIdentity(adminId);
adminAdapter->add(new AdminI(communicator()), id);
}
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 1103cd90412..50505e40236 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -245,13 +245,8 @@ Glacier2::SessionRouterI::SessionRouterI(const ObjectAdapterPtr& clientAdapter,
// This session router is used directly as servant for the main
// Glacier2 router Ice object.
//
- const char* routerIdProperty = "Glacier2.RouterIdentity";
- string routerId = _properties->getProperty(routerIdProperty);
- if(routerId.empty())
- {
- const char* instanceNameProperty = "Glacier2.InstanceName";
- routerId = _properties->getPropertyWithDefault(instanceNameProperty, "Glacier2") + "/router";
- }
+ const string instanceNameProperty = "Glacier2.InstanceName";
+ string routerId = _properties->getPropertyWithDefault(instanceNameProperty, "Glacier2") + "/router";
Identity id = clientAdapter->getCommunicator()->stringToIdentity(routerId);
_clientAdapter->add(this, id);
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 030e6797fac..f1dfb0d6dd7 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `./PropertyNames.def', Wed Jul 26 17:12:35 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Aug 21 16:37:24 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -85,7 +85,6 @@ const char* IceInternal::PropertyNames::IceBoxProps[] =
"IceBox.ServiceManager.AdapterId",
"IceBox.ServiceManager.ReplicaGroupId",
"IceBox.ServiceManager.Endpoints",
- "IceBox.ServiceManager.Identity",
"IceBox.ServiceManager.PublishedEndpoints",
"IceBox.ServiceManager.RegisterProcess",
"IceBox.ServiceManager.ThreadPool.Size",
@@ -200,11 +199,9 @@ const char* IceInternal::PropertyNames::IcePatch2Props[] =
"IcePatch2.Admin.ThreadPool.SizeMax",
"IcePatch2.Admin.ThreadPool.SizeWarn",
"IcePatch2.Admin.ThreadPool.StackSize",
- "IcePatch2.AdminIdentity",
"IcePatch2.ChunkSize",
"IcePatch2.Directory",
"IcePatch2.Endpoints",
- "IcePatch2.Identity",
"IcePatch2.InstanceName",
"IcePatch2.PublishedEndpoints",
"IcePatch2.RegisterProcess",
@@ -286,7 +283,6 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
{
"Glacier2.AddUserToAllowCategories",
"Glacier2.Admin.Endpoints",
- "Glacier2.AdminIdentity",
"Glacier2.Admin.PublishedEndpoints",
"Glacier2.Admin.RegisterProcess",
"Glacier2.AllowCategories",
@@ -310,7 +306,6 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
"Glacier2.InstanceName",
"Glacier2.PermissionsVerifier",
"Glacier2.SSLPermissionsVerifier",
- "Glacier2.RouterIdentity",
"Glacier2.RoutingTable.MaxSize",
"Glacier2.Server.AlwaysBatch",
"Glacier2.Server.Buffered",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 1ea2eab1d63..7ea2a4eeeef 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `./PropertyNames.def', Wed Jul 26 17:12:35 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Aug 21 16:37:24 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index bc5c89c9af6..4259cd7816b 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -83,14 +83,9 @@ Client::run(int argc, char* argv[])
}
PropertiesPtr properties = communicator()->getProperties();
- string managerIdentity = properties->getProperty("IceBox.ServiceManager.Identity");
- if(managerIdentity.empty())
- {
- managerIdentity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
- }
+ string managerIdentity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
string managerProxy;
-
if(properties->getProperty("Ice.Default.Locator").empty())
{
string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 207c6a61f00..721aacdf695 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -62,11 +62,7 @@ IceBox::ServiceManagerI::start()
ObjectAdapterPtr adapter = _communicator->createObjectAdapter("IceBox.ServiceManager");
PropertiesPtr properties = _communicator->getProperties();
- string identity = properties->getProperty("IceBox.ServiceManager.Identity");
- if(identity.empty())
- {
- identity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
- }
+ string identity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
adapter->add(obj, _communicator->stringToIdentity(identity));
//
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 7c604c1a392..76030e75f64 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -159,24 +159,12 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
const string instanceNameProperty = "IcePatch2.InstanceName";
string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IcePatch2");
- const string idProperty = "IcePatch2.Identity";
- string idStr = properties->getProperty(idProperty);
- if(idStr.empty())
- {
- idStr = instanceName + "/server";
- }
- Identity id = communicator()->stringToIdentity(idStr);
+ Identity id = communicator()->stringToIdentity(instanceName + "/server");
adapter->add(new FileServerI(dataDir, infoSeq), id);
if(adminAdapter)
{
- const string adminIdProperty = "IcePatch2.AdminIdentity";
- string adminIdStr = properties->getProperty(adminIdProperty);
- if(adminIdStr.empty())
- {
- adminIdStr = instanceName + "/admin";
- }
- Identity adminId = communicator()->stringToIdentity(adminIdStr);
+ Identity adminId = communicator()->stringToIdentity(instanceName + "/admin");
adminAdapter->add(new AdminI(communicator()), adminId);
}
@@ -195,7 +183,6 @@ IcePatch2::PatcherService::stop()
return true;
}
-
void
IcePatch2::PatcherService::usage(const string& appName)
{