10 files changed, 32 insertions, 88 deletions
diff --git a/cpp/demo/IceBox/hello/config.admin b/cpp/demo/IceBox/hello/config.admin
index ae56d7f1031..e0612fe4f07 100644
--- a/cpp/demo/IceBox/hello/config.admin
+++ b/cpp/demo/IceBox/hello/config.admin
@@ -1,14 +1,4 @@
 #
 # Proxy to the IceBox ServiceManager:
 #
-
-#
-# When the IceBox.ServiceManager object adapter is configured: 
-#
-#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h localhost
-
-#
-# When Ice.Admin is configured:
-#
 IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h localhost
-
diff --git a/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox
index 7aed3c0c6e9..d68bf802ee0 100644
--- a/cpp/demo/IceBox/hello/config.icebox
+++ b/cpp/demo/IceBox/hello/config.icebox
@@ -1,35 +1,12 @@
 #
-# The IceBox ServiceManager object can be provided by configuring 
-# IceBox.ServiceManager.Endpoints (and optionally
-# IceBox.InstanceName), or as a facet of the Ice.Admin object
-# (or both if you like). Make sure to keep config.admin
-# synchronized with these settings.
-# 
-
-#
-# IceBox.ServiceManager configuration
-#
-
-#
-# The IceBox instance name is used to set the category field of the
-# IceBox ServiceManager identity.
-#
-#IceBox.InstanceName=DemoIceBox
-
-#
-# The IceBox server endpoint configuration
-#
-#IceBox.ServiceManager.Endpoints=tcp -p 9998 -h localhost
-
-#
-# Ice.Admin configuration
+# The IceBox ServiceManager is provided as a facet of the Ice.Admin object.
 #
 
 #
 # Enable Ice.Admin object:
 #
-Ice.Admin.InstanceName=DemoIceBox
 Ice.Admin.Endpoints=tcp -p 9996 -h localhost
+Ice.Admin.InstanceName=DemoIceBox
 
 #
 # The hello service
diff --git a/cpp/demo/IceStorm/clock/README b/cpp/demo/IceStorm/clock/README
index da674d48c56..84e0073a025 100644
--- a/cpp/demo/IceStorm/clock/README
+++ b/cpp/demo/IceStorm/clock/README
@@ -127,7 +127,7 @@ addresses in the steps below:
 
    In config.icebox:
 
-   IceBox.ServiceManager.Endpoints=tcp -h <I> -p 9998
+   Ice.Admin.Endpoints=tcp -h <I> -p 9996
 
 If you experience any network delays or errors, edit all of the
 configuration files and enable the Ice.Trace.Network property. Running
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 97c9d6ffabb..85c71094921 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -1,11 +1,10 @@
+
 #
-# The IceBox server endpoint configuration. This endpoint is only used
-# to communicate with the IceBox ServiceManager object (such as when
-# using iceboxadmin to shutdown the server).
-#
+# Enable Ice.Admin object
 # The IceStorm service has its own endpoints (see config.service).
 #
-IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998
+Ice.Admin.Endpoints=tcp -h localhost -p 9996
+Ice.Admin.InstanceName=icebox
 
 #
 # The IceStorm service. The service is configured using a separate
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 70533144839..d3c9980179b 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -1,7 +1,8 @@
 #
-# The IceBox server endpoint configuration
+# Enable Ice.Admin object
 #
-IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998
+Ice.Admin.Endpoints=tcp -h localhost -p 9996
+Ice.Admin.InstanceName=icebox
 
 #
 # The IceStorm service
diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1
index 1e417d8f123..c971441de8e 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib1
+++ b/cpp/demo/IceStorm/replicated2/config.ib1
@@ -1,7 +1,8 @@
 #
-# The IceBox server endpoint configuration
+# Enable Ice.Admin object
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9990
+Ice.Admin.Endpoints=tcp -p 9990
+Ice.Admin.InstanceName=icebox1
 
 #
 # The IceStorm service
diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2
index bb102d8bb13..76a8a30af32 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib2
+++ b/cpp/demo/IceStorm/replicated2/config.ib2
@@ -1,7 +1,8 @@
 #
-# The IceBox server endpoint configuration
+# Enable Ice.Admin object
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9991
+Ice.Admin.Endpoints=tcp -p 9991
+Ice.Admin.InstanceName=icebox2
 
 #
 # The IceStorm service
diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3
index 43339ab8263..2da9ad9d0d3 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib3
+++ b/cpp/demo/IceStorm/replicated2/config.ib3
@@ -1,7 +1,8 @@
 #
-# The IceBox server endpoint configuration
+# Enable Ice.Admin object
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9993
+Ice.Admin.Endpoints=tcp -p 9993
+Ice.Admin.InstanceName=icebox3
 
 #
 # The IceStorm service
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 1904563332e..74c57803619 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct  9 11:53:58 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -419,46 +419,20 @@ const IceInternal::PropertyArray
 const IceInternal::Property IceBoxPropsData[] = 
 {
     IceInternal::Property("IceBox.InheritProperties", false, 0),
-    IceInternal::Property("IceBox.InstanceName", false, 0),
+    IceInternal::Property("IceBox.InstanceName", true, 0),
     IceInternal::Property("IceBox.LoadOrder", false, 0),
     IceInternal::Property("IceBox.PrintServicesReady", false, 0),
     IceInternal::Property("IceBox.Service.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ACM.Timeout", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ACM.Close", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ACM", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.AdapterId", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Endpoints", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.Locator", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.Router", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator.Context.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.Locator", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.Router", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router.Context.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.AdapterId", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.Endpoints", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.Locator", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.Router", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", true, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", true, 0),
     IceInternal::Property("IceBox.Trace.ServiceObserver", false, 0),
     IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0),
 };
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 7ad2954e8cb..dd79cf5d639 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct  9 11:53:58 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!