Remove Ice.OA.

9 files changed, 102 insertions, 140 deletions

diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index ff33df2bf13..fa0a9801cfa 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -69,11 +69,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
             if(!_noConfig)
             {
                 final Properties properties = _instance.initializationData().properties;
-                //
-                // DEPRECATED PROPERTY: Remove extra code in future release.
-                //
-                registerProcess = properties.getPropertyAsIntWithDefault(_propertyPrefix + _name +".RegisterProcess",
-                        properties.getPropertyAsInt(_name +".RegisterProcess")) > 0;
+                registerProcess = properties.getPropertyAsInt(_name +".RegisterProcess") > 0;
                 printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0;
             }
         }
@@ -752,64 +748,35 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
         }
 
         //
-        // DEPRECATED PROPERTIES: Remove extra code in future release.
-        //
-
-        //
         // Make sure named adapter has some configuration.
         //
         final Properties properties = _instance.initializationData().properties;
-        String[] oldProps = filterProperties(_name + ".");
-        if(endpointInfo.length() == 0 && router == null)
+        String[] props = filterProperties(_name + ".");
+        if(endpointInfo.length() == 0 && router == null && props.length == 0)
         {
-            String[] props = filterProperties(_propertyPrefix + _name + ".");
-            if(props.length == 0 && oldProps.length == 0)
-            {
-                //
-                // These need to be set to prevent finalizer from complaining.
-                //
-                _deactivated = true;
-                _destroyed = true;
-                _instance = null;
-                _communicator = null;
-                _incomingConnectionFactories = null;
-
-                InitializationException ex = new InitializationException();
-                ex.reason = "object adapter \"" + _name + "\" requires configuration.";
-                throw ex;
-            }
-        }
+            //
+            // These need to be set to prevent finalizer from complaining.
+            //
+            _deactivated = true;
+            _destroyed = true;
+            _instance = null;
+            _communicator = null;
+            _incomingConnectionFactories = null;
 
-        if(oldProps.length != 0)
-        {
-            String message = "The following properties have been deprecated, please prepend \"Ice.OA.\":";
-            for(int i = 0; i < oldProps.length; ++i)
-            {
-                message += "\n    " + oldProps[i];
-            }
-            _instance.initializationData().logger.warning(message);
+            InitializationException ex = new InitializationException();
+            ex.reason = "object adapter \"" + _name + "\" requires configuration.";
+            throw ex;
         }
 
-        _id = properties.getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId",
-                properties.getProperty(_name + ".AdapterId"));
-        _replicaGroupId = properties.getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId",
-                properties.getProperty(_name + ".ReplicaGroupId"));
+        _id = properties.getProperty(_name + ".AdapterId");
+        _replicaGroupId = properties.getProperty(_name + ".ReplicaGroupId");
         
         try
         {
-            _threadPerConnection = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPerConnection") > 0;
-
-            int threadPoolSize = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size");
-            if(threadPoolSize == 0)
-            {
-                threadPoolSize = properties.getPropertyAsInt(_name + ".ThreadPool.Size");
-            }
-            int threadPoolSizeMax = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax");
-            if(threadPoolSizeMax == 0)
-            {
-                threadPoolSizeMax = properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax");
-            }
+            _threadPerConnection = properties.getPropertyAsInt(_name + ".ThreadPerConnection") > 0;
 
+            int threadPoolSize = properties.getPropertyAsInt(_name + ".ThreadPool.Size");
+            int threadPoolSizeMax = properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax");
             if(_threadPerConnection && (threadPoolSize > 0 || threadPoolSizeMax > 0))
             {
                 InitializationException ex = new InitializationException();
@@ -825,26 +792,12 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 
             if(threadPoolSize > 0 || threadPoolSizeMax > 0)
             {
-                if(properties.getProperty(_propertyPrefix + _name + ".ThreadPool.Size").length() != 0 ||
-                   properties.getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").length() != 0)
-                {
-                    _threadPool = new IceInternal.ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0);
-                }
-                else
-                {
-                    _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0);
-                }
+                _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0);
             }
 
             if(router == null)
             {
-                router = RouterPrxHelper.uncheckedCast(
-                    _instance.proxyFactory().propertyToProxy(_propertyPrefix + name + ".Router"));
-                if(router == null)
-                {
-                    router = RouterPrxHelper.uncheckedCast(
-                        _instance.proxyFactory().propertyToProxy(name + ".Router"));
-                }
+                router = RouterPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(name + ".Router"));
             }
             if(router != null)
             {
@@ -914,8 +867,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
                 java.util.ArrayList endpoints;
                 if(endpointInfo.length() == 0)
                 {
-                    endpoints = parseEndpoints(properties.getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints",
-                        properties.getProperty(_name + ".Endpoints")));
+                    endpoints = parseEndpoints(properties.getProperty(_name + ".Endpoints"));
                 }
                 else
                 {
@@ -950,8 +902,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
                 // Parse published endpoints. If set, these are used in proxies
                 // instead of the connection factory Endpoints.
                 //
-                String endpts = properties.getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints",
-                        properties.getProperty(_name + ".PublishedEndpoints"));
+                String endpts = properties.getProperty(_name + ".PublishedEndpoints");
                 _publishedEndpoints = parseEndpoints(endpts);
                 if(_publishedEndpoints.size() == 0)
                 {
@@ -977,12 +928,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
                 }
             }
 
-            String locatorProperty = _propertyPrefix + _name + ".Locator";
-            if(properties.getProperty(locatorProperty).length() > 0)
-            {
-                setLocator(LocatorPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(locatorProperty)));
-            }
-            else if(properties.getProperty(_name + ".Locator").length() > 0)
+            if(properties.getProperty(_name + ".Locator").length() > 0)
             {
                 setLocator(LocatorPrxHelper.uncheckedCast(
                     _instance.proxyFactory().propertyToProxy(_name + ".Locator")));
@@ -1354,5 +1300,4 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
     private boolean _destroyed;
     private boolean _noConfig;
     private boolean _threadPerConnection;
-    static private String _propertyPrefix = "Ice.OA.";
 }
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index 79a88217d46..d83b4d1cc15 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -68,12 +68,7 @@ public final class Admin
             String managerProxy;
             if(properties.getProperty("Ice.Default.Locator").length() == 0)
             {
-                //
-                // DEPREACTED PROPERTIES: Remove extra code in future release.
-                //
-                String managerEndpoints = 
-                    properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints",
-                                                      properties.getProperty("IceBox.ServiceManager.Endpoints"));
+                String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
                 if(managerEndpoints.length() == 0)
                 {
                     System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set");
@@ -84,12 +79,7 @@ public final class Admin
             }
             else
             {
-                //
-                // DEPREACTED PROPERTIES: Remove extra code in future release.
-                //
-                String managerAdapterId = 
-                    properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId",
-                                                      properties.getProperty("IceBox.ServiceManager.AdapterId"));
+                String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
                 if(managerAdapterId.length() == 0)
                 {
                     System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set");
diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java
index f12b90d139b..242c96fa7c0 100755
--- a/java/src/IceGridGUI/Application/Adapter.java
+++ b/java/src/IceGridGUI/Application/Adapter.java
@@ -105,8 +105,8 @@ class Adapter extends TreeNode implements DescriptorHolder
 
     public void destroy()
     {
-        removeProperty("Ice.OA." + _descriptor.name + ".Endpoints");
-        removeProperty("Ice.OA." + _descriptor.name + ".PublishedEndpoints");
+        removeProperty(_descriptor.name + ".Endpoints");
+        removeProperty(_descriptor.name + ".PublishedEndpoints");
 
         ((Communicator)_parent).getAdapters().destroyChild(this);
     }
@@ -154,7 +154,7 @@ class Adapter extends TreeNode implements DescriptorHolder
         {
             java.util.List attributes = new java.util.LinkedList();
             attributes.add(createAttribute("name", _descriptor.name));
-            String oaPrefix = "Ice.OA." + _descriptor.name + ".";
+            String oaPrefix = _descriptor.name + ".";
 
             attributes.add(createAttribute("endpoints", getProperty(oaPrefix + "Endpoints")));
             attributes.add(createAttribute("id", _descriptor.id));
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 5b8f8f85647..86162008c8f 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -298,21 +298,21 @@ class AdapterEditor extends CommunicatorChildEditor
         Adapter adapter = getAdapter();
         if(!name.equals(_oldName))
         {
-            adapter.removeProperty("Ice.OA." + _oldName + ".Endpoints");
-            adapter.removeProperty("Ice.OA." + _oldName + ".PublishedEndpoints");
+            adapter.removeProperty(_oldName + ".Endpoints");
+            adapter.removeProperty(_oldName + ".PublishedEndpoints");
             _oldName = name;
         }
         
-        adapter.setProperty("Ice.OA." + name + ".Endpoints", _endpoints.getText().trim());
+        adapter.setProperty(name + ".Endpoints", _endpoints.getText().trim());
         
         Object published = _publishedEndpoints.getSelectedItem();
         if(published == PUBLISH_ACTUAL)
         {
-            adapter.removeProperty("Ice.OA." + name + ".PublishedEndpoints");
+            adapter.removeProperty(name + ".PublishedEndpoints");
         }
         else
         {
-            adapter.setProperty("Ice.OA." + name + ".PublishedEndpoints",
+            adapter.setProperty(name + ".PublishedEndpoints",
                                 published.toString().trim());
 
         }
@@ -437,7 +437,7 @@ class AdapterEditor extends CommunicatorChildEditor
         _name.setText(Utils.substitute(descriptor.name, resolver));
         _name.setEditable(isEditable);
 
-        String oaPrefix = "Ice.OA." + descriptor.name + ".";
+        String oaPrefix = descriptor.name + ".";
 
         _description.setText(
             Utils.substitute(descriptor.description, resolver));
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java
index 1f7805abfd0..9a2b1e9abb3 100755
--- a/java/src/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/Application/PlainServer.java
@@ -88,8 +88,8 @@ class PlainServer extends Communicator implements Server
     {
         java.util.LinkedList properties = new java.util.LinkedList();
         properties.add(new PropertyDescriptor("IceBox.InstanceName", "${server}"));
-        properties.add(new PropertyDescriptor("Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
-        properties.add(new PropertyDescriptor("Ice.OA.IceBox.ServiceManager.RegisterProcess", "1"));
+        properties.add(new PropertyDescriptor("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
+        properties.add(new PropertyDescriptor("IceBox.ServiceManager.RegisterProcess", "1"));
 
         return new IceBoxDescriptor(
             new java.util.LinkedList(),
diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java
index ed2035f56c9..447fb116567 100755
--- a/java/src/IceGridGUI/Application/PropertiesField.java
+++ b/java/src/IceGridGUI/Application/PropertiesField.java
@@ -105,8 +105,8 @@ public class PropertiesField extends JTable
             while(p.hasNext())
             {
                 AdapterDescriptor ad = (AdapterDescriptor)p.next();
-                hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints");
-                hiddenPropertyNames.add("Ice.OA." + ad.name + ".PublishedEndpoints");
+                hiddenPropertyNames.add(ad.name + ".Endpoints");
+                hiddenPropertyNames.add(ad.name + ".PublishedEndpoints");
 
                 java.util.Iterator q = ad.objects.iterator();
                 while(q.hasNext())
diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java
index 8c8d6582b04..8a926da712e 100755
--- a/java/src/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/Application/TreeNode.java
@@ -144,7 +144,7 @@ public abstract class TreeNode extends TreeNodeBase
             while(p.hasNext())
             {
                 AdapterDescriptor ad = (AdapterDescriptor)p.next();
-                hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints");
+                hiddenPropertyNames.add(ad.name + ".Endpoints");
 
                 java.util.Iterator q = ad.objects.iterator();
                 while(q.hasNext())
diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
index f4b64e8a23d..aff5ba70683 100755
--- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java
@@ -71,9 +71,9 @@ class AdapterEditor extends Editor
         java.util.Map properties = adapter.getProperties();
         
         // getId() returns the name of the adapter!
-        _endpoints.setText(resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".Endpoints")));
+        _endpoints.setText(resolver.substitute((String)properties.get(adapter.getId() + ".Endpoints")));
         _publishedEndpoints.setText(
-            resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".PublishedEndpoints")));
+            resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints")));
         
         _registerProcess.setSelected(descriptor.registerProcess);       
         _serverLifetime.setSelected(descriptor.serverLifetime);
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 9e9cda7c149..d7c514c7ba1 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.def', Tue Feb 13 09:45:20 2007
+// Generated by makeprops.py from file `../config/PropertyNames.def', Wed Feb 14 09:38:50 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -57,19 +57,6 @@ public final class PropertyNames
         "^Ice\\.MonitorConnections$",
         "^Ice\\.Nohup$",
         "^Ice\\.NullHandleAbort$",
-        "^Ice\\.OA\\.[^\\s]+\\.AdapterId$",
-        "^Ice\\.OA\\.[^\\s]+\\.Endpoints$",
-        "^Ice\\.OA\\.[^\\s]+\\.Locator$",
-        "^Ice\\.OA\\.[^\\s]+\\.PublishedEndpoints$",
-        "^Ice\\.OA\\.[^\\s]+\\.RegisterProcess$",
-        "^Ice\\.OA\\.[^\\s]+\\.ReplicaGroupId$",
-        "^Ice\\.OA\\.[^\\s]+\\.Router$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPerConnection$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPerConnection\\.StackSize$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.Size$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeMax$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeWarn$",
-        "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.StackSize$",
         "^Ice\\.Override\\.Compress$",
         "^Ice\\.Override\\.ConnectTimeout$",
         "^Ice\\.Override\\.Timeout$",
@@ -121,10 +108,14 @@ public final class PropertyNames
         "^IceBox\\.PrintServicesReady$",
         "^IceBox\\.Service\\.[^\\s]+$",
         "^IceBox\\.ServiceManager\\.AdapterId$",
-        "^IceBox\\.ServiceManager\\.ReplicaGroupId$",
         "^IceBox\\.ServiceManager\\.Endpoints$",
+        "^IceBox\\.ServiceManager\\.Locator$",
         "^IceBox\\.ServiceManager\\.PublishedEndpoints$",
         "^IceBox\\.ServiceManager\\.RegisterProcess$",
+        "^IceBox\\.ServiceManager\\.ReplicaGroupId$",
+        "^IceBox\\.ServiceManager\\.Router$",
+        "^IceBox\\.ServiceManager\\.ThreadPerConnection$",
+        "^IceBox\\.ServiceManager\\.ThreadPerConnection\\.StackSize$",
         "^IceBox\\.ServiceManager\\.ThreadPool\\.Size$",
         "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax$",
         "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn$",
@@ -150,18 +141,22 @@ public final class PropertyNames
         "^IceGrid\\.AdminGUI\\.Endpoints$",
         "^IceGrid\\.InstanceName$",
         "^IceGrid\\.Node\\.AdapterId$",
-        "^IceGrid\\.Node\\.ReplicaGroupId$",
-        "^IceGrid\\.Node\\.RegisterProcess$",
         "^IceGrid\\.Node\\.CollocateRegistry$",
         "^IceGrid\\.Node\\.Data$",
         "^IceGrid\\.Node\\.DisableOnFailure$",
         "^IceGrid\\.Node\\.Endpoints$",
+        "^IceGrid\\.Node\\.Locator$",
         "^IceGrid\\.Node\\.Name$",
         "^IceGrid\\.Node\\.Output$",
         "^IceGrid\\.Node\\.PrintServersReady$",
         "^IceGrid\\.Node\\.PropertiesOverride$",
         "^IceGrid\\.Node\\.PublishedEndpoints$",
         "^IceGrid\\.Node\\.RedirectErrToOut$",
+        "^IceGrid\\.Node\\.RegisterProcess$",
+        "^IceGrid\\.Node\\.ReplicaGroupId$",
+        "^IceGrid\\.Node\\.Router$",
+        "^IceGrid\\.Node\\.ThreadPerConnection$",
+        "^IceGrid\\.Node\\.ThreadPerConnection\\.StackSize$",
         "^IceGrid\\.Node\\.ThreadPool\\.Size$",
         "^IceGrid\\.Node\\.ThreadPool\\.SizeMax$",
         "^IceGrid\\.Node\\.ThreadPool\\.SizeWarn$",
@@ -182,15 +177,6 @@ public final class PropertyNames
         "^IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimization$",
         "^IceGrid\\.Node\\.UserAccountMapper\\.ThreadPerConnection$",
         "^IceGrid\\.Node\\.WaitTime$",
-        "^IceGrid\\.Registry\\.SessionManager\\.AdapterId$",
-        "^IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId$",
-        "^IceGrid\\.Registry\\.SessionManager\\.Endpoints$",
-        "^IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints$",
-        "^IceGrid\\.Registry\\.SessionManager\\.RegisterProcess$",
-        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Size$",
-        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeMax$",
-        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeWarn$",
-        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.StackSize$",
         "^IceGrid\\.Registry\\.AdminCryptPasswords$",
         "^IceGrid\\.Registry\\.AdminPermissionsVerifier$",
         "^IceGrid\\.Registry\\.AdminPermissionsVerifier\\.EndpointSelection$",
@@ -211,10 +197,14 @@ public final class PropertyNames
         "^IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimization$",
         "^IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.ThreadPerConnection$",
         "^IceGrid\\.Registry\\.Client\\.AdapterId$",
-        "^IceGrid\\.Registry\\.Client\\.ReplicaGroupId$",
         "^IceGrid\\.Registry\\.Client\\.Endpoints$",
+        "^IceGrid\\.Registry\\.Client\\.Locator$",
         "^IceGrid\\.Registry\\.Client\\.PublishedEndpoints$",
         "^IceGrid\\.Registry\\.Client\\.RegisterProcess$",
+        "^IceGrid\\.Registry\\.Client\\.ReplicaGroupId$",
+        "^IceGrid\\.Registry\\.Client\\.Router$",
+        "^IceGrid\\.Registry\\.Client\\.ThreadPerConnection$",
+        "^IceGrid\\.Registry\\.Client\\.ThreadPerConnection\\.StackSize$",
         "^IceGrid\\.Registry\\.Client\\.ThreadPool\\.Size$",
         "^IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeMax$",
         "^IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeWarn$",
@@ -224,10 +214,14 @@ public final class PropertyNames
         "^IceGrid\\.Registry\\.DefaultTemplates$",
         "^IceGrid\\.Registry\\.DynamicRegistration$",
         "^IceGrid\\.Registry\\.Internal\\.AdapterId$",
-        "^IceGrid\\.Registry\\.Internal\\.ReplicaGroupId$",
         "^IceGrid\\.Registry\\.Internal\\.Endpoints$",
+        "^IceGrid\\.Registry\\.Internal\\.Locator$",
         "^IceGrid\\.Registry\\.Internal\\.PublishedEndpoints$",
         "^IceGrid\\.Register\\.Internal\\.RegisterProcess$",
+        "^IceGrid\\.Registry\\.Internal\\.ReplicaGroupId$",
+        "^IceGrid\\.Registry\\.Internal\\.Router$",
+        "^IceGrid\\.Registry\\.Internal\\.ThreadPerConnection$",
+        "^IceGrid\\.Registry\\.Internal\\.ThreadPerConnection\\.StackSize$",
         "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Size$",
         "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeMax$",
         "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn$",
@@ -245,14 +239,31 @@ public final class PropertyNames
         "^IceGrid\\.Registry\\.ReplicaName$",
         "^IceGrid\\.Registry\\.ReplicaSessionTimeout$",
         "^IceGrid\\.Registry\\.Server\\.AdapterId$",
-        "^IceGrid\\.Registry\\.Server\\.ReplicaGroupId$",
         "^IceGrid\\.Registry\\.Server\\.Endpoints$",
+        "^IceGrid\\.Registry\\.Server\\.Locator$",
         "^IceGrid\\.Registry\\.Server\\.PublishedEndpoints$",
         "^IceGrid\\.Registry\\.Server\\.RegisterProcess$",
+        "^IceGrid\\.Registry\\.Server\\.ReplicaGroupId$",
+        "^IceGrid\\.Registry\\.Server\\.Router$",
+        "^IceGrid\\.Registry\\.Server\\.ThreadPerConnection$",
+        "^IceGrid\\.Registry\\.Server\\.ThreadPerConnection\\.StackSize$",
         "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.Size$",
         "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeMax$",
         "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeWarn$",
         "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.StackSize$",
+        "^IceGrid\\.Registry\\.SessionManager\\.AdapterId$",
+        "^IceGrid\\.Registry\\.SessionManager\\.Endpoints$",
+        "^IceGrid\\.Registry\\.SessionManager\\.Locator$",
+        "^IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints$",
+        "^IceGrid\\.Registry\\.SessionManager\\.RegisterProcess$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId$",
+        "^IceGrid\\.Registry\\.SessionManager\\.Router$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPerConnection$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPerConnection\\.StackSize$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Size$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeMax$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeWarn$",
+        "^IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.StackSize$",
         "^IceGrid\\.Registry\\.SessionTimeout$",
         "^IceGrid\\.Registry\\.SSLPermissionsVerifier$",
         "^IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EndpointSelection$",
@@ -279,12 +290,15 @@ public final class PropertyNames
     public static final String IcePatch2Props[] =
     {
         "^IcePatch2\\.AdapterId$",
-        "^IcePatch2\\.ReplicaGroupId$",
         "^IcePatch2\\.Admin\\.AdapterId$",
-        "^IcePatch2\\.Admin\\.ReplicaGroupId$",
         "^IcePatch2\\.Admin\\.Endpoints$",
+        "^IcePatch2\\.Admin\\.Locator$",
         "^IcePatch2\\.Admin\\.PublishedEndpoints$",
         "^IcePatch2\\.Admin\\.RegisterProcess$",
+        "^IcePatch2\\.Admin\\.ReplicaGroupId$",
+        "^IcePatch2\\.Admin\\.Router$",
+        "^IcePatch2\\.Admin\\.ThreadPerConnection$",
+        "^IcePatch2\\.Admin\\.ThreadPerConnection\\.StackSize$",
         "^IcePatch2\\.Admin\\.ThreadPool\\.Size$",
         "^IcePatch2\\.Admin\\.ThreadPool\\.SizeMax$",
         "^IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn$",
@@ -293,10 +307,15 @@ public final class PropertyNames
         "^IcePatch2\\.Directory$",
         "^IcePatch2\\.Endpoints$",
         "^IcePatch2\\.InstanceName$",
+        "^IcePatch2\\.Locator$",
         "^IcePatch2\\.PublishedEndpoints$",
         "^IcePatch2\\.RegisterProcess$",
+        "^IcePatch2\\.ReplicaGroupId$",
         "^IcePatch2\\.Remove$",
+        "^IcePatch2\\.Router$",
         "^IcePatch2\\.Thorough$",
+        "^IcePatch2\\.ThreadPerConnection$",
+        "^IcePatch2\\.ThreadPerConnection\\.StackSize$",
         "^IcePatch2\\.ThreadPool\\.Size$",
         "^IcePatch2\\.ThreadPool\\.SizeMax$",
         "^IcePatch2\\.ThreadPool\\.SizeWarn$",
@@ -350,17 +369,21 @@ public final class PropertyNames
         "^IceStorm\\.Flush\\.Timeout$",
         "^IceStorm\\.InstanceName$",
         "^IceStorm\\.Publish\\.AdapterId$",
-        "^IceStorm\\.Publish\\.ReplicaGroupId$",
         "^IceStorm\\.Publish\\.Endpoints$",
+        "^IceStorm\\.Publish\\.Locator$",
         "^IceStorm\\.Publish\\.PublishedEndpoints$",
         "^IceStorm\\.Publish\\.RegisterProcess$",
+        "^IceStorm\\.Publish\\.ReplicaGroupId$",
+        "^IceStorm\\.Publish\\.Router$",
+        "^IceStorm\\.Publish\\.ThreadPerConnection$",
+        "^IceStorm\\.Publish\\.ThreadPerConnection\\.StackSize$",
         "^IceStorm\\.Publish\\.ThreadPool\\.Size$",
         "^IceStorm\\.Publish\\.ThreadPool\\.SizeMax$",
         "^IceStorm\\.Publish\\.ThreadPool\\.SizeWarn$",
         "^IceStorm\\.Publish\\.ThreadPool\\.StackSize$",
         "^IceStorm\\.TopicManager\\.AdapterId$",
-        "^IceStorm\\.TopicManager\\.ReplicaGroupId$",
         "^IceStorm\\.TopicManager\\.Endpoints$",
+        "^IceStorm\\.TopicManager\\.Locator$",
         "^IceStorm\\.TopicManager\\.Proxy$",
         "^IceStorm\\.TopicManager\\.Proxy\\.EndpointSelection$",
         "^IceStorm\\.TopicManager\\.Proxy\\.ConnectionCached$",
@@ -372,6 +395,10 @@ public final class PropertyNames
         "^IceStorm\\.TopicManager\\.Proxy\\.ThreadPerConnection$",
         "^IceStorm\\.TopicManager\\.PublishedEndpoints$",
         "^IceStorm\\.TopicManager\\.RegisterProcess$",
+        "^IceStorm\\.TopicManager\\.ReplicaGroupId$",
+        "^IceStorm\\.TopicManager\\.Router$",
+        "^IceStorm\\.TopicManager\\.ThreadPerConnection$",
+        "^IceStorm\\.TopicManager\\.ThreadPerConnection\\.StackSize$",
         "^IceStorm\\.TopicManager\\.ThreadPool\\.Size$",
         "^IceStorm\\.TopicManager\\.ThreadPool\\.SizeMax$",
         "^IceStorm\\.TopicManager\\.ThreadPool\\.SizeWarn$",