Deprecate IceSSL.ImportCert - ICE-5583

1 files changed, 16 insertions, 18 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 78e3ce143ec..35aa4716c2e 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,13 +6,13 @@
 // 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!
 
 #include <Ice/PropertyNames.h>
 
-const IceInternal::Property IcePropsData[] =
+const IceInternal::Property IcePropsData[] = 
 {
     IceInternal::Property("Ice.ACM.Client", true, 0),
     IceInternal::Property("Ice.ACM.Server", true, 0),
@@ -105,8 +105,6 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Default.Router.Context.*", false, 0),
     IceInternal::Property("Ice.Default.Router", false, 0),
     IceInternal::Property("Ice.Default.SlicedFormat", false, 0),
-    IceInternal::Property("Ice.Default.SourceAddress", false, 0),
-    IceInternal::Property("Ice.Default.Timeout", false, 0),
     IceInternal::Property("Ice.IPv4", false, 0),
     IceInternal::Property("Ice.IPv6", false, 0),
     IceInternal::Property("Ice.EventLog.Source", false, 0),
@@ -183,7 +181,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceProps(IcePropsData,
                                                 sizeof(IcePropsData)/sizeof(IcePropsData[0]));
 
-const IceInternal::Property IceMXPropsData[] =
+const IceInternal::Property IceMXPropsData[] = 
 {
     IceInternal::Property("IceMX.Metrics.*.GroupBy", false, 0),
     IceInternal::Property("IceMX.Metrics.*.Map", false, 0),
@@ -197,7 +195,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceMXProps(IceMXPropsData,
                                                 sizeof(IceMXPropsData)/sizeof(IceMXPropsData[0]));
 
-const IceInternal::Property IceDiscoveryPropsData[] =
+const IceInternal::Property IceDiscoveryPropsData[] = 
 {
     IceInternal::Property("IceDiscovery.Multicast.ACM.Timeout", false, 0),
     IceInternal::Property("IceDiscovery.Multicast.ACM.Heartbeat", false, 0),
@@ -321,7 +319,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceDiscoveryProps(IceDiscoveryPropsData,
                                                 sizeof(IceDiscoveryPropsData)/sizeof(IceDiscoveryPropsData[0]));
 
-const IceInternal::Property IceGridDiscoveryPropsData[] =
+const IceInternal::Property IceGridDiscoveryPropsData[] = 
 {
     IceInternal::Property("IceGridDiscovery.Reply.ACM.Timeout", false, 0),
     IceInternal::Property("IceGridDiscovery.Reply.ACM.Heartbeat", false, 0),
@@ -409,7 +407,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridDiscoveryProps(IceGridDiscoveryPropsData,
                                                 sizeof(IceGridDiscoveryPropsData)/sizeof(IceGridDiscoveryPropsData[0]));
 
-const IceInternal::Property IceBoxPropsData[] =
+const IceInternal::Property IceBoxPropsData[] = 
 {
     IceInternal::Property("IceBox.InheritProperties", false, 0),
     IceInternal::Property("IceBox.InstanceName", false, 0),
@@ -460,7 +458,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
                                                 sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
 
-const IceInternal::Property IceBoxAdminPropsData[] =
+const IceInternal::Property IceBoxAdminPropsData[] = 
 {
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", false, 0),
     IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", false, 0),
@@ -478,7 +476,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
                                                 sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
 
-const IceInternal::Property IceGridAdminPropsData[] =
+const IceInternal::Property IceGridAdminPropsData[] = 
 {
     IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
     IceInternal::Property("IceGridAdmin.MetricsConfig", false, 0),
@@ -535,7 +533,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridAdminProps(IceGridAdminPropsData,
                                                 sizeof(IceGridAdminPropsData)/sizeof(IceGridAdminPropsData[0]));
 
-const IceInternal::Property IceGridPropsData[] =
+const IceInternal::Property IceGridPropsData[] = 
 {
     IceInternal::Property("IceGrid.AdminRouter.ACM.Timeout", false, 0),
     IceInternal::Property("IceGrid.AdminRouter.ACM.Heartbeat", false, 0),
@@ -937,7 +935,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridProps(IceGridPropsData,
                                                 sizeof(IceGridPropsData)/sizeof(IceGridPropsData[0]));
 
-const IceInternal::Property IcePatch2PropsData[] =
+const IceInternal::Property IcePatch2PropsData[] = 
 {
     IceInternal::Property("IcePatch2.ACM.Timeout", false, 0),
     IceInternal::Property("IcePatch2.ACM.Heartbeat", false, 0),
@@ -986,7 +984,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IcePatch2Props(IcePatch2PropsData,
                                                 sizeof(IcePatch2PropsData)/sizeof(IcePatch2PropsData[0]));
 
-const IceInternal::Property IcePatch2ClientPropsData[] =
+const IceInternal::Property IcePatch2ClientPropsData[] = 
 {
     IceInternal::Property("IcePatch2Client.ChunkSize", false, 0),
     IceInternal::Property("IcePatch2Client.Directory", false, 0),
@@ -999,7 +997,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IcePatch2ClientProps(IcePatch2ClientPropsData,
                                                 sizeof(IcePatch2ClientPropsData)/sizeof(IcePatch2ClientPropsData[0]));
 
-const IceInternal::Property IceSSLPropsData[] =
+const IceInternal::Property IceSSLPropsData[] = 
 {
     IceInternal::Property("IceSSL.Alias", false, 0),
     IceInternal::Property("IceSSL.CertAuthDir", false, 0),
@@ -1015,7 +1013,7 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.DHParams", false, 0),
     IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
     IceInternal::Property("IceSSL.FindCert.*", false, 0),
-    IceInternal::Property("IceSSL.ImportCert.*", false, 0),
+    IceInternal::Property("IceSSL.ImportCert.*", true, 0),
     IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
     IceInternal::Property("IceSSL.KeyFile", false, 0),
     IceInternal::Property("IceSSL.KeySet", false, 0),
@@ -1048,7 +1046,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData,
                                                 sizeof(IceSSLPropsData)/sizeof(IceSSLPropsData[0]));
 
-const IceInternal::Property IceStormAdminPropsData[] =
+const IceInternal::Property IceStormAdminPropsData[] = 
 {
     IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
     IceInternal::Property("IceStormAdmin.Host", false, 0),
@@ -1059,7 +1057,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
                                                 sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
 
-const IceInternal::Property Glacier2PropsData[] =
+const IceInternal::Property Glacier2PropsData[] = 
 {
     IceInternal::Property("Glacier2.AddSSLContext", true, 0),
     IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
@@ -1208,7 +1206,7 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData,
                                                 sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0]));
 
-const IceInternal::Property FreezePropsData[] =
+const IceInternal::Property FreezePropsData[] = 
 {
     IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0),
     IceInternal::Property("Freeze.DbEnv.*.DbHome", false, 0),