Deprecate IceSSL.ImportCert - ICE-5583

1 files changed, 16 insertions, 19 deletions

diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index e0b7dd7b9c9..4be47f5652c 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, Fri Aug  1 17:15:07 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Aug 12 23:17:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -14,7 +14,7 @@ package IceInternal;
 
 public final class PropertyNames
 {
-    public static final Property IceProps[] =
+    public static final Property IceProps[] = 
     {
         new Property("Ice\\.ACM\\.Client", true, null),
         new Property("Ice\\.ACM\\.Server", true, null),
@@ -70,7 +70,6 @@ public final class PropertyNames
         new Property("Ice\\.Admin\\.Facets", false, null),
         new Property("Ice\\.Admin\\.InstanceName", false, null),
         new Property("Ice\\.Admin\\.ServerId", false, null),
-        new Property("Ice\\.BackgroundIO", false, null),
         new Property("Ice\\.BackgroundLocatorCacheUpdates", false, null),
         new Property("Ice\\.BatchAutoFlush", false, null),
         new Property("Ice\\.ChangeUser", false, null),
@@ -108,8 +107,6 @@ public final class PropertyNames
         new Property("Ice\\.Default\\.Router\\.Context\\.[^\\s]+", false, null),
         new Property("Ice\\.Default\\.Router", false, null),
         new Property("Ice\\.Default\\.SlicedFormat", false, null),
-        new Property("Ice\\.Default\\.SourceAddress", false, null),
-        new Property("Ice\\.Default\\.Timeout", false, null),
         new Property("Ice\\.IPv4", false, null),
         new Property("Ice\\.IPv6", false, null),
         new Property("Ice\\.EventLog\\.Source", false, null),
@@ -183,7 +180,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceMXProps[] =
+    public static final Property IceMXProps[] = 
     {
         new Property("IceMX\\.Metrics\\.[^\\s]+\\.GroupBy", false, null),
         new Property("IceMX\\.Metrics\\.[^\\s]+\\.Map", false, null),
@@ -194,7 +191,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceDiscoveryProps[] =
+    public static final Property IceDiscoveryProps[] = 
     {
         new Property("IceDiscovery\\.Multicast\\.ACM\\.Timeout", false, null),
         new Property("IceDiscovery\\.Multicast\\.ACM\\.Heartbeat", false, null),
@@ -315,7 +312,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceGridDiscoveryProps[] =
+    public static final Property IceGridDiscoveryProps[] = 
     {
         new Property("IceGridDiscovery\\.Reply\\.ACM\\.Timeout", false, null),
         new Property("IceGridDiscovery\\.Reply\\.ACM\\.Heartbeat", false, null),
@@ -400,7 +397,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceBoxProps[] =
+    public static final Property IceBoxProps[] = 
     {
         new Property("IceBox\\.InheritProperties", false, null),
         new Property("IceBox\\.InstanceName", false, null),
@@ -448,7 +445,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceBoxAdminProps[] =
+    public static final Property IceBoxAdminProps[] = 
     {
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EndpointSelection", false, null),
         new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ConnectionCached", false, null),
@@ -463,7 +460,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceGridAdminProps[] =
+    public static final Property IceGridAdminProps[] = 
     {
         new Property("IceGridAdmin\\.AuthenticateUsingSSL", false, null),
         new Property("IceGridAdmin\\.MetricsConfig", false, null),
@@ -517,7 +514,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceGridProps[] =
+    public static final Property IceGridProps[] = 
     {
         new Property("IceGrid\\.AdminRouter\\.ACM\\.Timeout", false, null),
         new Property("IceGrid\\.AdminRouter\\.ACM\\.Heartbeat", false, null),
@@ -916,7 +913,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IcePatch2Props[] =
+    public static final Property IcePatch2Props[] = 
     {
         new Property("IcePatch2\\.ACM\\.Timeout", false, null),
         new Property("IcePatch2\\.ACM\\.Heartbeat", false, null),
@@ -962,7 +959,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IcePatch2ClientProps[] =
+    public static final Property IcePatch2ClientProps[] = 
     {
         new Property("IcePatch2Client\\.ChunkSize", false, null),
         new Property("IcePatch2Client\\.Directory", false, null),
@@ -972,7 +969,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceSSLProps[] =
+    public static final Property IceSSLProps[] = 
     {
         new Property("IceSSL\\.Alias", false, null),
         new Property("IceSSL\\.CertAuthDir", false, null),
@@ -988,7 +985,7 @@ public final class PropertyNames
         new Property("IceSSL\\.DHParams", false, null),
         new Property("IceSSL\\.EntropyDaemon", false, null),
         new Property("IceSSL\\.FindCert\\.[^\\s]+", false, null),
-        new Property("IceSSL\\.ImportCert\\.[^\\s]+", false, null),
+        new Property("IceSSL\\.ImportCert\\.[^\\s]+", true, null),
         new Property("IceSSL\\.InitOpenSSL", false, null),
         new Property("IceSSL\\.KeyFile", false, null),
         new Property("IceSSL\\.KeySet", false, null),
@@ -1018,7 +1015,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IceStormAdminProps[] =
+    public static final Property IceStormAdminProps[] = 
     {
         new Property("IceStormAdmin\\.TopicManager\\.[^\\s]+", false, null),
         new Property("IceStormAdmin\\.Host", false, null),
@@ -1026,7 +1023,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property Glacier2Props[] =
+    public static final Property Glacier2Props[] = 
     {
         new Property("Glacier2\\.AddSSLContext", true, null),
         new Property("Glacier2\\.AddConnectionContext", false, null),
@@ -1172,7 +1169,7 @@ public final class PropertyNames
         null
     };
 
-    public static final Property FreezeProps[] =
+    public static final Property FreezeProps[] = 
     {
         new Property("Freeze\\.DbEnv\\.[^\\s]+\\.CheckpointPeriod", false, null),
         new Property("Freeze\\.DbEnv\\.[^\\s]+\\.DbHome", false, null),