summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/PropertyNames.def42
-rw-r--r--cpp/src/Ice/PropertyNames.cpp44
-rw-r--r--cpp/src/Ice/PropertyNames.h2
3 files changed, 86 insertions, 2 deletions
diff --git a/cpp/config/PropertyNames.def b/cpp/config/PropertyNames.def
index 535de06c7ec..d663066c1e7 100644
--- a/cpp/config/PropertyNames.def
+++ b/cpp/config/PropertyNames.def
@@ -121,11 +121,25 @@ Ice:
Default.CollocationOptimization
Default.Host
Default.Locator
+ Default.Locator.EndpointSelection
+ Default.Locator.ConnectionCached
+ Default.Locator.PreferSecure
+ Default.Locator.LocatorCacheTimeout
+ Default.Locator.Locator
+ Default.Locator.Router
+ Default.Locator.CollocationOptimization
Default.LocatorCacheTimeout
Default.Package
Default.PreferSecure
Default.Protocol
Default.Router
+ Default.Router.EndpointSelection
+ Default.Router.ConnectionCached
+ Default.Router.PreferSecure
+ Default.Router.LocatorCacheTimeout
+ Default.Router.Locator
+ Default.Router.Router
+ Default.Router.CollocationOptimization
GC.Interval
ImplicitContext
InitPlugins
@@ -378,9 +392,11 @@ IceStorm:
Glacier2:
AddSSLContext
+ AddUserToAllowCategories
Admin.Endpoints
Admin.PublishedEndpoints
Admin.RegisterProcess
+ AllowCategories
Client.AlwaysBatch
Client.Buffered
Client.Endpoints
@@ -401,7 +417,21 @@ Glacier2:
CryptPasswords
InstanceName
PermissionsVerifier
+ PermissionsVerifier.EndpointSelection
+ PermissionsVerifier.ConnectionCached
+ PermissionsVerifier.PreferSecure
+ PermissionsVerifier.LocatorCacheTimeout
+ PermissionsVerifier.Locator
+ PermissionsVerifier.Router
+ PermissionsVerifier.CollocationOptimization
SSLPermissionsVerifier
+ SSLPermissionsVerifier.EndpointSelection
+ SSLPermissionsVerifier.ConnectionCached
+ SSLPermissionsVerifier.PreferSecure
+ SSLPermissionsVerifier.LocatorCacheTimeout
+ SSLPermissionsVerifier.Locator
+ SSLPermissionsVerifier.Router
+ SSLPermissionsVerifier.CollocationOptimization
RoutingTable.MaxSize
Server.AlwaysBatch
Server.Buffered
@@ -413,9 +443,21 @@ Glacier2:
Server.Trace.Override
Server.Trace.Request
SessionManager
+ SessionManager.EndpointSelection
+ SessionManager.ConnectionCached
+ SessionManager.PreferSecure
SessionManager.LocatorCacheTimeout
+ SessionManager.Locator
+ SessionManager.Router
+ SessionManager.CollocationOptimization
SSLSessionManager
+ SSLSessionManager.EndpointSelection
+ SSLSessionManager.ConnectionCached
+ SSLSessionManager.PreferSecure
SSLSessionManager.LocatorCacheTimeout
+ SSLSessionManager.Locator
+ SSLSessionManager.Router
+ SSLSessionManager.CollocationOptimization
SessionTimeout
Trace.RoutingTable
Trace.Session
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 7e68d44042a..c4be2fac535 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.def', Tue Nov 28 09:58:53 2006
+// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 4 13:26:07 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -23,11 +23,25 @@ const char* IceInternal::PropertyNames::IceProps[] =
"Ice.Default.CollocationOptimization",
"Ice.Default.Host",
"Ice.Default.Locator",
+ "Ice.Default.Locator.EndpointSelection",
+ "Ice.Default.Locator.ConnectionCached",
+ "Ice.Default.Locator.PreferSecure",
+ "Ice.Default.Locator.LocatorCacheTimeout",
+ "Ice.Default.Locator.Locator",
+ "Ice.Default.Locator.Router",
+ "Ice.Default.Locator.CollocationOptimization",
"Ice.Default.LocatorCacheTimeout",
"Ice.Default.Package",
"Ice.Default.PreferSecure",
"Ice.Default.Protocol",
"Ice.Default.Router",
+ "Ice.Default.Router.EndpointSelection",
+ "Ice.Default.Router.ConnectionCached",
+ "Ice.Default.Router.PreferSecure",
+ "Ice.Default.Router.LocatorCacheTimeout",
+ "Ice.Default.Router.Locator",
+ "Ice.Default.Router.Router",
+ "Ice.Default.Router.CollocationOptimization",
"Ice.GC.Interval",
"Ice.ImplicitContext",
"Ice.InitPlugins",
@@ -301,9 +315,11 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
const char* IceInternal::PropertyNames::Glacier2Props[] =
{
"Glacier2.AddSSLContext",
+ "Glacier2.AddUserToAllowCategories",
"Glacier2.Admin.Endpoints",
"Glacier2.Admin.PublishedEndpoints",
"Glacier2.Admin.RegisterProcess",
+ "Glacier2.AllowCategories",
"Glacier2.Client.AlwaysBatch",
"Glacier2.Client.Buffered",
"Glacier2.Client.Endpoints",
@@ -324,7 +340,21 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
"Glacier2.CryptPasswords",
"Glacier2.InstanceName",
"Glacier2.PermissionsVerifier",
+ "Glacier2.PermissionsVerifier.EndpointSelection",
+ "Glacier2.PermissionsVerifier.ConnectionCached",
+ "Glacier2.PermissionsVerifier.PreferSecure",
+ "Glacier2.PermissionsVerifier.LocatorCacheTimeout",
+ "Glacier2.PermissionsVerifier.Locator",
+ "Glacier2.PermissionsVerifier.Router",
+ "Glacier2.PermissionsVerifier.CollocationOptimization",
"Glacier2.SSLPermissionsVerifier",
+ "Glacier2.SSLPermissionsVerifier.EndpointSelection",
+ "Glacier2.SSLPermissionsVerifier.ConnectionCached",
+ "Glacier2.SSLPermissionsVerifier.PreferSecure",
+ "Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout",
+ "Glacier2.SSLPermissionsVerifier.Locator",
+ "Glacier2.SSLPermissionsVerifier.Router",
+ "Glacier2.SSLPermissionsVerifier.CollocationOptimization",
"Glacier2.RoutingTable.MaxSize",
"Glacier2.Server.AlwaysBatch",
"Glacier2.Server.Buffered",
@@ -336,9 +366,21 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
"Glacier2.Server.Trace.Override",
"Glacier2.Server.Trace.Request",
"Glacier2.SessionManager",
+ "Glacier2.SessionManager.EndpointSelection",
+ "Glacier2.SessionManager.ConnectionCached",
+ "Glacier2.SessionManager.PreferSecure",
"Glacier2.SessionManager.LocatorCacheTimeout",
+ "Glacier2.SessionManager.Locator",
+ "Glacier2.SessionManager.Router",
+ "Glacier2.SessionManager.CollocationOptimization",
"Glacier2.SSLSessionManager",
+ "Glacier2.SSLSessionManager.EndpointSelection",
+ "Glacier2.SSLSessionManager.ConnectionCached",
+ "Glacier2.SSLSessionManager.PreferSecure",
"Glacier2.SSLSessionManager.LocatorCacheTimeout",
+ "Glacier2.SSLSessionManager.Locator",
+ "Glacier2.SSLSessionManager.Router",
+ "Glacier2.SSLSessionManager.CollocationOptimization",
"Glacier2.SessionTimeout",
"Glacier2.Trace.RoutingTable",
"Glacier2.Trace.Session",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index e16742a9dbf..f28e0c564be 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `./config/PropertyNames.def', Tue Nov 28 09:58:53 2006
+// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 4 13:26:07 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!