Squashed commit of the following:

commit 70a72ca50d39f20ab8d850f0842a8cd2c2a8351d
Author: Bernard Normier <bernard@zeroc.com>
Date:   Tue Sep 18 11:18:19 2007 -0400

    Bug fixes

commit 2983094468845f39614128cd82973b9c503680a5
Author: Bernard Normier <bernard@zeroc.com>
Date:   Fri Sep 7 11:00:18 2007 -0400

    First commit for bug 1532

7 files changed, 330 insertions, 57 deletions

diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 87ee92d8508..1cb1bce68bd 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -173,6 +173,24 @@ public final class CommunicatorI implements Communicator
         _instance.flushBatchRequests();
     }
 
+    public ObjectPrx 
+    getAdmin()
+    {
+        return _instance.getAdmin();
+    }
+
+    public void 
+    addAdminFacet(Object servant, String facet)
+    {
+        _instance.addAdminFacet(servant, facet);
+    }
+
+    public Object 
+    removeAdminFacet(String facet)
+    {
+        return _instance.removeAdminFacet(facet);
+    }
+
     CommunicatorI(InitializationData initData)
     {
         _instance = new IceInternal.Instance(this, initData);
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index b23c2b3e3a4..8d3e8bf8779 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1284,7 +1284,7 @@ public final class ObjectAdapterI implements ObjectAdapter
             {
                 if(_processId == null)
                 {
-                    Process servant = new ProcessI(_communicator);
+                    Process servant = new IceInternal.ProcessI(_communicator);
                     _processId = addWithUUID(servant).ice_getIdentity();
                 }
                 locatorRegistry.setServerProcessProxy(serverId, 
@@ -1362,40 +1362,6 @@ public final class ObjectAdapterI implements ObjectAdapter
         return noProps;
     }
 
-    private static class ProcessI extends _ProcessDisp
-    {
-        ProcessI(Communicator communicator)
-        {
-            _communicator = communicator;
-        }
-
-        public void
-        shutdown(Ice.Current current)
-        {
-            _communicator.shutdown();
-        }
-
-        public void
-        writeMessage(String message, int fd, Ice.Current current)
-        {
-            switch(fd)
-            {
-                case 1:
-                {
-                    System.out.println(message);
-                    break;
-                }
-                case 2:
-                {
-                    System.err.println(message);
-                    break;
-                }
-            }
-        }
-
-        private Communicator _communicator;
-    }
-
     private boolean _deactivated;
     private IceInternal.Instance _instance;
     private Communicator _communicator;
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index d63bb237763..c810ce9531b 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -234,6 +234,20 @@ public class ServiceManagerI extends _ServiceManagerDisp
                 }
             }
 
+            //
+            // Register "this" as a facet to the Admin object
+            //
+            try
+            {
+                _server.communicator().addAdminFacet(this, "IceBox.ServiceManager");
+            }
+            catch(Ice.CommunicatorDestroyedException ex)
+            {
+                //
+                // Ignored
+                //
+            }
+
             _server.communicator().waitForShutdown();
             _server.defaultInterrupt();
 
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index fe06fa2bf0b..ebad61f8f70 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -298,6 +298,71 @@ public final class Instance
         return Ice.Util.identityToString(ident);
     }
 
+    
+    public synchronized Ice.ObjectPrx 
+    getAdmin()
+    {
+        if(_state == StateDestroyed)
+        {
+            throw new Ice.CommunicatorDestroyedException();
+        }
+        if(_adminAdapter == null)
+        {
+            return null;
+        }
+        else
+        {
+            return _adminAdapter.createProxy(_adminIdentity);
+        }
+    }
+
+    public synchronized void 
+    addAdminFacet(Ice.Object servant, String facet)
+    {
+        if(_state == StateDestroyed)
+        {
+            throw new Ice.CommunicatorDestroyedException();
+        }
+        
+        if(_adminAdapter == null)
+        {
+            if(_adminFacets.get(facet) != null)
+            {
+                throw new Ice.AlreadyRegisteredException("facet", facet);
+            }
+            _adminFacets.put(facet, servant);
+        }
+        else
+        {
+            _adminAdapter.addFacet(servant, _adminIdentity, facet);
+        }
+    }
+
+    public synchronized Ice.Object 
+    removeAdminFacet(String facet)
+    {
+        if(_state == StateDestroyed)
+        {
+            throw new Ice.CommunicatorDestroyedException();
+        }
+        
+        Ice.Object result = null;
+        if(_adminAdapter == null)
+        {
+            result = (Ice.Object)_adminFacets.remove(facet);
+
+            if(result == null)
+            {
+                throw new Ice.NotRegisteredException("facet", facet);
+            }
+        }
+        else
+        {
+            result = _adminAdapter.removeFacet(_adminIdentity, facet);
+        }
+        return result;
+    }
+
     //
     // Only for use by Ice.CommunicatorI
     //
@@ -455,6 +520,10 @@ public final class Instance
             _servantFactoryManager = new ObjectFactoryManager();
 
             _objectAdapterFactory = new ObjectAdapterFactory(this, communicator);
+
+            _adminFacets.put("Properties", new PropertiesAdminI(_initData.properties));
+            _adminFacets.put("Process", new ProcessI(communicator));
+
         }
         catch(Ice.LocalException ex)
         {
@@ -507,9 +576,69 @@ public final class Instance
         _referenceFactory.setDefaultRouter(Ice.RouterPrxHelper.uncheckedCast(
             _proxyFactory.propertyToProxy("Ice.Default.Router")));
 
-        _referenceFactory.setDefaultLocator(Ice.LocatorPrxHelper.uncheckedCast(
-            _proxyFactory.propertyToProxy("Ice.Default.Locator")));
+        Ice.LocatorPrx defaultLocator = Ice.LocatorPrxHelper.uncheckedCast(
+            _proxyFactory.propertyToProxy("Ice.Default.Locator"));
+
+        _referenceFactory.setDefaultLocator(defaultLocator);
         
+
+        // 
+        // Create Admin object depending on configuration
+        // No-op unless Endpoints is set
+        //
+        String adminOA = "Ice.Admin";
+        if(_initData.properties.getProperty(adminOA + ".Endpoints").length() > 0)
+        {
+            String serverId = _initData.properties.getProperty("Ice.Admin.ServerId");
+            String instanceName = _initData.properties.getProperty("Ice.Admin.InstanceName");
+            
+            if((defaultLocator != null && serverId.length() > 0) || instanceName.length() > 0)
+            {
+                _adminIdentity.name = "admin";
+                if(instanceName.length() == 0)
+                {
+                    instanceName = Ice.Util.generateUUID();
+                }
+                _adminIdentity.category = instanceName;
+                
+                //
+                // Create OA
+                //
+                _adminAdapter = _objectAdapterFactory.createObjectAdapter(adminOA, "", null);
+                
+                //
+                // Add all facets to OA
+                //
+                java.util.Iterator p = _adminFacets.entrySet().iterator();
+                while(p.hasNext())
+                {
+                    java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
+                    _adminAdapter.addFacet((Ice.Object)entry.getValue(), _adminIdentity, (String)entry.getKey());
+                }
+                _adminFacets.clear();
+                
+                //
+                // Activate OA
+                //
+                _adminAdapter.activate();
+            
+                if(defaultLocator != null && serverId.length() > 0)
+                {    
+                    Ice.ProcessPrx process = Ice.ProcessPrxHelper.uncheckedCast(
+                        _adminAdapter.createProxy(_adminIdentity).ice_facet("Process"));
+                    
+                    try
+                    {
+                        defaultLocator.getRegistry().setServerProcessProxy(serverId, process);
+                    }
+                    catch(Ice.ServerNotFoundException ex)
+                    {
+                        throw new Ice.InitializationException("Locator knows nothing about server '" + serverId + "'");
+                    }
+                }
+            }
+        }
+
         //
         // Start connection monitor if necessary.
         //
@@ -666,6 +795,9 @@ public final class Instance
                 _pluginManager = null;
             }
             
+            _adminAdapter = null;
+            _adminFacets.clear();
+
             _state = StateDestroyed;
         }
 
@@ -754,7 +886,11 @@ public final class Instance
     private EndpointFactoryManager _endpointFactoryManager;
     private Ice.PluginManager _pluginManager;
     private java.util.Map _defaultContext;
- 
+
+    private Ice.ObjectAdapter _adminAdapter;
+    private java.util.Map _adminFacets = new java.util.HashMap();
+    private Ice.Identity _adminIdentity;
+
     private static java.util.Map _emptyContext = new java.util.HashMap();
 
     private static boolean _oneOffDone = false;
diff --git a/java/src/IceInternal/ProcessI.java b/java/src/IceInternal/ProcessI.java
new file mode 100644
index 00000000000..533d1edfa26
--- /dev/null
+++ b/java/src/IceInternal/ProcessI.java
@@ -0,0 +1,44 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+public class ProcessI extends Ice._ProcessDisp
+{
+    public ProcessI(Ice.Communicator communicator)
+    {
+        _communicator = communicator;
+    }
+    
+    public void
+    shutdown(Ice.Current current)
+    {
+        _communicator.shutdown();
+    }
+    
+    public void
+    writeMessage(String message, int fd, Ice.Current current)
+    {
+        switch(fd)
+        {
+            case 1:
+            {
+                System.out.println(message);
+                break;
+            }
+            case 2:
+            {
+                System.err.println(message);
+                break;
+            }
+        }
+    }
+    
+    private Ice.Communicator _communicator;
+}
diff --git a/java/src/IceInternal/PropertiesAdminI.java b/java/src/IceInternal/PropertiesAdminI.java
new file mode 100644
index 00000000000..11708f7df12
--- /dev/null
+++ b/java/src/IceInternal/PropertiesAdminI.java
@@ -0,0 +1,50 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+class PropertiesAdminI extends Ice._PropertiesAdminDisp
+{
+    PropertiesAdminI(Ice.Properties properties)
+    {
+        _properties = properties;
+    }
+    
+    public String
+    getProperty(String name, Ice.Current current)
+    {
+        return _properties.getProperty(name);
+    }
+    
+    public String
+    getPropertyWithDefault(String name, String dflt, Ice.Current current)
+    {
+        return _properties.getPropertyWithDefault(name, dflt);
+    }
+
+    public int
+    getPropertyAsInt(String name, Ice.Current current)
+    {
+        return _properties.getPropertyAsInt(name);
+    }
+
+    public int
+    getPropertyAsIntWithDefault(String name, int dflt, Ice.Current current)
+    {
+        return _properties.getPropertyAsIntWithDefault(name, dflt);
+    }
+
+    public java.util.Map
+    getPropertiesForPrefix(String name, Ice.Current current)
+    {
+        return _properties.getPropertiesForPrefix(name);
+    }
+    
+    private final Ice.Properties _properties;
+}
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index d22122daf46..7501c26d438 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Sep  6 17:17:28 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Sep  7 11:03:12 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -19,6 +19,21 @@ public final class PropertyNames
     {
         new Property("Ice\\.ACM\\.Client", false, null),
         new Property("Ice\\.ACM\\.Server", false, null),
+        new Property("Ice\\.Admin\\.AdapterId", false, null),
+        new Property("Ice\\.Admin\\.Endpoints", false, null),
+        new Property("Ice\\.Admin\\.Locator", false, null),
+        new Property("Ice\\.Admin\\.PublishedEndpoints", false, null),
+        new Property("Ice\\.Admin\\.RegisterProcess", true, null),
+        new Property("Ice\\.Admin\\.ReplicaGroupId", false, null),
+        new Property("Ice\\.Admin\\.Router", false, null),
+        new Property("Ice\\.Admin\\.ThreadPerConnection", false, null),
+        new Property("Ice\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
+        new Property("Ice\\.Admin\\.ThreadPool\\.Size", false, null),
+        new Property("Ice\\.Admin\\.ThreadPool\\.SizeMax", false, null),
+        new Property("Ice\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("Ice\\.Admin\\.ThreadPool\\.StackSize", false, null),
+        new Property("Ice\\.Admin\\.InstanceName", false, null),
+        new Property("Ice\\.Admin\\.ServerId", false, null),
         new Property("Ice\\.BatchAutoFlush", false, null),
         new Property("Ice\\.ChangeUser", false, null),
         new Property("Ice\\.Compression\\.Level", false, null),
@@ -69,7 +84,7 @@ public final class PropertyNames
         new Property("Ice\\.PrintProcessId", false, null),
         new Property("Ice\\.ProgramName", false, null),
         new Property("Ice\\.RetryIntervals", false, null),
-        new Property("Ice\\.ServerId", false, null),
+        new Property("Ice\\.ServerId", true, null),
         new Property("Ice\\.ServerIdleTime", false, null),
         new Property("Ice\\.StdErr", false, null),
         new Property("Ice\\.StdOut", false, null),
@@ -115,7 +130,7 @@ public final class PropertyNames
         new Property("IceBox\\.ServiceManager\\.Endpoints", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", false, null),
-        new Property("IceBox\\.ServiceManager\\.RegisterProcess", false, null),
+        new Property("IceBox\\.ServiceManager\\.RegisterProcess", true, null),
         new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", false, null),
         new Property("IceBox\\.ServiceManager\\.Router", false, null),
         new Property("IceBox\\.ServiceManager\\.ThreadPerConnection", false, null),
@@ -147,7 +162,7 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.Endpoints", false, null),
         new Property("IceGrid\\.Node\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Node\\.RegisterProcess", false, null),
+        new Property("IceGrid\\.Node\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Node\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Node\\.Router", false, null),
         new Property("IceGrid\\.Node\\.ThreadPerConnection", false, null),
@@ -208,7 +223,7 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Client\\.Endpoints", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.RegisterProcess", false, null),
+        new Property("IceGrid\\.Registry\\.Client\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Client\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.ThreadPerConnection", false, null),
@@ -225,7 +240,7 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Internal\\.Endpoints", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.RegisterProcess", false, null),
+        new Property("IceGrid\\.Registry\\.Internal\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Internal\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.ThreadPerConnection", false, null),
@@ -251,7 +266,7 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Server\\.Endpoints", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.RegisterProcess", false, null),
+        new Property("IceGrid\\.Registry\\.Server\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.Server\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.ThreadPerConnection", false, null),
@@ -265,7 +280,7 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SessionManager\\.Endpoints", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.RegisterProcess", false, null),
+        new Property("IceGrid\\.Registry\\.SessionManager\\.RegisterProcess", true, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPerConnection", false, null),
@@ -304,7 +319,7 @@ public final class PropertyNames
         new Property("IcePatch2\\.Endpoints", false, null),
         new Property("IcePatch2\\.Locator", false, null),
         new Property("IcePatch2\\.PublishedEndpoints", false, null),
-        new Property("IcePatch2\\.RegisterProcess", false, null),
+        new Property("IcePatch2\\.RegisterProcess", true, null),
         new Property("IcePatch2\\.ReplicaGroupId", false, null),
         new Property("IcePatch2\\.Router", false, null),
         new Property("IcePatch2\\.ThreadPerConnection", false, null),
@@ -317,7 +332,7 @@ public final class PropertyNames
         new Property("IcePatch2\\.Admin\\.Endpoints", false, null),
         new Property("IcePatch2\\.Admin\\.Locator", false, null),
         new Property("IcePatch2\\.Admin\\.PublishedEndpoints", false, null),
-        new Property("IcePatch2\\.Admin\\.RegisterProcess", false, null),
+        new Property("IcePatch2\\.Admin\\.RegisterProcess", true, null),
         new Property("IcePatch2\\.Admin\\.ReplicaGroupId", false, null),
         new Property("IcePatch2\\.Admin\\.Router", false, null),
         new Property("IcePatch2\\.Admin\\.ThreadPerConnection", false, null),
@@ -383,7 +398,7 @@ public final class PropertyNames
         new Property("IceStorm\\.Publish\\.Endpoints", false, null),
         new Property("IceStorm\\.Publish\\.Locator", false, null),
         new Property("IceStorm\\.Publish\\.PublishedEndpoints", false, null),
-        new Property("IceStorm\\.Publish\\.RegisterProcess", false, null),
+        new Property("IceStorm\\.Publish\\.RegisterProcess", true, null),
         new Property("IceStorm\\.Publish\\.ReplicaGroupId", false, null),
         new Property("IceStorm\\.Publish\\.Router", false, null),
         new Property("IceStorm\\.Publish\\.ThreadPerConnection", false, null),
@@ -396,7 +411,7 @@ public final class PropertyNames
         new Property("IceStorm\\.TopicManager\\.Endpoints", false, null),
         new Property("IceStorm\\.TopicManager\\.Locator", false, null),
         new Property("IceStorm\\.TopicManager\\.PublishedEndpoints", false, null),
-        new Property("IceStorm\\.TopicManager\\.RegisterProcess", false, null),
+        new Property("IceStorm\\.TopicManager\\.RegisterProcess", true, null),
         new Property("IceStorm\\.TopicManager\\.ReplicaGroupId", false, null),
         new Property("IceStorm\\.TopicManager\\.Router", false, null),
         new Property("IceStorm\\.TopicManager\\.ThreadPerConnection", false, null),
@@ -433,16 +448,36 @@ public final class PropertyNames
     {
         new Property("Glacier2\\.AddSSLContext", false, null),
         new Property("Glacier2\\.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
+        new Property("Glacier2\\.Admin\\.AdapterId", false, null),
         new Property("Glacier2\\.Admin\\.Endpoints", false, null),
+        new Property("Glacier2\\.Admin\\.Locator", false, null),
         new Property("Glacier2\\.Admin\\.PublishedEndpoints", false, null),
-        new Property("Glacier2\\.Admin\\.RegisterProcess", false, null),
+        new Property("Glacier2\\.Admin\\.RegisterProcess", true, null),
+        new Property("Glacier2\\.Admin\\.ReplicaGroupId", false, null),
+        new Property("Glacier2\\.Admin\\.Router", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPerConnection", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", false, null),
         new Property("Glacier2\\.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
+        new Property("Glacier2\\.Client\\.AdapterId", false, null),
+        new Property("Glacier2\\.Client\\.Endpoints", false, null),
+        new Property("Glacier2\\.Client\\.Locator", false, null),
+        new Property("Glacier2\\.Client\\.PublishedEndpoints", false, null),
+        new Property("Glacier2\\.Client\\.RegisterProcess", true, null),
+        new Property("Glacier2\\.Client\\.ReplicaGroupId", false, null),
+        new Property("Glacier2\\.Client\\.Router", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPerConnection", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPerConnection\\.StackSize", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPool\\.Size", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPool\\.SizeMax", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("Glacier2\\.Client\\.ThreadPool\\.StackSize", false, null),
         new Property("Glacier2\\.Client\\.AlwaysBatch", false, null),
         new Property("Glacier2\\.Client\\.Buffered", false, null),
-        new Property("Glacier2\\.Client\\.Endpoints", false, null),
         new Property("Glacier2\\.Client\\.ForwardContext", false, null),
-        new Property("Glacier2\\.Client\\.PublishedEndpoints", false, null),
-        new Property("Glacier2\\.Client\\.RegisterProcess", false, null),
         new Property("Glacier2\\.Client\\.SleepTime", false, null),
         new Property("Glacier2\\.Client\\.Trace\\.Override", false, null),
         new Property("Glacier2\\.Client\\.Trace\\.Reject", false, null),
@@ -478,12 +513,22 @@ public final class PropertyNames
         new Property("Glacier2\\.SSLPermissionsVerifier\\.ThreadPerConnection", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier", false, null),
         new Property("Glacier2\\.RoutingTable\\.MaxSize", false, null),
+        new Property("Glacier2\\.Server\\.AdapterId", false, null),
+        new Property("Glacier2\\.Server\\.Endpoints", false, null),
+        new Property("Glacier2\\.Server\\.Locator", false, null),
+        new Property("Glacier2\\.Server\\.PublishedEndpoints", false, null),
+        new Property("Glacier2\\.Server\\.RegisterProcess", true, null),
+        new Property("Glacier2\\.Server\\.ReplicaGroupId", false, null),
+        new Property("Glacier2\\.Server\\.Router", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPerConnection", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPerConnection\\.StackSize", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPool\\.Size", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPool\\.SizeMax", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("Glacier2\\.Server\\.ThreadPool\\.StackSize", false, null),
         new Property("Glacier2\\.Server\\.AlwaysBatch", false, null),
         new Property("Glacier2\\.Server\\.Buffered", false, null),
-        new Property("Glacier2\\.Server\\.Endpoints", false, null),
         new Property("Glacier2\\.Server\\.ForwardContext", false, null),
-        new Property("Glacier2\\.Server\\.PublishedEndpoints", false, null),
-        new Property("Glacier2\\.Server\\.RegisterProcess", false, null),
         new Property("Glacier2\\.Server\\.SleepTime", false, null),
         new Property("Glacier2\\.Server\\.Trace\\.Override", false, null),
         new Property("Glacier2\\.Server\\.Trace\\.Request", false, null),