More transactional evictor testing

author: Bernard Normier <bernard@zeroc.com> 2007-06-01 23:01:01 +0000
committer: Bernard Normier <bernard@zeroc.com> 2007-06-01 23:01:01 +0000
commit: aba428c2e21eb34f8580804d471c19a208c8c813 (patch)
tree: ea0a9510a719b9e189eeddfebf0bf425075d1176 /cpp/src
parent: Replace isMulticast with macro (diff)
download: ice-aba428c2e21eb34f8580804d471c19a208c8c813.tar.bz2
ice-aba428c2e21eb34f8580804d471c19a208c8c813.tar.xz
ice-aba428c2e21eb34f8580804d471c19a208c8c813.zip
6 files changed, 700 insertions, 660 deletions
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp
index d833d503a44..ca661331c8e 100644
--- a/cpp/src/Freeze/ConnectionI.cpp
+++ b/cpp/src/Freeze/ConnectionI.cpp
@@ -55,6 +55,7 @@ Freeze::ConnectionI::close()
             // Ignored
             //
         }
+        assert(_transaction == 0);
     }
 
     while(!_mapList.empty())
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp
index de30521dfbe..1c54afbce7c 100644
--- a/cpp/src/Freeze/SharedDbEnv.cpp
+++ b/cpp/src/Freeze/SharedDbEnv.cpp
@@ -266,6 +266,28 @@ Freeze::SharedDbEnv::getCurrent()
 void
 Freeze::SharedDbEnv::setCurrentTransaction(const Freeze::TransactionPtr& tx)
 {
+    TransactionIPtr txi;
+
+    if(tx != 0)
+    {
+        txi = Freeze::TransactionIPtr::dynamicCast(tx);
+
+        //
+        // Verify it points to the good DbEnv
+        //
+        if(txi->getConnectionI() == 0 || txi->getConnectionI()->dbEnv() == 0)
+        {
+            throw DatabaseException(__FILE__, __LINE__, "invalid transaction");
+        }
+
+        if(txi->getConnectionI()->dbEnv().get() != this)
+        {
+            throw DatabaseException(__FILE__, __LINE__, "the given transaction is bound to environment '" +
+                                            txi->getConnectionI()->dbEnv()->_envName + "'");
+        }
+    }
+
+
     Freeze::TransactionalEvictorContextPtr ctx = getCurrent();
 
     if(ctx != 0)
@@ -278,9 +300,9 @@ Freeze::SharedDbEnv::setCurrentTransaction(const Freeze::TransactionPtr& tx)
 
     if(tx != 0)
     {
-        if(ctx == 0 || ctx->transaction().get() != tx.get())
+        if(ctx == 0 || ctx->transaction().get() != txi.get())
         {
-            ctx = new TransactionalEvictorContext(TransactionIPtr::dynamicCast(tx)); 
+            ctx = new TransactionalEvictorContext(txi); 
        
 #ifdef _WIN32
             if(TlsSetValue(_tsdKey, ctx.get()) == 0)
diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp
index 94c56dc134b..7537818596e 100644
--- a/cpp/src/Freeze/TransactionI.cpp
+++ b/cpp/src/Freeze/TransactionI.cpp
@@ -169,6 +169,7 @@ Freeze::TransactionI::TransactionI(ConnectionI* connection) :
         throw ex;
     }
 }
+
     
 Freeze::TransactionI::~TransactionI()
 {
@@ -181,12 +182,14 @@ Freeze::TransactionI::~TransactionI()
 void
 Freeze::TransactionI::postCompletion(bool committed, bool deadlock)
 {
-    _connection->clearTransaction();
+    ConnectionIPtr connection = _connection;
     _connection = 0;
     _txn = 0;
- 
+
     if(_postCompletionCallback != 0)
     {
         _postCompletionCallback->postCompletion(committed, deadlock);
     }
+
+    connection->clearTransaction();
 }
diff --git a/cpp/src/Freeze/TransactionalEvictorI.cpp b/cpp/src/Freeze/TransactionalEvictorI.cpp
index 74b9214c291..278f37bc027 100644
--- a/cpp/src/Freeze/TransactionalEvictorI.cpp
+++ b/cpp/src/Freeze/TransactionalEvictorI.cpp
@@ -64,8 +64,7 @@ Freeze::TransactionalEvictorI::TransactionalEvictorI(const ObjectAdapterPtr& ada
                                                      const vector<IndexPtr>& indices,
                                                      bool createDb) :
     EvictorI<TransactionalEvictorElement>(adapter, envName, dbEnv, filename, facetTypes, initializer, indices, createDb),
-    _currentEvictorSize(0),
-    _rollbackOnUserException(false)
+    _currentEvictorSize(0)
 {
     
     class DipatchInterceptorAdapter : public Ice::DispatchInterceptor
@@ -88,6 +87,11 @@ Freeze::TransactionalEvictorI::TransactionalEvictorI(const ObjectAdapterPtr& ada
     };
 
     _interceptor = new DipatchInterceptorAdapter(this);
+
+    string propertyPrefix = string("Freeze.Evictor.") + envName + '.' + _filename; 
+    
+    _rollbackOnUserException = _communicator->getProperties()->
+        getPropertyAsIntWithDefault(propertyPrefix + ".RollbackOnUserException", 0) != 0;
 }
 
 
@@ -95,7 +99,16 @@ TransactionPtr
 Freeze::TransactionalEvictorI::getCurrentTransaction() const
 {
     DeactivateController::Guard deactivateGuard(_deactivateController);
-    return _dbEnv->getCurrent()->transaction();
+    
+    TransactionalEvictorContextPtr ctx = _dbEnv->getCurrent();
+    if(ctx == 0)
+    {
+        return 0;
+    }
+    else
+    {
+        return ctx->transaction();
+    }
 }
 
 void
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 07e52f84c34..6416990cad5 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,576 +1,577 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 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 XXX- stuff needs to go here!
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-
-#include <Ice/PropertyNames.h>
-
-const IceInternal::Property IcePropsData[] = 
-{
-    IceInternal::Property("Ice.ACM.Client", false, 0),
-    IceInternal::Property("Ice.ACM.Server", false, 0),
-    IceInternal::Property("Ice.BatchAutoFlush", false, 0),
-    IceInternal::Property("Ice.ChangeUser", false, 0),
-    IceInternal::Property("Ice.Compression.Level", false, 0),
-    IceInternal::Property("Ice.Config", false, 0),
-    IceInternal::Property("Ice.Default.CollocationOptimization", false, 0),
-    IceInternal::Property("Ice.Default.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Host", false, 0),
-    IceInternal::Property("Ice.Default.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Router", false, 0),
-    IceInternal::Property("Ice.Default.Locator.CollocationOptimization", false, 0),
-    IceInternal::Property("Ice.Default.Locator.ThreadPerConnection", false, 0),
-    IceInternal::Property("Ice.Default.Locator", false, 0),
-    IceInternal::Property("Ice.Default.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Package", false, 0),
-    IceInternal::Property("Ice.Default.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Protocol", false, 0),
-    IceInternal::Property("Ice.Default.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Router.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Router.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Router.Router", false, 0),
-    IceInternal::Property("Ice.Default.Router.CollocationOptimization", false, 0),
-    IceInternal::Property("Ice.Default.Router.ThreadPerConnection", false, 0),
-    IceInternal::Property("Ice.Default.Router", false, 0),
-    IceInternal::Property("Ice.GC.Interval", false, 0),
-    IceInternal::Property("Ice.ImplicitContext", false, 0),
-    IceInternal::Property("Ice.InitPlugins", false, 0),
-    IceInternal::Property("Ice.LoggerPlugin", false, 0),
-    IceInternal::Property("Ice.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.MonitorConnections", false, 0),
-    IceInternal::Property("Ice.Nohup", false, 0),
-    IceInternal::Property("Ice.NullHandleAbort", false, 0),
-    IceInternal::Property("Ice.Override.Compress", false, 0),
-    IceInternal::Property("Ice.Override.ConnectTimeout", false, 0),
-    IceInternal::Property("Ice.Override.Timeout", false, 0),
-    IceInternal::Property("Ice.Override.Secure", false, 0),
-    IceInternal::Property("Ice.Package.*", false, 0),
-    IceInternal::Property("Ice.Plugin.*", false, 0),
-    IceInternal::Property("Ice.PluginLoadOrder", false, 0),
-    IceInternal::Property("Ice.PrintAdapterReady", false, 0),
-    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.ServerIdleTime", false, 0),
-    IceInternal::Property("Ice.StdErr", false, 0),
-    IceInternal::Property("Ice.StdOut", false, 0),
-    IceInternal::Property("Ice.ThreadPerConnection", false, 0),
-    IceInternal::Property("Ice.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.StackSize", false, 0),
-    IceInternal::Property("Ice.Trace.GC", false, 0),
-    IceInternal::Property("Ice.Trace.Location", false, 0),
-    IceInternal::Property("Ice.Trace.Network", false, 0),
-    IceInternal::Property("Ice.Trace.Protocol", false, 0),
-    IceInternal::Property("Ice.Trace.Retry", false, 0),
-    IceInternal::Property("Ice.Trace.Slicing", false, 0),
-    IceInternal::Property("Ice.UDP.RcvSize", false, 0),
-    IceInternal::Property("Ice.UDP.SndSize", false, 0),
-    IceInternal::Property("Ice.TCP.RcvSize", false, 0),
-    IceInternal::Property("Ice.TCP.SndSize", false, 0),
-    IceInternal::Property("Ice.UseSyslog", false, 0),
-    IceInternal::Property("Ice.Warn.AMICallback", false, 0),
-    IceInternal::Property("Ice.Warn.Connections", false, 0),
-    IceInternal::Property("Ice.Warn.Datagrams", false, 0),
-    IceInternal::Property("Ice.Warn.Dispatch", false, 0),
-    IceInternal::Property("Ice.Warn.Endpoints", false, 0),
-    IceInternal::Property("Ice.Warn.UnknownProperties", false, 0),
-    IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceProps(IcePropsData,
-                                                sizeof(IcePropsData)/sizeof(IcePropsData[0]));
-
-const IceInternal::Property IceBoxPropsData[] = 
-{
-    IceInternal::Property("IceBox.InstanceName", false, 0),
-    IceInternal::Property("IceBox.LoadOrder", false, 0),
-    IceInternal::Property("IceBox.PrintServicesReady", false, 0),
-    IceInternal::Property("IceBox.Service.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.AdapterId", false, 0),
-    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.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0),
-    IceInternal::Property("IceBox.InheritProperties", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
-                                                sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
-
-const IceInternal::Property IceGridAdminPropsData[] = 
-{
-    IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
-    IceInternal::Property("IceGridAdmin.Username", false, 0),
-    IceInternal::Property("IceGridAdmin.Password", false, 0),
-    IceInternal::Property("IceGridAdmin.Replica", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.Observers", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridAdminProps(IceGridAdminPropsData,
-                                                sizeof(IceGridAdminPropsData)/sizeof(IceGridAdminPropsData[0]));
-
-const IceInternal::Property IceGridPropsData[] = 
-{
-    IceInternal::Property("IceGrid.InstanceName", false, 0),
-    IceInternal::Property("IceGrid.Node.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Node.CollocateRegistry", false, 0),
-    IceInternal::Property("IceGrid.Node.Data", false, 0),
-    IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),
-    IceInternal::Property("IceGrid.Node.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.Name", false, 0),
-    IceInternal::Property("IceGrid.Node.Output", false, 0),
-    IceInternal::Property("IceGrid.Node.PrintServersReady", false, 0),
-    IceInternal::Property("IceGrid.Node.PropertiesOverride", false, 0),
-    IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),
-    IceInternal::Property("IceGrid.Node.RegisterProcess", false, 0),
-    IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Node.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Activator", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Adapter", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Patch", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Replica", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Server", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccounts", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimization", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0),
-    IceInternal::Property("IceGrid.Node.WaitTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminCryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.AdapterId", false, 0),
-    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.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.StackSize", false, 0),
-    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.DynamicRegistration", 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),
-    IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", 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),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
-    IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", 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),
-    IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.AdapterId", false, 0),
-    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.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Adapter", 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.Server", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Session", false, 0),
-    IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridProps(IceGridPropsData,
-                                                sizeof(IceGridPropsData)/sizeof(IceGridPropsData[0]));
-
-const IceInternal::Property IcePatch2PropsData[] = 
-{
-    IceInternal::Property("IcePatch2.AdapterId", false, 0),
-    IceInternal::Property("IcePatch2.Endpoints", false, 0),
-    IceInternal::Property("IcePatch2.Locator", false, 0),
-    IceInternal::Property("IcePatch2.PublishedEndpoints", false, 0),
-    IceInternal::Property("IcePatch2.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IcePatch2.Router", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPerConnection", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.Size", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IcePatch2.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.AdapterId", false, 0),
-    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.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Router", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.ChunkSize", false, 0),
-    IceInternal::Property("IcePatch2.Directory", false, 0),
-    IceInternal::Property("IcePatch2.InstanceName", false, 0),
-    IceInternal::Property("IcePatch2.RegisterProcess", false, 0),
-    IceInternal::Property("IcePatch2.Remove", false, 0),
-    IceInternal::Property("IcePatch2.Thorough", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IcePatch2Props(IcePatch2PropsData,
-                                                sizeof(IcePatch2PropsData)/sizeof(IcePatch2PropsData[0]));
-
-const IceInternal::Property IceSSLPropsData[] = 
-{
-    IceInternal::Property("IceSSL.Alias", false, 0),
-    IceInternal::Property("IceSSL.CertAuthDir", false, 0),
-    IceInternal::Property("IceSSL.CertAuthFile", false, 0),
-    IceInternal::Property("IceSSL.CertFile", false, 0),
-    IceInternal::Property("IceSSL.CheckCertName", false, 0),
-    IceInternal::Property("IceSSL.CheckCRL", false, 0),
-    IceInternal::Property("IceSSL.Ciphers", false, 0),
-    IceInternal::Property("IceSSL.DefaultDir", false, 0),
-    IceInternal::Property("IceSSL.DH.*", false, 0),
-    IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
-    IceInternal::Property("IceSSL.FindCert.*", false, 0),
-    IceInternal::Property("IceSSL.ImportCert.*", false, 0),
-    IceInternal::Property("IceSSL.KeyFile", false, 0),
-    IceInternal::Property("IceSSL.Keystore", false, 0),
-    IceInternal::Property("IceSSL.KeystorePassword", false, 0),
-    IceInternal::Property("IceSSL.KeystoreType", false, 0),
-    IceInternal::Property("IceSSL.Password", false, 0),
-    IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
-    IceInternal::Property("IceSSL.Protocols", false, 0),
-    IceInternal::Property("IceSSL.Random", false, 0),
-    IceInternal::Property("IceSSL.Trace.Security", false, 0),
-    IceInternal::Property("IceSSL.Truststore", false, 0),
-    IceInternal::Property("IceSSL.TruststorePassword", false, 0),
-    IceInternal::Property("IceSSL.TruststoreType", false, 0),
-    IceInternal::Property("IceSSL.VerifyDepthMax", false, 0),
-    IceInternal::Property("IceSSL.VerifyPeer", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Client", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server.*", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData,
-                                                sizeof(IceSSLPropsData)/sizeof(IceSSLPropsData[0]));
-
-const IceInternal::Property IceStormAdminPropsData[] = 
-{
-    IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
-                                                sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
-
-const IceInternal::Property IceStormPropsData[] = 
-{
-    IceInternal::Property("IceStorm.Flush.Timeout", false, 0),
-    IceInternal::Property("IceStorm.InstanceName", false, 0),
-    IceInternal::Property("IceStorm.Publish.AdapterId", false, 0),
-    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.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceStorm.Publish.Router", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.Publish.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.Publish.RegisterProcess", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.AdapterId", false, 0),
-    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.ReplicaGroupdId", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Router", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.EndpointSelection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.ConnectionCached", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.PreferSecure", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.Locator", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.Router", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimization", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy.ThreadPerConnection", false, 0),
-    IceInternal::Property("IceStorm.TopicManager.Proxy", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.Size", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.SizeMax", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.SizeWarn", false, 0),
-    IceInternal::Property("IceStorm.SubscriberPool.StackSize", false, 0),
-    IceInternal::Property("IceStorm.Trace.Flush", false, 0),
-    IceInternal::Property("IceStorm.Trace.Subscriber", false, 0),
-    IceInternal::Property("IceStorm.Trace.SubscriberPool", false, 0),
-    IceInternal::Property("IceStorm.Trace.Topic", false, 0),
-    IceInternal::Property("IceStorm.Trace.TopicManager", false, 0),
-    IceInternal::Property("IceStorm.Send.Timeout", false, 0),
-    IceInternal::Property("IceStorm.Discard.Interval", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceStormProps(IceStormPropsData,
-                                                sizeof(IceStormPropsData)/sizeof(IceStormPropsData[0]));
-
-const IceInternal::Property Glacier2PropsData[] = 
-{
-    IceInternal::Property("Glacier2.AddSSLContext", false, 0),
-    IceInternal::Property("Glacier2.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
-    IceInternal::Property("Glacier2.Admin.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Admin.RegisterProcess", false, 0),
-    IceInternal::Property("Glacier2.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
-    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),
-    IceInternal::Property("Glacier2.Client.Trace.Request", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Reject", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.ProxySizeMax", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.AcceptUser", false, 0),
-    IceInternal::Property("Glacier2.Filter.AdapterId.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Identity.Accept", false, 0),
-    IceInternal::Property("Glacier2.CryptPasswords", false, 0),
-    IceInternal::Property("Glacier2.InstanceName", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.ReturnClientProxy", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimization", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.RoutingTable.MaxSize", 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),
-    IceInternal::Property("Glacier2.SessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.CollocationOptimization", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.SessionManager", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimization", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager", false, 0),
-    IceInternal::Property("Glacier2.SessionTimeout", false, 0),
-    IceInternal::Property("Glacier2.Trace.RoutingTable", false, 0),
-    IceInternal::Property("Glacier2.Trace.Session", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData,
-                                                sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0]));
-
-const IceInternal::Property FreezePropsData[] = 
-{
-    IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbHome", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbPrivate", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.DbRecoverFatal", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.OldLogsAutoDelete", false, 0),
-    IceInternal::Property("Freeze.DbEnv.*.PeriodicCheckpointMinSize", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.MaxTxSize", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.SavePeriod", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.SaveSizeTrigger", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.StreamTimeout", false, 0),
-    IceInternal::Property("Freeze.Evictor.*.PopulateEmptyIndices", false, 0),
-    IceInternal::Property("Freeze.Evictor.UseNonmutating", false, 0),
-    IceInternal::Property("Freeze.Trace.DbEnv", false, 0),
-    IceInternal::Property("Freeze.Trace.Evictor", false, 0),
-    IceInternal::Property("Freeze.Trace.Map", false, 0),
-    IceInternal::Property("Freeze.Trace.Transaction", false, 0),
-    IceInternal::Property("Freeze.Warn.CloseInFinalize", false, 0),
-    IceInternal::Property("Freeze.Warn.Deadlocks", false, 0),
-};
-
-const IceInternal::PropertyArray
-    IceInternal::PropertyNames::FreezeProps(FreezePropsData,
-                                                sizeof(FreezePropsData)/sizeof(FreezePropsData[0]));
-
-
-const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
-{
-    IceProps,
-    IceBoxProps,
-    IceGridAdminProps,
-    IceGridProps,
-    IcePatch2Props,
-    IceSSLProps,
-    IceStormAdminProps,
-    IceStormProps,
-    Glacier2Props,
-    FreezeProps,
-    IceInternal::PropertyArray(0,0)
-};
-
-
-const char* IceInternal::PropertyNames::clPropNames[] =
-{
-    "Ice",
-    "IceBox",
-    "IceGridAdmin",
-    "IceGrid",
-    "IcePatch2",
-    "IceSSL",
-    "IceStormAdmin",
-    "IceStorm",
-    "Glacier2",
-    "Freeze",
-    0
-};
-
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 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 XXX- stuff needs to go here!
+
+// IMPORTANT: Do not edit this file -- any edits made here will be lost!
+
+#include <Ice/PropertyNames.h>
+
+const IceInternal::Property IcePropsData[] = 
+{
+    IceInternal::Property("Ice.ACM.Client", false, 0),
+    IceInternal::Property("Ice.ACM.Server", false, 0),
+    IceInternal::Property("Ice.BatchAutoFlush", false, 0),
+    IceInternal::Property("Ice.ChangeUser", false, 0),
+    IceInternal::Property("Ice.Compression.Level", false, 0),
+    IceInternal::Property("Ice.Config", false, 0),
+    IceInternal::Property("Ice.Default.CollocationOptimization", false, 0),
+    IceInternal::Property("Ice.Default.EndpointSelection", false, 0),
+    IceInternal::Property("Ice.Default.Host", false, 0),
+    IceInternal::Property("Ice.Default.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("Ice.Default.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("Ice.Default.Locator.PreferSecure", false, 0),
+    IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Ice.Default.Locator.Locator", false, 0),
+    IceInternal::Property("Ice.Default.Locator.Router", false, 0),
+    IceInternal::Property("Ice.Default.Locator.CollocationOptimization", false, 0),
+    IceInternal::Property("Ice.Default.Locator.ThreadPerConnection", false, 0),
+    IceInternal::Property("Ice.Default.Locator", false, 0),
+    IceInternal::Property("Ice.Default.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Ice.Default.Package", false, 0),
+    IceInternal::Property("Ice.Default.PreferSecure", false, 0),
+    IceInternal::Property("Ice.Default.Protocol", false, 0),
+    IceInternal::Property("Ice.Default.Router.EndpointSelection", false, 0),
+    IceInternal::Property("Ice.Default.Router.ConnectionCached", false, 0),
+    IceInternal::Property("Ice.Default.Router.PreferSecure", false, 0),
+    IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Ice.Default.Router.Locator", false, 0),
+    IceInternal::Property("Ice.Default.Router.Router", false, 0),
+    IceInternal::Property("Ice.Default.Router.CollocationOptimization", false, 0),
+    IceInternal::Property("Ice.Default.Router.ThreadPerConnection", false, 0),
+    IceInternal::Property("Ice.Default.Router", false, 0),
+    IceInternal::Property("Ice.GC.Interval", false, 0),
+    IceInternal::Property("Ice.ImplicitContext", false, 0),
+    IceInternal::Property("Ice.InitPlugins", false, 0),
+    IceInternal::Property("Ice.LoggerPlugin", false, 0),
+    IceInternal::Property("Ice.MessageSizeMax", false, 0),
+    IceInternal::Property("Ice.MonitorConnections", false, 0),
+    IceInternal::Property("Ice.Nohup", false, 0),
+    IceInternal::Property("Ice.NullHandleAbort", false, 0),
+    IceInternal::Property("Ice.Override.Compress", false, 0),
+    IceInternal::Property("Ice.Override.ConnectTimeout", false, 0),
+    IceInternal::Property("Ice.Override.Timeout", false, 0),
+    IceInternal::Property("Ice.Override.Secure", false, 0),
+    IceInternal::Property("Ice.Package.*", false, 0),
+    IceInternal::Property("Ice.Plugin.*", false, 0),
+    IceInternal::Property("Ice.PluginLoadOrder", false, 0),
+    IceInternal::Property("Ice.PrintAdapterReady", false, 0),
+    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.ServerIdleTime", false, 0),
+    IceInternal::Property("Ice.StdErr", false, 0),
+    IceInternal::Property("Ice.StdOut", false, 0),
+    IceInternal::Property("Ice.ThreadPerConnection", false, 0),
+    IceInternal::Property("Ice.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Client.Size", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Client.SizeMax", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Client.SizeWarn", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Client.StackSize", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Server.Size", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Server.SizeMax", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Server.SizeWarn", false, 0),
+    IceInternal::Property("Ice.ThreadPool.Server.StackSize", false, 0),
+    IceInternal::Property("Ice.Trace.GC", false, 0),
+    IceInternal::Property("Ice.Trace.Location", false, 0),
+    IceInternal::Property("Ice.Trace.Network", false, 0),
+    IceInternal::Property("Ice.Trace.Protocol", false, 0),
+    IceInternal::Property("Ice.Trace.Retry", false, 0),
+    IceInternal::Property("Ice.Trace.Slicing", false, 0),
+    IceInternal::Property("Ice.UDP.RcvSize", false, 0),
+    IceInternal::Property("Ice.UDP.SndSize", false, 0),
+    IceInternal::Property("Ice.TCP.RcvSize", false, 0),
+    IceInternal::Property("Ice.TCP.SndSize", false, 0),
+    IceInternal::Property("Ice.UseSyslog", false, 0),
+    IceInternal::Property("Ice.Warn.AMICallback", false, 0),
+    IceInternal::Property("Ice.Warn.Connections", false, 0),
+    IceInternal::Property("Ice.Warn.Datagrams", false, 0),
+    IceInternal::Property("Ice.Warn.Dispatch", false, 0),
+    IceInternal::Property("Ice.Warn.Endpoints", false, 0),
+    IceInternal::Property("Ice.Warn.UnknownProperties", false, 0),
+    IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceProps(IcePropsData,
+                                                sizeof(IcePropsData)/sizeof(IcePropsData[0]));
+
+const IceInternal::Property IceBoxPropsData[] = 
+{
+    IceInternal::Property("IceBox.InstanceName", false, 0),
+    IceInternal::Property("IceBox.LoadOrder", false, 0),
+    IceInternal::Property("IceBox.PrintServicesReady", false, 0),
+    IceInternal::Property("IceBox.Service.*", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.AdapterId", false, 0),
+    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.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.Router", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0),
+    IceInternal::Property("IceBox.InheritProperties", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
+                                                sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
+
+const IceInternal::Property IceGridAdminPropsData[] = 
+{
+    IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
+    IceInternal::Property("IceGridAdmin.Username", false, 0),
+    IceInternal::Property("IceGridAdmin.Password", false, 0),
+    IceInternal::Property("IceGridAdmin.Replica", false, 0),
+    IceInternal::Property("IceGridAdmin.Trace.Observers", false, 0),
+    IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceGridAdminProps(IceGridAdminPropsData,
+                                                sizeof(IceGridAdminPropsData)/sizeof(IceGridAdminPropsData[0]));
+
+const IceInternal::Property IceGridPropsData[] = 
+{
+    IceInternal::Property("IceGrid.InstanceName", false, 0),
+    IceInternal::Property("IceGrid.Node.AdapterId", false, 0),
+    IceInternal::Property("IceGrid.Node.CollocateRegistry", false, 0),
+    IceInternal::Property("IceGrid.Node.Data", false, 0),
+    IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),
+    IceInternal::Property("IceGrid.Node.Endpoints", false, 0),
+    IceInternal::Property("IceGrid.Node.Locator", false, 0),
+    IceInternal::Property("IceGrid.Node.Name", false, 0),
+    IceInternal::Property("IceGrid.Node.Output", false, 0),
+    IceInternal::Property("IceGrid.Node.PrintServersReady", false, 0),
+    IceInternal::Property("IceGrid.Node.PropertiesOverride", false, 0),
+    IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),
+    IceInternal::Property("IceGrid.Node.RegisterProcess", false, 0),
+    IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceGrid.Node.Router", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Activator", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Adapter", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Patch", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Replica", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Server", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccounts", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.EndpointSelection", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.ConnectionCached", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.PreferSecure", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimization", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0),
+    IceInternal::Property("IceGrid.Node.WaitTime", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminCryptPasswords", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ConnectionCached", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EndpointSelection", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ConnectionCached", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.AdapterId", false, 0),
+    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.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.StackSize", false, 0),
+    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.DynamicRegistration", 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),
+    IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", 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),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
+    IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", 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),
+    IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.AdapterId", false, 0),
+    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.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.SessionTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ConnectionCached", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Adapter", 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.Server", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Session", false, 0),
+    IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceGridProps(IceGridPropsData,
+                                                sizeof(IceGridPropsData)/sizeof(IceGridPropsData[0]));
+
+const IceInternal::Property IcePatch2PropsData[] = 
+{
+    IceInternal::Property("IcePatch2.AdapterId", false, 0),
+    IceInternal::Property("IcePatch2.Endpoints", false, 0),
+    IceInternal::Property("IcePatch2.Locator", false, 0),
+    IceInternal::Property("IcePatch2.PublishedEndpoints", false, 0),
+    IceInternal::Property("IcePatch2.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IcePatch2.Router", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPerConnection", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPool.Size", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IcePatch2.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.Admin.AdapterId", false, 0),
+    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.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IcePatch2.Admin.Router", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.ChunkSize", false, 0),
+    IceInternal::Property("IcePatch2.Directory", false, 0),
+    IceInternal::Property("IcePatch2.InstanceName", false, 0),
+    IceInternal::Property("IcePatch2.RegisterProcess", false, 0),
+    IceInternal::Property("IcePatch2.Remove", false, 0),
+    IceInternal::Property("IcePatch2.Thorough", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IcePatch2Props(IcePatch2PropsData,
+                                                sizeof(IcePatch2PropsData)/sizeof(IcePatch2PropsData[0]));
+
+const IceInternal::Property IceSSLPropsData[] = 
+{
+    IceInternal::Property("IceSSL.Alias", false, 0),
+    IceInternal::Property("IceSSL.CertAuthDir", false, 0),
+    IceInternal::Property("IceSSL.CertAuthFile", false, 0),
+    IceInternal::Property("IceSSL.CertFile", false, 0),
+    IceInternal::Property("IceSSL.CheckCertName", false, 0),
+    IceInternal::Property("IceSSL.CheckCRL", false, 0),
+    IceInternal::Property("IceSSL.Ciphers", false, 0),
+    IceInternal::Property("IceSSL.DefaultDir", false, 0),
+    IceInternal::Property("IceSSL.DH.*", false, 0),
+    IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
+    IceInternal::Property("IceSSL.FindCert.*", false, 0),
+    IceInternal::Property("IceSSL.ImportCert.*", false, 0),
+    IceInternal::Property("IceSSL.KeyFile", false, 0),
+    IceInternal::Property("IceSSL.Keystore", false, 0),
+    IceInternal::Property("IceSSL.KeystorePassword", false, 0),
+    IceInternal::Property("IceSSL.KeystoreType", false, 0),
+    IceInternal::Property("IceSSL.Password", false, 0),
+    IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
+    IceInternal::Property("IceSSL.Protocols", false, 0),
+    IceInternal::Property("IceSSL.Random", false, 0),
+    IceInternal::Property("IceSSL.Trace.Security", false, 0),
+    IceInternal::Property("IceSSL.Truststore", false, 0),
+    IceInternal::Property("IceSSL.TruststorePassword", false, 0),
+    IceInternal::Property("IceSSL.TruststoreType", false, 0),
+    IceInternal::Property("IceSSL.VerifyDepthMax", false, 0),
+    IceInternal::Property("IceSSL.VerifyPeer", false, 0),
+    IceInternal::Property("IceSSL.TrustOnly", false, 0),
+    IceInternal::Property("IceSSL.TrustOnly.Client", false, 0),
+    IceInternal::Property("IceSSL.TrustOnly.Server", false, 0),
+    IceInternal::Property("IceSSL.TrustOnly.Server.*", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData,
+                                                sizeof(IceSSLPropsData)/sizeof(IceSSLPropsData[0]));
+
+const IceInternal::Property IceStormAdminPropsData[] = 
+{
+    IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
+                                                sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
+
+const IceInternal::Property IceStormPropsData[] = 
+{
+    IceInternal::Property("IceStorm.Flush.Timeout", false, 0),
+    IceInternal::Property("IceStorm.InstanceName", false, 0),
+    IceInternal::Property("IceStorm.Publish.AdapterId", false, 0),
+    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.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceStorm.Publish.Router", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceStorm.Publish.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceStorm.Publish.RegisterProcess", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.AdapterId", false, 0),
+    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.ReplicaGroupdId", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Router", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPerConnection.StackSize", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.EndpointSelection", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.ConnectionCached", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.PreferSecure", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.Locator", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.Router", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.CollocationOptimization", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy.ThreadPerConnection", false, 0),
+    IceInternal::Property("IceStorm.TopicManager.Proxy", false, 0),
+    IceInternal::Property("IceStorm.SubscriberPool.Size", false, 0),
+    IceInternal::Property("IceStorm.SubscriberPool.SizeMax", false, 0),
+    IceInternal::Property("IceStorm.SubscriberPool.SizeWarn", false, 0),
+    IceInternal::Property("IceStorm.SubscriberPool.StackSize", false, 0),
+    IceInternal::Property("IceStorm.Trace.Flush", false, 0),
+    IceInternal::Property("IceStorm.Trace.Subscriber", false, 0),
+    IceInternal::Property("IceStorm.Trace.SubscriberPool", false, 0),
+    IceInternal::Property("IceStorm.Trace.Topic", false, 0),
+    IceInternal::Property("IceStorm.Trace.TopicManager", false, 0),
+    IceInternal::Property("IceStorm.Send.Timeout", false, 0),
+    IceInternal::Property("IceStorm.Discard.Interval", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceStormProps(IceStormPropsData,
+                                                sizeof(IceStormPropsData)/sizeof(IceStormPropsData[0]));
+
+const IceInternal::Property Glacier2PropsData[] = 
+{
+    IceInternal::Property("Glacier2.AddSSLContext", false, 0),
+    IceInternal::Property("Glacier2.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
+    IceInternal::Property("Glacier2.Admin.Endpoints", false, 0),
+    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("Glacier2.Admin.RegisterProcess", false, 0),
+    IceInternal::Property("Glacier2.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
+    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),
+    IceInternal::Property("Glacier2.Client.Trace.Request", false, 0),
+    IceInternal::Property("Glacier2.Filter.Address.Reject", false, 0),
+    IceInternal::Property("Glacier2.Filter.Address.Accept", false, 0),
+    IceInternal::Property("Glacier2.Filter.ProxySizeMax", false, 0),
+    IceInternal::Property("Glacier2.Filter.Category.Accept", false, 0),
+    IceInternal::Property("Glacier2.Filter.Category.AcceptUser", false, 0),
+    IceInternal::Property("Glacier2.Filter.AdapterId.Accept", false, 0),
+    IceInternal::Property("Glacier2.Filter.Identity.Accept", false, 0),
+    IceInternal::Property("Glacier2.CryptPasswords", false, 0),
+    IceInternal::Property("Glacier2.InstanceName", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.PermissionsVerifier", false, 0),
+    IceInternal::Property("Glacier2.ReturnClientProxy", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.EndpointSelection", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ConnectionCached", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.PreferSecure", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimization", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
+    IceInternal::Property("Glacier2.RoutingTable.MaxSize", 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),
+    IceInternal::Property("Glacier2.SessionManager.EndpointSelection", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.ConnectionCached", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.PreferSecure", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.Locator", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.Router", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.CollocationOptimization", false, 0),
+    IceInternal::Property("Glacier2.SessionManager.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.SessionManager", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.ConnectionCached", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.PreferSecure", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimization", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager.ThreadPerConnection", false, 0),
+    IceInternal::Property("Glacier2.SSLSessionManager", false, 0),
+    IceInternal::Property("Glacier2.SessionTimeout", false, 0),
+    IceInternal::Property("Glacier2.Trace.RoutingTable", false, 0),
+    IceInternal::Property("Glacier2.Trace.Session", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData,
+                                                sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0]));
+
+const IceInternal::Property FreezePropsData[] = 
+{
+    IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0),
+    IceInternal::Property("Freeze.DbEnv.*.DbHome", false, 0),
+    IceInternal::Property("Freeze.DbEnv.*.DbPrivate", false, 0),
+    IceInternal::Property("Freeze.DbEnv.*.DbRecoverFatal", false, 0),
+    IceInternal::Property("Freeze.DbEnv.*.OldLogsAutoDelete", false, 0),
+    IceInternal::Property("Freeze.DbEnv.*.PeriodicCheckpointMinSize", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.MaxTxSize", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.SavePeriod", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.SaveSizeTrigger", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.StreamTimeout", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.PopulateEmptyIndices", false, 0),
+    IceInternal::Property("Freeze.Evictor.*.RollbackOnUserException", false, 0),
+    IceInternal::Property("Freeze.Evictor.UseNonmutating", false, 0),
+    IceInternal::Property("Freeze.Trace.DbEnv", false, 0),
+    IceInternal::Property("Freeze.Trace.Evictor", false, 0),
+    IceInternal::Property("Freeze.Trace.Map", false, 0),
+    IceInternal::Property("Freeze.Trace.Transaction", false, 0),
+    IceInternal::Property("Freeze.Warn.CloseInFinalize", false, 0),
+    IceInternal::Property("Freeze.Warn.Deadlocks", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::FreezeProps(FreezePropsData,
+                                                sizeof(FreezePropsData)/sizeof(FreezePropsData[0]));
+
+
+const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
+{
+    IceProps,
+    IceBoxProps,
+    IceGridAdminProps,
+    IceGridProps,
+    IcePatch2Props,
+    IceSSLProps,
+    IceStormAdminProps,
+    IceStormProps,
+    Glacier2Props,
+    FreezeProps,
+    IceInternal::PropertyArray(0,0)
+};
+
+
+const char* IceInternal::PropertyNames::clPropNames[] =
+{
+    "Ice",
+    "IceBox",
+    "IceGridAdmin",
+    "IceGrid",
+    "IcePatch2",
+    "IceSSL",
+    "IceStormAdmin",
+    "IceStorm",
+    "Glacier2",
+    "Freeze",
+    0
+};
+
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 4de5006eec0..8196579820b 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -1,77 +1,77 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 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 XXX- stuff needs to go here!
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-
-#ifndef ICE_INTERNAL_PropertyNames_H
-#define ICE_INTERNAL_PropertyNames_H
-
-#include <Ice/Config.h>
-
-namespace IceInternal
-{
-
-struct Property
-{
-    const char* pattern;
-    bool deprecated;
-    const char* deprecatedBy;
-
-    Property(const char* n, bool d, const char* b) :
-	pattern(n),
-	deprecated(d),
-	deprecatedBy(b)
-    {
-    }
-
-    Property() :
-        pattern(0),
-        deprecated(false),
-        deprecatedBy(0)
-    {
-    }
-
-};
-
-struct PropertyArray
-{
-    const Property* properties;
-    const int length;
-
-    PropertyArray(const Property* p, int len) :
-        properties(p),
-        length(len)
-    {
-    }
-};
-
-class PropertyNames
-{
-public:
-
-    static const PropertyArray IceProps;
-    static const PropertyArray IceBoxProps;
-    static const PropertyArray IceGridAdminProps;
-    static const PropertyArray IceGridProps;
-    static const PropertyArray IcePatch2Props;
-    static const PropertyArray IceSSLProps;
-    static const PropertyArray IceStormAdminProps;
-    static const PropertyArray IceStormProps;
-    static const PropertyArray Glacier2Props;
-    static const PropertyArray FreezeProps;
-
-    static const PropertyArray IceInternal::PropertyNames::validProps[];
-    static const char * IceInternal::PropertyNames::clPropNames[];
-};
-
-}
-
-#endif
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 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 XXX- stuff needs to go here!
+
+// IMPORTANT: Do not edit this file -- any edits made here will be lost!
+
+#ifndef ICE_INTERNAL_PropertyNames_H
+#define ICE_INTERNAL_PropertyNames_H
+
+#include <Ice/Config.h>
+
+namespace IceInternal
+{
+
+struct Property
+{
+    const char* pattern;
+    bool deprecated;
+    const char* deprecatedBy;
+
+    Property(const char* n, bool d, const char* b) :
+	pattern(n),
+	deprecated(d),
+	deprecatedBy(b)
+    {
+    }
+
+    Property() :
+        pattern(0),
+        deprecated(false),
+        deprecatedBy(0)
+    {
+    }
+
+};
+
+struct PropertyArray
+{
+    const Property* properties;
+    const int length;
+
+    PropertyArray(const Property* p, int len) :
+        properties(p),
+        length(len)
+    {
+    }
+};
+
+class PropertyNames
+{
+public:
+
+    static const PropertyArray IceProps;
+    static const PropertyArray IceBoxProps;
+    static const PropertyArray IceGridAdminProps;
+    static const PropertyArray IceGridProps;
+    static const PropertyArray IcePatch2Props;
+    static const PropertyArray IceSSLProps;
+    static const PropertyArray IceStormAdminProps;
+    static const PropertyArray IceStormProps;
+    static const PropertyArray Glacier2Props;
+    static const PropertyArray FreezeProps;
+
+    static const PropertyArray IceInternal::PropertyNames::validProps[];
+    static const char * IceInternal::PropertyNames::clPropNames[];
+};
+
+}
+
+#endif
author	Bernard Normier <bernard@zeroc.com>	2007-06-01 23:01:01 +0000
committer	Bernard Normier <bernard@zeroc.com>	2007-06-01 23:01:01 +0000
commit	aba428c2e21eb34f8580804d471c19a208c8c813 (patch)
tree	ea0a9510a719b9e189eeddfebf0bf425075d1176 /cpp/src
parent	Replace isMulticast with macro (diff)
download	ice-aba428c2e21eb34f8580804d471c19a208c8c813.tar.bz2 ice-aba428c2e21eb34f8580804d471c19a208c8c813.tar.xz ice-aba428c2e21eb34f8580804d471c19a208c8c813.zip