Merge HA IceStorm branch.

- http://bugzilla/bugzilla/show_bug.cgi?id=2706
- http://bugzilla/bugzilla/show_bug.cgi?id=2705

1 files changed, 1 insertions, 62 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index fd83fc542b9..26d2e0655f8 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 27 12:48:24 2008
+// Generated by makeprops.py from file config/PropertyNames.xml, Fri Feb 29 15:15:38 2008
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -475,65 +475,6 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
                                                 sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
 
-const IceInternal::Property IceStormPropsData[] = 
-{
-    IceInternal::Property("IceStorm.Flush.Timeout", false, 0),
-    IceInternal::Property("IceStorm.InstanceName", false, 0),
-    IceInternal::Property("IceStorm.Publish.AdapterId", false, 0),
-    IceInternal::Property("IceStorm.Publish.Endpoints", false, 0),
-    IceInternal::Property("IceStorm.Publish.Locator", false, 0),
-    IceInternal::Property("IceStorm.Publish.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceStorm.Publish.RegisterProcess", true, 0),
-    IceInternal::Property("IceStorm.Publish.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceStorm.Publish.Router", false, 0),
-    IceInternal::Property("IceStorm.Publish.ProxyOptions", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.AdapterId", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Endpoints", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Locator", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.RegisterProcess", true, 0),
-    IceInternal::Property("IceStorm.TopicManager.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Router", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.EndpointSelection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.ConnectionCached", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.PreferSecure", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.Locator", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.Router", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimization", true, "IceStorm.TopicManager.Proxy.CollocationOptimized"),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimized", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.Size", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.Trace.Flush", false, 0),
-    IceInternal::Property("IceStorm.Trace.Subscriber", false, 0),
-    IceInternal::Property("IceStorm.Trace.SubscriberPool", false, 0),
-    IceInternal::Property("IceStorm.Trace.Topic", false, 0),
-    IceInternal::Property("IceStorm.Trace.TopicManager", false, 0),
-    IceInternal::Property("IceStorm.Send.Timeout", false, 0),
-    IceInternal::Property("IceStorm.Discard.Interval", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceStormProps(IceStormPropsData,
-                                                sizeof(IceStormPropsData)/sizeof(IceStormPropsData[0]));
-
 const IceInternal::Property Glacier2PropsData[] = 
 {
     IceInternal::Property("Glacier2.AddSSLContext", false, 0),
@@ -698,7 +639,6 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IcePatch2Props,
     IceSSLProps,
     IceStormAdminProps,
-    IceStormProps,
     Glacier2Props,
     FreezeProps,
     IceInternal::PropertyArray(0,0)
@@ -715,7 +655,6 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "IcePatch2",
     "IceSSL",
     "IceStormAdmin",
-    "IceStorm",
     "Glacier2",
     "Freeze",
     0