more updates to supported properties

3 files changed, 125 insertions, 18 deletions

diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index f482cb41446..2befe8b17e3 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -128,11 +128,11 @@ static const string iceProps[] =
     "ThreadPool.Server.SizeMax",
     "ThreadPool.Server.SizeWarn",
     "Trace.GC",
+    "Trace.Location",
     "Trace.Network",
     "Trace.Protocol",
     "Trace.Retry",
     "Trace.Slicing",
-    "Trace.Location",
     "UDP.RcvSize",
     "UDP.SndSize",
     "UseEventLog",
@@ -153,6 +153,9 @@ static const string iceBoxProps[] =
     "ServiceManager.Endpoints",
     "ServiceManager.Identity",
     "ServiceManager.RegisterProcess",
+    "ServiceManager.ThreadPool.Size",
+    "ServiceManager.ThreadPool.SizeMax",
+    "ServiceManager.ThreadPool.SizeWarn",
     "UseSharedCommunicator.*"
 };
 
@@ -168,18 +171,34 @@ static const string icePackProps[] =
     "Node.PropertiesOverride",
     "Node.RedirectErrToOut",
     "Node.ThreadPool.Size",
+    "Node.ThreadPool.SizeMax",
+    "Node.ThreadPool.SizeWarn",
     "Node.Trace.Activator",
     "Node.Trace.Adapter",
     "Node.Trace.Server",
     "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",
@@ -228,10 +247,16 @@ static const string iceStormProps[] =
     "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",
@@ -241,7 +266,9 @@ static const string iceStormProps[] =
 static const string glacierProps[] =
 {
     "Router.AcceptCert",
+    "Router.AdapterId",
     "Router.AllowCategories",
+    "Router.Client.AdapterId",
     "Router.Client.Endpoints",
     "Router.Client.ForwardContext",
     "Router.Client.SleepTime",
@@ -255,6 +282,7 @@ static const string glacierProps[] =
     "Router.ThreadPool.SizeWarn",
     "Router.Identity",
     "Router.PrintProxyOnFd",
+    "Router.Server.AdapterId",
     "Router.Server.Endpoints",
     "Router.Server.ForwardContext",
     "Router.Server.SleepTime",
@@ -268,6 +296,7 @@ static const string glacierProps[] =
     "Router.Trace.Server",
     "Router.Trace.Throttle",
     "Router.UserId",
+    "Starter.AdapterId",
     "Starter.AddUserToAllowCategories",
     "Starter.Certificate.BitStrength",
     "Starter.Certificate.CommonName",
@@ -284,6 +313,9 @@ static const string glacierProps[] =
     "Starter.PropertiesOverride",
     "Starter.RouterPath",
     "Starter.StartupTimeout",
+    "Starter.ThreadPool.Size",
+    "Starter.ThreadPool.SizeMax",
+    "Starter.ThreadPool.SizeWarn",
     "Starter.Trace"
 };
 
@@ -292,8 +324,8 @@ static const string freezeProps[] =
     "DbEnv.*",
     "Evictor.*",
     "Trace.DbEnv",
-    "Trace.Map",
     "Trace.Evictor",
+    "Trace.Map",
     "Warn.CloseInFinalize",
     "Warn.Deadlocks"
 };
diff --git a/cs/src/Ice/PropertiesI.cs b/cs/src/Ice/PropertiesI.cs
index 390363fe302..30a5e895b96 100755
--- a/cs/src/Ice/PropertiesI.cs
+++ b/cs/src/Ice/PropertiesI.cs
@@ -401,11 +401,11 @@ namespace Ice
 	    "ThreadPool.Server.SizeMax",
 	    "ThreadPool.Server.SizeWarn",
 	    "Trace.GC",			// Not used by C# but left here to suppress warnings.
+	    "Trace.Location",
 	    "Trace.Network",
 	    "Trace.Protocol",
 	    "Trace.Retry",
 	    "Trace.Slicing",
-	    "Trace.Location",
 	    "UDP.RcvSize",
 	    "UDP.SndSize",
 	    "UseEventLog",
@@ -426,6 +426,9 @@ namespace Ice
 	    "ServiceManager.Endpoints",
 	    "ServiceManager.Identity",
 	    "ServiceManager.RegisterProcess",
+	    "ServiceManager.ThreadPool.Size",
+	    "ServiceManager.ThreadPool.SizeMax",
+	    "ServiceManager.ThreadPool.SizeWarn",
 	    "UseSharedCommunicator.*"
 	};
 	
@@ -449,12 +452,26 @@ namespace Ice
 	    "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",
@@ -478,6 +495,7 @@ namespace Ice
 	    "Client.CertPath*",
 	    "Client.Config",
 	    "Client.Handshake.Retries",
+	    "Client.IgnoreValidPeriod",
 	    "Client.Overrides.CACertificate",
 	    "Client.Overrides.DSA.Certificate",
 	    "Client.Overrides.DSA.PrivateKey",
@@ -486,6 +504,7 @@ namespace Ice
 	    "Client.Passphrase.Retries",
 	    "Server.CertPath*",
 	    "Server.Config",
+	    "Server.IgnoreValidPeriod",
 	    "Server.Overrides.CACertificate",
 	    "Server.Overrides.DSA.Certificate",
 	    "Server.Overrides.DSA.PrivateKey",
@@ -501,10 +520,16 @@ namespace Ice
 	    "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",
@@ -514,28 +539,37 @@ namespace Ice
 	private static readonly string[] _glacierProps = new string[]
 	{
 	    "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",
@@ -552,18 +586,21 @@ namespace Ice
 	    "Starter.PropertiesOverride",
 	    "Starter.RouterPath",
 	    "Starter.StartupTimeout",
+	    "Starter.ThreadPool.Size",
+	    "Starter.ThreadPool.SizeMax",
+	    "Starter.ThreadPool.SizeWarn",
 	    "Starter.Trace"
 	};
 	    
 	private static readonly string[] _freezeProps = new string[]
 	{
-	    "Warn.Deadlocks",
-	    "Warn.CloseInFinalize",
-	    "Trace.Map",
+	    "DbEnv.*",
+	    "Evictor.*",
 	    "Trace.Evictor",
+	    "Trace.Map",
 	    "Trace.DbEnv",
-	    "Evictor.*",
-	    "DbEnv.*"
+	    "Warn.CloseInFinalize",
+	    "Warn.Deadlocks"
 	};
 	    
 	private sealed class ValidProps
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