diff options
| author | Joe George <joe@zeroc.com> | 2014-10-09 12:08:12 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-10-09 16:26:05 -0400 |
| commit | 18db9b459ae42f9d09f6860bfb3f93a41719e138 (patch) | |
| tree | 9224b138e92daf61e5aec1836d615e7f5b769bf7 /cpp/src | |
| parent | ICE-5671 make sure router/locator have not already been set by plugin loading (diff) | |
| download | ice-18db9b459ae42f9d09f6860bfb3f93a41719e138.tar.bz2 ice-18db9b459ae42f9d09f6860bfb3f93a41719e138.tar.xz ice-18db9b459ae42f9d09f6860bfb3f93a41719e138.zip | |
ICE-5698 - Deprecate IceBox.ServiceManager object adapter and IceBox.InstanceName
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 50 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 13 insertions, 39 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 1904563332e..74c57803619 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -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! @@ -419,46 +419,20 @@ const IceInternal::PropertyArray const IceInternal::Property IceBoxPropsData[] = { IceInternal::Property("IceBox.InheritProperties", false, 0), - IceInternal::Property("IceBox.InstanceName", false, 0), + IceInternal::Property("IceBox.InstanceName", true, 0), IceInternal::Property("IceBox.LoadOrder", false, 0), IceInternal::Property("IceBox.PrintServicesReady", false, 0), IceInternal::Property("IceBox.Service.*", false, 0), - IceInternal::Property("IceBox.ServiceManager.ACM.Timeout", false, 0), - IceInternal::Property("IceBox.ServiceManager.ACM.Heartbeat", false, 0), - IceInternal::Property("IceBox.ServiceManager.ACM.Close", false, 0), - IceInternal::Property("IceBox.ServiceManager.ACM", false, 0), - IceInternal::Property("IceBox.ServiceManager.AdapterId", false, 0), - IceInternal::Property("IceBox.ServiceManager.Endpoints", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.EndpointSelection", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.ConnectionCached", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.PreferSecure", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.LocatorCacheTimeout", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.InvocationTimeout", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.Locator", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.Router", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.CollocationOptimized", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator.Context.*", false, 0), - IceInternal::Property("IceBox.ServiceManager.Locator", false, 0), - IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", false, 0), - IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.EndpointSelection", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.ConnectionCached", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.PreferSecure", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.LocatorCacheTimeout", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.InvocationTimeout", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.Locator", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.Router", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.CollocationOptimized", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router.Context.*", false, 0), - IceInternal::Property("IceBox.ServiceManager.Router", false, 0), - IceInternal::Property("IceBox.ServiceManager.ProxyOptions", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.Serialize", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.ThreadIdleTime", false, 0), - IceInternal::Property("IceBox.ServiceManager.ThreadPool.ThreadPriority", false, 0), + IceInternal::Property("IceBox.ServiceManager.AdapterId", true, 0), + IceInternal::Property("IceBox.ServiceManager.Endpoints", true, 0), + IceInternal::Property("IceBox.ServiceManager.Locator", true, 0), + IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", true, 0), + IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", true, 0), + IceInternal::Property("IceBox.ServiceManager.Router", true, 0), + IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", true, 0), + IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", true, 0), + IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", true, 0), + IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", true, 0), IceInternal::Property("IceBox.Trace.ServiceObserver", false, 0), IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0), }; diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 7ad2954e8cb..dd79cf5d639 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -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! |