Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints

1 files changed, 1 insertions, 35 deletions

diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 694aebea5d2..07dc9ac43b4 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Oct 22 18:48:40 2012
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Nov 12 21:17:34 2012
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -29,7 +29,6 @@ public final class PropertyNames
         new Property("Ice\\.Admin\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("Ice\\.Admin\\.Locator\\.Locator", false, null),
         new Property("Ice\\.Admin\\.Locator\\.Router", false, null),
-        new Property("Ice\\.Admin\\.Locator\\.EncodingVersion", false, null),
         new Property("Ice\\.Admin\\.Locator\\.CollocationOptimized", false, null),
         new Property("Ice\\.Admin\\.Locator", false, null),
         new Property("Ice\\.Admin\\.PublishedEndpoints", false, null),
@@ -40,7 +39,6 @@ public final class PropertyNames
         new Property("Ice\\.Admin\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("Ice\\.Admin\\.Router\\.Locator", false, null),
         new Property("Ice\\.Admin\\.Router\\.Router", false, null),
-        new Property("Ice\\.Admin\\.Router\\.EncodingVersion", false, null),
         new Property("Ice\\.Admin\\.Router\\.CollocationOptimized", false, null),
         new Property("Ice\\.Admin\\.Router", false, null),
         new Property("Ice\\.Admin\\.ProxyOptions", false, null),
@@ -71,7 +69,6 @@ public final class PropertyNames
         new Property("Ice\\.Default\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("Ice\\.Default\\.Locator\\.Locator", false, null),
         new Property("Ice\\.Default\\.Locator\\.Router", false, null),
-        new Property("Ice\\.Default\\.Locator\\.EncodingVersion", false, null),
         new Property("Ice\\.Default\\.Locator\\.CollocationOptimized", false, null),
         new Property("Ice\\.Default\\.Locator", false, null),
         new Property("Ice\\.Default\\.LocatorCacheTimeout", false, null),
@@ -84,7 +81,6 @@ public final class PropertyNames
         new Property("Ice\\.Default\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("Ice\\.Default\\.Router\\.Locator", false, null),
         new Property("Ice\\.Default\\.Router\\.Router", false, null),
-        new Property("Ice\\.Default\\.Router\\.EncodingVersion", false, null),
         new Property("Ice\\.Default\\.Router\\.CollocationOptimized", false, null),
         new Property("Ice\\.Default\\.Router", false, null),
         new Property("Ice\\.Default\\.SlicedFormat", false, null),
@@ -184,7 +180,6 @@ public final class PropertyNames
         new Property("IceBox\\.ServiceManager\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator\\.Router", false, null),
-        new Property("IceBox\\.ServiceManager\\.Locator\\.EncodingVersion", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceBox\\.ServiceManager\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", false, null),
@@ -195,7 +190,6 @@ public final class PropertyNames
         new Property("IceBox\\.ServiceManager\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.Locator", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.Router", false, null),
-        new Property("IceBox\\.ServiceManager\\.Router\\.EncodingVersion", false, null),
         new Property("IceBox\\.ServiceManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceBox\\.ServiceManager\\.Router", false, null),
         new Property("IceBox\\.ServiceManager\\.ProxyOptions", false, null),
@@ -219,7 +213,6 @@ public final class PropertyNames
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.LocatorCacheTimeout", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Locator", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Router", false, null),
-        new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EncodingVersion", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimized", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy", false, null),
         null
@@ -248,7 +241,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Node\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Node\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Node\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.PublishedEndpoints", false, null),
@@ -259,7 +251,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Node\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Node\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Node\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.Router", false, null),
         new Property("IceGrid\\.Node\\.ProxyOptions", false, null),
@@ -293,7 +284,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.Locator", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.Router", false, null),
-        new Property("IceGrid\\.Node\\.UserAccountMapper\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Node\\.UserAccountMapper", false, null),
         new Property("IceGrid\\.Node\\.WaitTime", false, null),
@@ -304,7 +294,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionFilters", false, null),
@@ -317,7 +306,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.PublishedEndpoints", false, null),
@@ -328,7 +316,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ProxyOptions", false, null),
@@ -345,7 +332,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.ACM", false, null),
@@ -357,7 +343,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.PublishedEndpoints", false, null),
@@ -368,7 +353,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Client\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Client\\.ProxyOptions", false, null),
@@ -392,7 +376,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.PublishedEndpoints", false, null),
@@ -403,7 +386,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Internal\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Internal\\.ProxyOptions", false, null),
@@ -421,7 +403,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.PermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.ReplicaName", false, null),
@@ -437,7 +418,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.PublishedEndpoints", false, null),
@@ -448,7 +428,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.Server\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.Server\\.ProxyOptions", false, null),
@@ -469,7 +448,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints", false, null),
@@ -480,7 +458,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.Router", false, null),
         new Property("IceGrid\\.Registry\\.SessionManager\\.ProxyOptions", false, null),
@@ -498,7 +475,6 @@ public final class PropertyNames
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Locator", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Router", false, null),
-        new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EncodingVersion", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier", false, null),
         new Property("IceGrid\\.Registry\\.Trace\\.Application", false, null),
@@ -535,7 +511,6 @@ public final class PropertyNames
         new Property("IcePatch2\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("IcePatch2\\.Locator\\.Locator", false, null),
         new Property("IcePatch2\\.Locator\\.Router", false, null),
-        new Property("IcePatch2\\.Locator\\.EncodingVersion", false, null),
         new Property("IcePatch2\\.Locator\\.CollocationOptimized", false, null),
         new Property("IcePatch2\\.Locator", false, null),
         new Property("IcePatch2\\.PublishedEndpoints", false, null),
@@ -546,7 +521,6 @@ public final class PropertyNames
         new Property("IcePatch2\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("IcePatch2\\.Router\\.Locator", false, null),
         new Property("IcePatch2\\.Router\\.Router", false, null),
-        new Property("IcePatch2\\.Router\\.EncodingVersion", false, null),
         new Property("IcePatch2\\.Router\\.CollocationOptimized", false, null),
         new Property("IcePatch2\\.Router", false, null),
         new Property("IcePatch2\\.ProxyOptions", false, null),
@@ -630,7 +604,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Client\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.Client\\.Locator\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.Locator\\.Router", false, null),
-        new Property("Glacier2\\.Client\\.Locator\\.EncodingVersion", false, null),
         new Property("Glacier2\\.Client\\.Locator\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Client\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.PublishedEndpoints", false, null),
@@ -641,7 +614,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Client\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.Client\\.Router\\.Locator", false, null),
         new Property("Glacier2\\.Client\\.Router\\.Router", false, null),
-        new Property("Glacier2\\.Client\\.Router\\.EncodingVersion", false, null),
         new Property("Glacier2\\.Client\\.Router\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Client\\.Router", false, null),
         new Property("Glacier2\\.Client\\.ProxyOptions", false, null),
@@ -674,7 +646,6 @@ public final class PropertyNames
         new Property("Glacier2\\.PermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.PermissionsVerifier\\.Locator", false, null),
         new Property("Glacier2\\.PermissionsVerifier\\.Router", false, null),
-        new Property("Glacier2\\.PermissionsVerifier\\.EncodingVersion", false, null),
         new Property("Glacier2\\.PermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.PermissionsVerifier", false, null),
         new Property("Glacier2\\.ReturnClientProxy", false, null),
@@ -684,7 +655,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.Locator", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.Router", false, null),
-        new Property("Glacier2\\.SSLPermissionsVerifier\\.EncodingVersion", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SSLPermissionsVerifier", false, null),
         new Property("Glacier2\\.RoutingTable\\.MaxSize", false, null),
@@ -697,7 +667,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.Server\\.Locator\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.Locator\\.Router", false, null),
-        new Property("Glacier2\\.Server\\.Locator\\.EncodingVersion", false, null),
         new Property("Glacier2\\.Server\\.Locator\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Server\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.PublishedEndpoints", false, null),
@@ -708,7 +677,6 @@ public final class PropertyNames
         new Property("Glacier2\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.Server\\.Router\\.Locator", false, null),
         new Property("Glacier2\\.Server\\.Router\\.Router", false, null),
-        new Property("Glacier2\\.Server\\.Router\\.EncodingVersion", false, null),
         new Property("Glacier2\\.Server\\.Router\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.Server\\.Router", false, null),
         new Property("Glacier2\\.Server\\.ProxyOptions", false, null),
@@ -731,7 +699,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SessionManager\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.SessionManager\\.Locator", false, null),
         new Property("Glacier2\\.SessionManager\\.Router", false, null),
-        new Property("Glacier2\\.SessionManager\\.EncodingVersion", false, null),
         new Property("Glacier2\\.SessionManager\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SessionManager", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.EndpointSelection", false, null),
@@ -740,7 +707,6 @@ public final class PropertyNames
         new Property("Glacier2\\.SSLSessionManager\\.LocatorCacheTimeout", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.Locator", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.Router", false, null),
-        new Property("Glacier2\\.SSLSessionManager\\.EncodingVersion", false, null),
         new Property("Glacier2\\.SSLSessionManager\\.CollocationOptimized", false, null),
         new Property("Glacier2\\.SSLSessionManager", false, null),
         new Property("Glacier2\\.SessionTimeout", false, null),