Squashed commit of the following:

commit 8b2757175b076f620b2f5c5c788f811f38a4fa5b
Author: Bernard Normier <bernard@zeroc.com>
Date:   Wed Sep 26 18:56:30 2007 -0400

    Deprecated Glacier2.Admin and IcePatch2.Admin

4 files changed, 31 insertions, 32 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index b45ad68b29b..f514fb6a11a 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -340,19 +340,19 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.ThreadPool.SizeMax", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.SizeWarn", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.AdapterId", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Endpoints", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Locator", false, 0),
-    IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("IcePatch2.Admin.AdapterId", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Endpoints", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Locator", true, 0),
+    IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", true, 0),
     IceInternal::Property("IcePatch2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Router", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Router", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("IcePatch2.ChunkSize", false, 0),
     IceInternal::Property("IcePatch2.Directory", false, 0),
     IceInternal::Property("IcePatch2.InstanceName", false, 0),
@@ -472,19 +472,19 @@ const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddSSLContext", false, 0),
     IceInternal::Property("Glacier2.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
-    IceInternal::Property("Glacier2.Admin.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Admin.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Admin.Locator", false, 0),
-    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("Glacier2.Admin.AdapterId", true, 0),
+    IceInternal::Property("Glacier2.Admin.Endpoints", true, 0),
+    IceInternal::Property("Glacier2.Admin.Locator", true, 0),
+    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", true, 0),
     IceInternal::Property("Glacier2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Admin.Router", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", true, 0),
+    IceInternal::Property("Glacier2.Admin.Router", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection.StackSize", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("Glacier2.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
     IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
     IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index be0dfc68048..c9b88bf3f2a 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index e030ada78f1..27ae39bb7ff 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -929,13 +929,8 @@ IceBoxDescriptorBuilder::finish()
         _hiddenProperties.push_back(createProperty("IceBox.InstanceName", "${server}"));
     }
     
-    if(!isSet(_descriptor->propertySet.properties, "IceBox.ServiceManager.Endpoints"))
-    {
-        _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
-    }
-
     //
-    // The NodeCache takes care of setting RegisterProcess for old IceBox servers
+    // The NodeCache takes care of setting Endpoints and RegisterProcess for old IceBox servers
     //
 
     ServerDescriptorBuilder::finish();
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index f88258488fc..3ac84d29d4e 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -918,6 +918,10 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
                 props.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1"));
                 server->processRegistered = true;
             }
+            if(!isSet(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints"))
+            {
+                props.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
+            }
         }
     }