ICE-5698 - Deprecate IceBox.ServiceManager object adapter and IceBox.InstanceName

30 files changed, 113 insertions, 320 deletions

diff --git a/CHANGES b/CHANGES
index 9891d6947ec..a7ffc602f98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -72,7 +72,7 @@ General Changes
   to enable clients to easily find the proxy of the topic manager with
   just the endpoint information of the IceStorm service. The client
   doesn't need to know the instance name.
-  
+
   IceStorm provides an Ice object with the identity `IceStorm/Finder'
   that implements this interface.
 
@@ -104,7 +104,7 @@ General Changes
 - Fixed a bug where retries might fail if the request failed right
   after connection establishment.
 
-- New garbage collection support for object graphs with cycles. 
+- New garbage collection support for object graphs with cycles.
 
   Ice no longer uses a background thread to collect objects. Instead,
   Ice::Object now has a new ice_collectable method to indicate whether
@@ -190,6 +190,8 @@ General Changes
 - Removed the Ice::Stats interface, which was deprecated in Ice 3.5
   and replaced by the new metrics facility.
 
+- The IceBox.ServiceManager object adapter has been deprecated.
+  Use Ice.Admin and the IceBox.ServiceManager facet instead.
 
 C++ Changes
 ===========
@@ -230,13 +232,13 @@ C++ Changes
   process narrow string converter. Likewise setProcessWstringConverter
   and getProcessWstringConverter can be used to establish and access
   the process wide string converter.
-  
+
 - Added Ice.LogStdErr.Convert property which controls whether or not
   the default StdErr logger converts messages from native narrow
   encoding to the console code page. The default value is 1, meaning
   by default messages are converted to the console code page encoding.
   The property is only used on Windows.
-  
+
 - Added IceUtil::nativeToWnative and IceUtil::wnativeToNative
   functions which allow you to convert between narrow and wide
   strings. stringToWstring and wstringToString have been deprecated.
@@ -300,7 +302,7 @@ C# Changes
 
 - Fixed leak in C# transport. The leak occurred for each Ice
   connection.
-  
+
 - Mono is no longer an officially-supported platform for Ice for .NET.
 
 
@@ -316,7 +318,7 @@ Python Changes
   use of implicit relative imports for nested Slice modules.
 
 - Added ice_staticId() to generated proxy classes.
-  
+
 
 Ruby Changes
 ============
@@ -324,7 +326,7 @@ Ruby Changes
 - Added support for Ruby 2.1.
 
 - Added ice_staticId() to generated proxy classes.
-  
+
 
 PHP Changes
 ===========
@@ -398,7 +400,7 @@ General Changes
 
 - Fixed the graphical IceGrid administrative tool to run and build
   in JVMs without JavaFX support.
-  
+
 - IceGrid node now initializes the process supplementary groups.
 
 - Added man pages for Ice executable tools and commands.
@@ -406,7 +408,7 @@ General Changes
 - Added ability to list IceStorm topic subscribers.
 
 - Fixed a bug in the graphical IceGrid administrative tool that caused
-  the "Save" and "Save to File" commands to produce an empty file 
+  the "Save" and "Save to File" commands to produce an empty file
   without reporting any errors.
 
 - The Visual Studio Add-in now supports configuration-specific
@@ -429,10 +431,10 @@ C++ Changes
 
 - Fixed a bug in slice2cpp that generated invalid C++ code for C++11
   asynchronous invocations.
-  
+
 - Fixed a bug in slice2cpp that generated invalid C++ code when using
   "cpp:virtual" metadata.
-  
+
 - Fixed a bug in slice2cpp that generated invalid C++ code when a
   Slice operation has more than ten output parameters.
 
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
index 0ae9d484e0e..5f1169382c9 100644
--- a/config/PropertyNames.xml
+++ b/config/PropertyNames.xml
@@ -34,7 +34,7 @@ must have a name attribute. Property elements may also have a property
 class attribute. The property class attribute allows you to define a
 list of properties that are repeatedly defined for different property
 categories. Here's how it works:
- 
+
  - Define a property class with the list of property suffixes common to
    that class.
 
@@ -42,13 +42,13 @@ categories. Here's how it works:
 
 The generated code will take each property that has a class attribute
 and expand it by creating new properties for each suffix in the
-specified class. The new property names are constructed as follows: 
+specified class. The new property names are constructed as follows:
+
+generated property name =
+    relevant section name +
+    property name containing the class attribute +
+    the suffix in the class.
 
-generated property name = 
-    relevant section name + 
-    property name containing the class attribute + 
-    the suffix in the class. 
-    
 Let's illustrate by comparing a case using classes vs. without
 classes:
 
@@ -103,7 +103,7 @@ described above `in addition to' the property containing the property
 class.
 
 Property elements may also include the deprecated and deprecatedBy
-attributes. A property that has a deprecated attribute with the value 
+attributes. A property that has a deprecated attribute with the value
 "true" will be marked internally as deprecated and Ice may issue warnings
 if a deprecated property is used. The deprecatedBy attribute allows the
 Ice run time to transparently replace the deprecated property name with a
@@ -439,11 +439,11 @@ generated from the section label.
 
     <section name="IceBox">
         <property name="InheritProperties" />
-        <property name="InstanceName" />
+        <property name="InstanceName" deprecated="true" />
         <property name="LoadOrder" />
         <property name="PrintServicesReady" />
         <property name="Service.[any]" />
-        <property name="ServiceManager" class="objectadapter" />
+        <property name="ServiceManager" class="deprecatedobjectadapter" />
         <property name="Trace.ServiceObserver" />
         <property name="UseSharedCommunicator.[any]" />
     </section>
@@ -540,7 +540,7 @@ generated from the section label.
         <property name="SQL.UserName" />
         <property name="SQL.Password" />
 </section>
-    
+
     <section name="IcePatch2">
         <property class="objectadapter" />
         <property name="ChunkSize" deprecated="true" deprecatedBy="IcePatch2Client.ChunkSize"/>
@@ -549,7 +549,7 @@ generated from the section label.
         <property name="Remove" deprecated="true" deprecatedBy="IcePatch2Client.Remove"/>
         <property name="Thorough" deprecated="true" deprecatedBy="IcePatch2Client.Thorough"/>
     </section>
-    
+
     <section name="IcePatch2Client">
         <property name="ChunkSize" />
         <property name="Directory" />
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!
 
diff --git a/cs/demo/IceBox/hello/config.admin b/cs/demo/IceBox/hello/config.admin
index a8884084517..8e050568c71 100644
--- a/cs/demo/IceBox/hello/config.admin
+++ b/cs/demo/IceBox/hello/config.admin
@@ -2,12 +2,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/cs/demo/IceBox/hello/config.icebox b/cs/demo/IceBox/hello/config.icebox
index a5f64706b9a..08c7bb585b7 100644
--- a/cs/demo/IceBox/hello/config.icebox
+++ b/cs/demo/IceBox/hello/config.icebox
@@ -1,37 +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 object 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/cs/demo/IceStorm/clock/README b/cs/demo/IceStorm/clock/README
index a70ff96d925..f863a90a438 100644
--- a/cs/demo/IceStorm/clock/README
+++ b/cs/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/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox
index 2a5632587d8..ff8a1f34a63 100644
--- a/cs/demo/IceStorm/clock/config.icebox
+++ b/cs/demo/IceStorm/clock/config.icebox
@@ -1,11 +1,9 @@
 #
-# 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 -p 9998 -h localhost
+Ice.Admin.Endpoints=tcp -p 9996 -h localhost
+Ice.Admin.InstanceName=icebox
 
 #
 # The IceStorm service. The service is configured using a separate
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index 2d9a6a49570..860895b8ab7 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -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!
 
@@ -409,46 +409,20 @@ namespace IceInternal
         public static Property[] IceBoxProps =
         {
              new Property(@"^IceBox\.InheritProperties$", false, null),
-             new Property(@"^IceBox\.InstanceName$", false, null),
+             new Property(@"^IceBox\.InstanceName$", true, null),
              new Property(@"^IceBox\.LoadOrder$", false, null),
              new Property(@"^IceBox\.PrintServicesReady$", false, null),
              new Property(@"^IceBox\.Service\.[^\s]+$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ACM\.Timeout$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ACM\.Close$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ACM$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.AdapterId$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Endpoints$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.Locator$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.Router$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.PublishedEndpoints$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ReplicaGroupId$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.Locator$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.Router$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.Router$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ProxyOptions$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.ThreadPriority$", false, null),
+             new Property(@"^IceBox\.ServiceManager\.AdapterId$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.Endpoints$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.Locator$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.PublishedEndpoints$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.ReplicaGroupId$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.Router$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.Size$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", true, null),
+             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", true, null),
              new Property(@"^IceBox\.Trace\.ServiceObserver$", false, null),
              new Property(@"^IceBox\.UseSharedCommunicator\.[^\s]+$", false, null),
              null
diff --git a/java/demo/IceBox/hello/config.admin b/java/demo/IceBox/hello/config.admin
index ae56d7f1031..a52736106f4 100644
--- a/java/demo/IceBox/hello/config.admin
+++ b/java/demo/IceBox/hello/config.admin
@@ -2,13 +2,5 @@
 # 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/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox
index e397b3a5c0a..5e1791fc296 100644
--- a/java/demo/IceBox/hello/config.icebox
+++ b/java/demo/IceBox/hello/config.icebox
@@ -1,37 +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/java/demo/IceStorm/clock/README b/java/demo/IceStorm/clock/README
index 5aa439d133a..ec30a7c2608 100644
--- a/java/demo/IceStorm/clock/README
+++ b/java/demo/IceStorm/clock/README
@@ -129,7 +129,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/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox
index 97c9d6ffabb..e2f20ae08f9 100644
--- a/java/demo/IceStorm/clock/config.icebox
+++ b/java/demo/IceStorm/clock/config.icebox
@@ -1,11 +1,9 @@
 #
-# 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/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index ae6df18f706..c7800e61d62 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -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!
 
@@ -409,46 +409,20 @@ public final class PropertyNames
     public static final Property IceBoxProps[] = 
     {
         new Property("IceBox\\.InheritProperties", false, null),
-        new Property("IceBox\\.InstanceName", false, null),
+        new Property("IceBox\\.InstanceName", true, null),
         new Property("IceBox\\.LoadOrder", false, null),
         new Property("IceBox\\.PrintServicesReady", false, null),
         new Property("IceBox\\.Service\\.[^\\s]+", false, null),
-        new Property("IceBox\\.ServiceManager\\.ACM\\.Timeout", false, null),
-        new Property("IceBox\\.ServiceManager\\.ACM\\.Heartbeat", false, null),
-        new Property("IceBox\\.ServiceManager\\.ACM\\.Close", false, null),
-        new Property("IceBox\\.ServiceManager\\.ACM", false, null),
-        new Property("IceBox\\.ServiceManager\\.AdapterId", false, null),
-        new Property("IceBox\\.ServiceManager\\.Endpoints", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.EndpointSelection", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.ConnectionCached", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.PreferSecure", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.LocatorCacheTimeout", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.InvocationTimeout", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.Locator", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.Router", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.CollocationOptimized", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.Context\\.[^\\s]+", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator", false, null),
-        new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", false, null),
-        new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.EndpointSelection", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.ConnectionCached", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.PreferSecure", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.LocatorCacheTimeout", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.InvocationTimeout", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.Locator", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.Router", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.CollocationOptimized", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.Context\\.[^\\s]+", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router", false, null),
-        new Property("IceBox\\.ServiceManager\\.ProxyOptions", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.Size", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.StackSize", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.Serialize", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.ThreadIdleTime", false, null),
-        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.ThreadPriority", false, null),
+        new Property("IceBox\\.ServiceManager\\.AdapterId", true, null),
+        new Property("IceBox\\.ServiceManager\\.Endpoints", true, null),
+        new Property("IceBox\\.ServiceManager\\.Locator", true, null),
+        new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", true, null),
+        new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", true, null),
+        new Property("IceBox\\.ServiceManager\\.Router", true, null),
+        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.Size", true, null),
+        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax", true, null),
+        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn", true, null),
+        new Property("IceBox\\.ServiceManager\\.ThreadPool\\.StackSize", true, null),
         new Property("IceBox\\.Trace\\.ServiceObserver", false, null),
         new Property("IceBox\\.UseSharedCommunicator\\.[^\\s]+", false, null),
         null
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js
index ff6f7052e08..af85b86a783 100644
--- a/js/src/Ice/PropertyNames.js
+++ b/js/src/Ice/PropertyNames.js
@@ -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!
 
diff --git a/perf/src/IceStorm/config b/perf/src/IceStorm/config
index a8f2b5f930e..5d95642655b 100644
--- a/perf/src/IceStorm/config
+++ b/perf/src/IceStorm/config
@@ -1,4 +1,6 @@
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.Admin.Endpoints=tcp -p 9996
+Ice.Admin.InstanceName=icebox
+
 IceBox.Service.IceStorm=IceStormService,31:createIceStorm
 Freeze.DbEnv.IceStorm.DbHome=db
 
diff --git a/py/demo/IceStorm/clock/README b/py/demo/IceStorm/clock/README
index 4f5803614be..87d31ed8488 100644
--- a/py/demo/IceStorm/clock/README
+++ b/py/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/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox
index 97c9d6ffabb..e2f20ae08f9 100644
--- a/py/demo/IceStorm/clock/config.icebox
+++ b/py/demo/IceStorm/clock/config.icebox
@@ -1,11 +1,9 @@
 #
-# 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/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice
index af5c81c6bbf..3e589e79914 100644
--- a/slice/IceBox/IceBox.ice
+++ b/slice/IceBox/IceBox.ice
@@ -27,7 +27,7 @@
  **/
 module IceBox
 {
-    
+
 /**
  *
  * This exception is a general failure notification. It is thrown
@@ -153,7 +153,7 @@ interface ServiceManager
     /**
      *
      * Start an individual service.
-     * 
+     *
      * @param service The service name.
      *
      **/
@@ -163,18 +163,18 @@ interface ServiceManager
     /**
      *
      * Stop an individual service.
-     * 
+     *
      * @param service The service name.
      *
      **/
     void stopService(string service)
         throws AlreadyStoppedException, NoSuchServiceException;
 
-    
+
     /**
      *
      * Registers a new observer with the ServiceManager.
-     * 
+     *
      * @param observer The new observer
      *
      **/
diff --git a/vb/demo/IceBox/hello/config.admin b/vb/demo/IceBox/hello/config.admin
index 3f5d2d8e01f..e0612fe4f07 100644
--- a/vb/demo/IceBox/hello/config.admin
+++ b/vb/demo/IceBox/hello/config.admin
@@ -1,12 +1,4 @@
 #
-# The IceBox instance name is used to set the category field of the
-# IceBox ServiceManager identity.
+# Proxy to the IceBox ServiceManager:
 #
-IceBox.InstanceName=DemoIceBox
-
-#
-# The IceBox server endpoint configuration
-#
-IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998
-
-
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h localhost
diff --git a/vb/demo/IceBox/hello/config.icebox b/vb/demo/IceBox/hello/config.icebox
index 6232daf4fa2..1ce514f91ef 100644
--- a/vb/demo/IceBox/hello/config.icebox
+++ b/vb/demo/IceBox/hello/config.icebox
@@ -1,36 +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/vb/demo/IceStorm/clock/config.icebox b/vb/demo/IceStorm/clock/config.icebox
index 70533144839..d3c9980179b 100644
--- a/vb/demo/IceStorm/clock/config.icebox
+++ b/vb/demo/IceStorm/clock/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