Bug 758

2 files changed, 7 insertions, 92 deletions

diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py
index 387a208d933..8a011c43473 100644
--- a/cs/config/TestUtil.py
+++ b/cs/config/TestUtil.py
@@ -29,8 +29,8 @@ compress = 1
 # thread per connection mode.
 #
 
-threadPerConnection = 0
-#threadPerConnection = 1
+#threadPerConnection = 0
+threadPerConnection = 1
 
 if protocol == "ssl":
     threadPerConnection = 1
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index 01da45da00c..080e95ea1d4 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Mar  7 15:44:07 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Mar 17 10:59:47 2006
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -173,20 +173,6 @@ namespace IceInternal
             null
         };
 
-        public static string[] IcePatchProps =
-        {
-            @"^IcePatch\.BusyTimeout$",
-            @"^IcePatch\.Directory$",
-            @"^IcePatch\.Dynamic$",
-            @"^IcePatch\.Endpoints$",
-            @"^IcePatch\.PublishedEndpoints$",
-            @"^IcePatch\.RemoveOrphaned$",
-            @"^IcePatch\.Thorough$",
-            @"^IcePatch\.Trace\.Files$",
-            @"^IcePatch\.UpdatePeriod$",
-            null
-        };
-
         public static string[] IcePatch2Props =
         {
             @"^IcePatch2\.AdapterId$",
@@ -284,75 +270,6 @@ namespace IceInternal
             null
         };
 
-        public static string[] GlacierProps =
-        {
-            @"^Glacier\.Router\.AcceptCert$",
-            @"^Glacier\.Router\.AdapterId$",
-            @"^Glacier\.Router\.ReplicaGroupId$",
-            @"^Glacier\.Router\.AllowCategories$",
-            @"^Glacier\.Router\.Client\.AdapterId$",
-            @"^Glacier\.Router\.Client\.ReplicaGroupId$",
-            @"^Glacier\.Router\.Client\.Endpoints$",
-            @"^Glacier\.Router\.Client\.ForwardContext$",
-            @"^Glacier\.Router\.Client\.PublishedEndpoints$",
-            @"^Glacier\.Router\.Client\.SleepTime$",
-            @"^Glacier\.Router\.Client\.ThreadPool\.Size$",
-            @"^Glacier\.Router\.Client\.ThreadPool\.SizeMax$",
-            @"^Glacier\.Router\.Client\.ThreadPool\.SizeWarn$",
-            @"^Glacier\.Router\.Client\.ThreadPool\.StackSize$",
-            @"^Glacier\.Router\.Client\.Throttle\.Twoways$",
-            @"^Glacier\.Router\.Endpoints$",
-            @"^Glacier\.Router\.Identity$",
-            @"^Glacier\.Router\.PrintProxyOnFd$",
-            @"^Glacier\.Router\.PublishedEndpoints$",
-            @"^Glacier\.Router\.Server\.AdapterId$",
-            @"^Glacier\.Router\.Server\.ReplicaGroupId$",
-            @"^Glacier\.Router\.Server\.Endpoints$",
-            @"^Glacier\.Router\.Server\.ForwardContext$",
-            @"^Glacier\.Router\.Server\.PublishedEndpoints$",
-            @"^Glacier\.Router\.Server\.SleepTime$",
-            @"^Glacier\.Router\.Server\.ThreadPool\.Size$",
-            @"^Glacier\.Router\.Server\.ThreadPool\.SizeMax$",
-            @"^Glacier\.Router\.Server\.ThreadPool\.SizeWarn$",
-            @"^Glacier\.Router\.Server\.ThreadPool\.StackSize$",
-            @"^Glacier\.Router\.Server\.Throttle\.Twoways$",
-            @"^Glacier\.Router\.SessionManager$",
-            @"^Glacier\.Router\.ThreadPool\.Size$",
-            @"^Glacier\.Router\.ThreadPool\.SizeMax$",
-            @"^Glacier\.Router\.ThreadPool\.SizeWarn$",
-            @"^Glacier\.Router\.ThreadPool\.StackSize$",
-            @"^Glacier\.Router\.Trace\.Client$",
-            @"^Glacier\.Router\.Trace\.RoutingTable$",
-            @"^Glacier\.Router\.Trace\.Server$",
-            @"^Glacier\.Router\.Trace\.Throttle$",
-            @"^Glacier\.Router\.UserId$",
-            @"^Glacier\.Starter\.AdapterId$",
-            @"^Glacier\.Starter\.ReplicaGroupId$",
-            @"^Glacier\.Starter\.AddUserToAllowCategories$",
-            @"^Glacier\.Starter\.Certificate\.BitStrength$",
-            @"^Glacier\.Starter\.Certificate\.CommonName$",
-            @"^Glacier\.Starter\.Certificate\.Country$",
-            @"^Glacier\.Starter\.Certificate\.IssuedAdjust$",
-            @"^Glacier\.Starter\.Certificate\.Locality$",
-            @"^Glacier\.Starter\.Certificate\.Organization$",
-            @"^Glacier\.Starter\.Certificate\.OrganizationalUnit$",
-            @"^Glacier\.Starter\.Certificate\.SecondsValid$",
-            @"^Glacier\.Starter\.Certificate\.StateProvince$",
-            @"^Glacier\.Starter\.CryptPasswords$",
-            @"^Glacier\.Starter\.Endpoints$",
-            @"^Glacier\.Starter\.PermissionsVerifier$",
-            @"^Glacier\.Starter\.PropertiesOverride$",
-            @"^Glacier\.Starter\.PublishedEndpoints$",
-            @"^Glacier\.Starter\.RouterPath$",
-            @"^Glacier\.Starter\.StartupTimeout$",
-            @"^Glacier\.Starter\.ThreadPool\.Size$",
-            @"^Glacier\.Starter\.ThreadPool\.SizeMax$",
-            @"^Glacier\.Starter\.ThreadPool\.SizeWarn$",
-            @"^Glacier\.Starter\.ThreadPool\.StackSize$",
-            @"^Glacier\.Starter\.Trace$",
-            null
-        };
-
         public static string[] Glacier2Props =
         {
             @"^Glacier2\.AddUserToAllowCategories$",
@@ -375,6 +292,7 @@ namespace IceInternal
             @"^Glacier2\.InstanceName$",
             @"^Glacier2\.PermissionsVerifier$",
             @"^Glacier2\.RouterIdentity$",
+            @"^Glacier2\.RoutingTable\.MaxSize$",
             @"^Glacier2\.Server\.AlwaysBatch$",
             @"^Glacier2\.Server\.Buffered$",
             @"^Glacier2\.Server\.Endpoints$",
@@ -417,10 +335,8 @@ namespace IceInternal
         public static string[][] validProps =
         {
             IcePatch2Props,
-            IcePatchProps,
-            IceSSLProps,
-            GlacierProps,
             IceStormProps,
+            IceSSLProps,
             IceProps,
             FreezeProps,
             IceGridProps,
@@ -434,10 +350,9 @@ namespace IceInternal
             "Ice",
             "IceBox",
             "IceGrid",
-            "IcePatch",
             "IcePatch2",
+            "IceSSL",
             "IceStorm",
-            "Glacier",
             "Glacier2",
             "Freeze",
             null