Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cs/src/Ice/Instance.cs

Removed conflicts. Added more tests. Changed stack
marshaling to reverse order during marshaling instead
of during unmarshaling.

1 files changed, 64 insertions, 19 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index b4eb08cafce..db9d25059fe 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, Thu Sep  6 17:17:28 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Sep  7 11:03:12 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -17,6 +17,21 @@ const IceInternal::Property IcePropsData[] =
 {
     IceInternal::Property("Ice.ACM.Client", false, 0),
     IceInternal::Property("Ice.ACM.Server", false, 0),
+    IceInternal::Property("Ice.Admin.AdapterId", false, 0),
+    IceInternal::Property("Ice.Admin.Endpoints", false, 0),
+    IceInternal::Property("Ice.Admin.Locator", false, 0),
+    IceInternal::Property("Ice.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("Ice.Admin.RegisterProcess", true, 0),
+    IceInternal::Property("Ice.Admin.ReplicaGroupId", false, 0),
+    IceInternal::Property("Ice.Admin.Router", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPerConnection", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPool.Size", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("Ice.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("Ice.Admin.InstanceName", false, 0),
+    IceInternal::Property("Ice.Admin.ServerId", false, 0),
     IceInternal::Property("Ice.BatchAutoFlush", false, 0),
     IceInternal::Property("Ice.ChangeUser", false, 0),
     IceInternal::Property("Ice.Compression.Level", false, 0),
@@ -67,7 +82,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.PrintProcessId", false, 0),
     IceInternal::Property("Ice.ProgramName", false, 0),
     IceInternal::Property("Ice.RetryIntervals", false, 0),
-    IceInternal::Property("Ice.ServerId", false, 0),
+    IceInternal::Property("Ice.ServerId", true, 0),
     IceInternal::Property("Ice.ServerIdleTime", false, 0),
     IceInternal::Property("Ice.StdErr", false, 0),
     IceInternal::Property("Ice.StdOut", false, 0),
@@ -116,7 +131,7 @@ const IceInternal::Property IceBoxPropsData[] =
     IceInternal::Property("IceBox.ServiceManager.Endpoints", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Locator", false, 0),
     IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.RegisterProcess", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.RegisterProcess", true, 0),
     IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", false, 0),
     IceInternal::Property("IceBox.ServiceManager.Router", false, 0),
     IceInternal::Property("IceBox.ServiceManager.ThreadPerConnection", false, 0),
@@ -154,7 +169,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Node.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Node.Locator", false, 0),
     IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Node.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Node.Router", false, 0),
     IceInternal::Property("IceGrid.Node.ThreadPerConnection", false, 0),
@@ -215,7 +230,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Client.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Client.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.ThreadPerConnection", false, 0),
@@ -232,7 +247,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPerConnection", false, 0),
@@ -258,7 +273,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.ThreadPerConnection", false, 0),
@@ -272,7 +287,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SessionManager.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.RegisterProcess", true, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.ReplicaGroupId", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
     IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPerConnection", false, 0),
@@ -314,7 +329,7 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.Endpoints", false, 0),
     IceInternal::Property("IcePatch2.Locator", false, 0),
     IceInternal::Property("IcePatch2.PublishedEndpoints", false, 0),
-    IceInternal::Property("IcePatch2.RegisterProcess", false, 0),
+    IceInternal::Property("IcePatch2.RegisterProcess", true, 0),
     IceInternal::Property("IcePatch2.ReplicaGroupId", false, 0),
     IceInternal::Property("IcePatch2.Router", false, 0),
     IceInternal::Property("IcePatch2.ThreadPerConnection", false, 0),
@@ -327,7 +342,7 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.Admin.Endpoints", false, 0),
     IceInternal::Property("IcePatch2.Admin.Locator", false, 0),
     IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("IcePatch2.Admin.RegisterProcess", false, 0),
+    IceInternal::Property("IcePatch2.Admin.RegisterProcess", true, 0),
     IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", false, 0),
     IceInternal::Property("IcePatch2.Admin.Router", false, 0),
     IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", false, 0),
@@ -402,7 +417,7 @@ const IceInternal::Property IceStormPropsData[] =
     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", 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.ThreadPerConnection", false, 0),
@@ -415,7 +430,7 @@ const IceInternal::Property IceStormPropsData[] =
     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", 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.ThreadPerConnection", false, 0),
@@ -455,16 +470,36 @@ const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddSSLContext", false, 0),
     IceInternal::Property("Glacier2.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
+    IceInternal::Property("Glacier2.Admin.AdapterId", false, 0),
     IceInternal::Property("Glacier2.Admin.Endpoints", false, 0),
+    IceInternal::Property("Glacier2.Admin.Locator", false, 0),
     IceInternal::Property("Glacier2.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Admin.RegisterProcess", false, 0),
+    IceInternal::Property("Glacier2.Admin.RegisterProcess", true, 0),
+    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", false, 0),
+    IceInternal::Property("Glacier2.Admin.Router", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", false, 0),
     IceInternal::Property("Glacier2.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
+    IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
+    IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
+    IceInternal::Property("Glacier2.Client.Locator", false, 0),
+    IceInternal::Property("Glacier2.Client.PublishedEndpoints", false, 0),
+    IceInternal::Property("Glacier2.Client.RegisterProcess", true, 0),
+    IceInternal::Property("Glacier2.Client.ReplicaGroupId", false, 0),
+    IceInternal::Property("Glacier2.Client.Router", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPool.Size", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("Glacier2.Client.ThreadPool.StackSize", false, 0),
     IceInternal::Property("Glacier2.Client.AlwaysBatch", false, 0),
     IceInternal::Property("Glacier2.Client.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
     IceInternal::Property("Glacier2.Client.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.RegisterProcess", false, 0),
     IceInternal::Property("Glacier2.Client.SleepTime", false, 0),
     IceInternal::Property("Glacier2.Client.Trace.Override", false, 0),
     IceInternal::Property("Glacier2.Client.Trace.Reject", false, 0),
@@ -500,12 +535,22 @@ const IceInternal::Property Glacier2PropsData[] =
     IceInternal::Property("Glacier2.SSLPermissionsVerifier.ThreadPerConnection", false, 0),
     IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
     IceInternal::Property("Glacier2.RoutingTable.MaxSize", false, 0),
+    IceInternal::Property("Glacier2.Server.AdapterId", false, 0),
+    IceInternal::Property("Glacier2.Server.Endpoints", false, 0),
+    IceInternal::Property("Glacier2.Server.Locator", false, 0),
+    IceInternal::Property("Glacier2.Server.PublishedEndpoints", false, 0),
+    IceInternal::Property("Glacier2.Server.RegisterProcess", true, 0),
+    IceInternal::Property("Glacier2.Server.ReplicaGroupId", false, 0),
+    IceInternal::Property("Glacier2.Server.Router", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPool.Size", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("Glacier2.Server.ThreadPool.StackSize", false, 0),
     IceInternal::Property("Glacier2.Server.AlwaysBatch", false, 0),
     IceInternal::Property("Glacier2.Server.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Server.Endpoints", false, 0),
     IceInternal::Property("Glacier2.Server.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.RegisterProcess", false, 0),
     IceInternal::Property("Glacier2.Server.SleepTime", false, 0),
     IceInternal::Property("Glacier2.Server.Trace.Override", false, 0),
     IceInternal::Property("Glacier2.Server.Trace.Request", false, 0),