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

1 files changed, 12 insertions, 38 deletions

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