diff options
Diffstat (limited to 'java/src/Ice/PropertiesI.java')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 46ed531b00d..047c1e74f2a 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -396,6 +396,7 @@ final class PropertiesI extends LocalObjectImpl implements Properties "ThreadPool.Server.SizeMax", "ThreadPool.Server.SizeWarn", "Trace.GC", // Not used by Java but left here to suppress warnings. + "Trace.Location", "Trace.Network", "Trace.Protocol", "Trace.Retry", @@ -420,6 +421,9 @@ final class PropertiesI extends LocalObjectImpl implements Properties "ServiceManager.Endpoints", "ServiceManager.Identity", "ServiceManager.RegisterProcess", + "ServiceManager.ThreadPool.Size", + "ServiceManager.ThreadPool.SizeMax", + "ServiceManager.ThreadPool.SizeWarn", "UseSharedCommunicator.*" }; @@ -443,12 +447,26 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Node.WaitTime", "Registry.Admin.AdapterId", "Registry.Admin.Endpoints", + "Registry.Admin.ThreadPool.Size", + "Registry.Admin.ThreadPool.SizeMax", + "Registry.Admin.ThreadPool.SizeWarn", + "Registry.Client.AdapterId", "Registry.Client.Endpoints", + "Registry.Client.ThreadPool.Size", + "Registry.Client.ThreadPool.SizeMax", + "Registry.Client.ThreadPool.SizeWarn", "Registry.Data", "Registry.DynamicRegistration", "Registry.Internal.AdapterId", "Registry.Internal.Endpoints", + "Registry.Internal.ThreadPool.Size", + "Registry.Internal.ThreadPool.SizeMax", + "Registry.Internal.ThreadPool.SizeWarn", + "Registry.Server.AdapterId", "Registry.Server.Endpoints", + "Registry.Server.ThreadPool.Size", + "Registry.Server.ThreadPool.SizeMax", + "Registry.Server.ThreadPool.SizeWarn", "Registry.Trace.AdapterRegistry", "Registry.Trace.NodeRegistry", "Registry.Trace.ObjectRegistry", @@ -472,6 +490,7 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Client.CertPath*", "Client.Config", "Client.Handshake.Retries", + "Client.IgnoreValidPeriod", "Client.Overrides.CACertificate", "Client.Overrides.DSA.Certificate", "Client.Overrides.DSA.PrivateKey", @@ -480,6 +499,7 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Client.Passphrase.Retries", "Server.CertPath*", "Server.Config", + "Server.IgnoreValidPeriod", "Server.Overrides.CACertificate", "Server.Overrides.DSA.Certificate", "Server.Overrides.DSA.PrivateKey", @@ -495,10 +515,16 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Publish.AdapterId", "Publish.Endpoints", "Publish.RegisterProcess", + "Publish.ThreadPool.Size", + "Publish.ThreadPool.SizeMax", + "Publish.ThreadPool.SizeWarn", "TopicManager.AdapterId", "TopicManager.Endpoints", "TopicManager.Proxy", "TopicManager.RegisterProcess", + "TopicManager.ThreadPool.Size", + "TopicManager.ThreadPool.SizeMax", + "TopicManager.ThreadPool.SizeWarn", "Trace.Flush", "Trace.Subscriber", "Trace.Topic", @@ -508,28 +534,37 @@ final class PropertiesI extends LocalObjectImpl implements Properties private static final String _glacierProps[] = { "Router.AcceptCert", + "Router.AdapterId", "Router.AllowCategories", + "Router.Client.AdapterId", "Router.Client.Endpoints", + "Router.Client.ForwardContext", + "Router.Client.SleepTime", "Router.Client.ThreadPool.Size", "Router.Client.ThreadPool.SizeMax", "Router.Client.ThreadPool.SizeWarn", - "Router.Client.ForwardContext", + "Router.Client.Throttle.Twoways", "Router.Endpoints", "Router.ThreadPool.Size", "Router.ThreadPool.SizeMax", "Router.ThreadPool.SizeWarn", "Router.Identity", "Router.PrintProxyOnFd", + "Router.Server.AdapterId", "Router.Server.Endpoints", + "Router.Server.ForwardContext", + "Router.Server.SleepTime", "Router.Server.ThreadPool.Size", "Router.Server.ThreadPool.SizeMax", "Router.Server.ThreadPool.SizeWarn", - "Router.Server.ForwardContext", + "Router.Server.Throttle.Twoways", "Router.SessionManager", "Router.Trace.Client", "Router.Trace.RoutingTable", "Router.Trace.Server", + "Router.Trace.Throttle", "Router.UserId", + "Starter.AdapterId", "Starter.AddUserToAllowCategories", "Starter.Certificate.BitStrength", "Starter.Certificate.CommonName", @@ -546,18 +581,21 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Starter.PropertiesOverride", "Starter.RouterPath", "Starter.StartupTimeout", + "Starter.ThreadPool.Size", + "Starter.ThreadPool.SizeMax", + "Starter.ThreadPool.SizeWarn", "Starter.Trace" }; private static final String _freezeProps[] = { - "Warn.Deadlocks", - "Warn.CloseInFinalize", - "Trace.Map", - "Trace.Evictor", - "Trace.DbEnv", + "DbEnv.*", "Evictor.*", - "DbEnv.*" + "Trace.DbEnv", + "Trace.Evictor", + "Trace.Map", + "Warn.CloseInFinalize", + "Warn.Deadlocks" }; private static final class ValidProps |