Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 27 insertions, 1 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index bf84eafa055..d85fda1a87d 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,12 +1,15 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.xml, Tue Jan 20 15:47:00 2009
+
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
 #include <Ice/PropertyNames.h>
@@ -32,6 +35,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Admin.Facets", false, 0),
     IceInternal::Property("Ice.Admin.InstanceName", false, 0),
     IceInternal::Property("Ice.Admin.ServerId", false, 0),
+    IceInternal::Property("Ice.BackgroundLocatorCacheUpdates", false, 0),
     IceInternal::Property("Ice.BatchAutoFlush", false, 0),
     IceInternal::Property("Ice.ChangeUser", false, 0),
     IceInternal::Property("Ice.Compression.Level", false, 0),
@@ -274,7 +278,15 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
     IceInternal::Property("IceGrid.Registry.Data", false, 0),
     IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
+    IceInternal::Property("IceGrid.Registry.Discard.Interval", false, 0),
     IceInternal::Property("IceGrid.Registry.DynamicRegistration", false, 0),
+    IceInternal::Property("IceGrid.Registry.Election.ElectionTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.Election.MasterTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.Election.ResponseTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.Flush.Timeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.IceStormAdmin.TopicManager.Default", false, 0),
+    IceInternal::Property("IceGrid.Registry.IceStormAdmin.TopicManager.*", false, 0),
+    IceInternal::Property("IceGrid.Registry.InstanceName", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.AdapterId", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.Locator", false, 0),
@@ -288,6 +300,9 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceGrid.Registry.Node.*", false, 0),
+    IceInternal::Property("IceGrid.Registry.NodeId", false, 0),
+    IceInternal::Property("IceGrid.Registry.Nodes.id", false, 0),
     IceInternal::Property("IceGrid.Registry.NodeSessionTimeout", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
@@ -298,8 +313,12 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.PermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.Publish.*", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.ReplicatedPublishEndpoints", false, 0),
+    IceInternal::Property("IceGrid.Registry.ReplicatedTopicManagerEndpoints", false, 0),
+    IceInternal::Property("IceGrid.Registry.Send.Timeout", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Locator", false, 0),
@@ -337,15 +356,22 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", true, "IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized"),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.TopicManager.*", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Adapter", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Election", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Node", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Object", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Patch", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Replica", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Replication", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Server", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Session", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Subscriber", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Topic", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.TopicManager", false, 0),
+    IceInternal::Property("IceGrid.Registry.Transient", false, 0),
     IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
 };