diff options
-rw-r--r-- | config/PropertyNames.xml | 1 | ||||
-rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 31 | ||||
-rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
-rw-r--r-- | cs/src/Ice/PropertyNames.cs | 31 | ||||
-rw-r--r-- | java/src/IceInternal/PropertyNames.java | 31 |
5 files changed, 92 insertions, 4 deletions
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml index b2a7b941036..049c37196c4 100644 --- a/config/PropertyNames.xml +++ b/config/PropertyNames.xml @@ -409,6 +409,7 @@ generated from the section label. </section> <section name="IceGrid"> + <property name="AdminRouter" class="objectadapter" /> <property name="InstanceName" /> <property name="Node" class="objectadapter" /> <property name="Node.AllowRunningServersAsRoot" /> diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 62d94b80fa7..0ddd85d19f4 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Nov 12 21:17:34 2012 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 19 20:11:13 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -244,6 +244,35 @@ const IceInternal::PropertyArray const IceInternal::Property IceGridPropsData[] = { + IceInternal::Property("IceGrid.AdminRouter.ACM", false, 0), + IceInternal::Property("IceGrid.AdminRouter.AdapterId", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Endpoints", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.EndpointSelection", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.ConnectionCached", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.PreferSecure", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.LocatorCacheTimeout", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.Locator", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.Router", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator.CollocationOptimized", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Locator", false, 0), + IceInternal::Property("IceGrid.AdminRouter.PublishedEndpoints", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ReplicaGroupId", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.EndpointSelection", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.ConnectionCached", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.PreferSecure", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.LocatorCacheTimeout", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.Locator", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.Router", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router.CollocationOptimized", false, 0), + IceInternal::Property("IceGrid.AdminRouter.Router", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ProxyOptions", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Size", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeMax", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeWarn", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.StackSize", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Serialize", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadIdleTime", false, 0), + IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadPriority", false, 0), IceInternal::Property("IceGrid.InstanceName", false, 0), IceInternal::Property("IceGrid.Node.ACM", false, 0), IceInternal::Property("IceGrid.Node.AdapterId", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index f460865f279..88cfd7cd963 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Nov 12 21:17:34 2012 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 19 20:11:13 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs index 98d93af3a0d..04a417d1551 100644 --- a/cs/src/Ice/PropertyNames.cs +++ b/cs/src/Ice/PropertyNames.cs @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Nov 12 21:17:34 2012 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 19 20:11:13 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -231,6 +231,35 @@ namespace IceInternal public static Property[] IceGridProps = { + new Property(@"^IceGrid\.AdminRouter\.ACM$", false, null), + new Property(@"^IceGrid\.AdminRouter\.AdapterId$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Endpoints$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.EndpointSelection$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.ConnectionCached$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.PreferSecure$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.LocatorCacheTimeout$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.Locator$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.Router$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator\.CollocationOptimized$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Locator$", false, null), + new Property(@"^IceGrid\.AdminRouter\.PublishedEndpoints$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ReplicaGroupId$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.EndpointSelection$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.ConnectionCached$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.PreferSecure$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.LocatorCacheTimeout$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.Locator$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.Router$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router\.CollocationOptimized$", false, null), + new Property(@"^IceGrid\.AdminRouter\.Router$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ProxyOptions$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Size$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeMax$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeWarn$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.StackSize$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Serialize$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadIdleTime$", false, null), + new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadPriority$", false, null), new Property(@"^IceGrid\.InstanceName$", false, null), new Property(@"^IceGrid\.Node\.ACM$", false, null), new Property(@"^IceGrid\.Node\.AdapterId$", false, null), diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 07dc9ac43b4..19c17ab20cd 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Nov 12 21:17:34 2012 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 19 20:11:13 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -231,6 +231,35 @@ public final class PropertyNames public static final Property IceGridProps[] = { + new Property("IceGrid\\.AdminRouter\\.ACM", false, null), + new Property("IceGrid\\.AdminRouter\\.AdapterId", false, null), + new Property("IceGrid\\.AdminRouter\\.Endpoints", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.EndpointSelection", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.ConnectionCached", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.PreferSecure", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.LocatorCacheTimeout", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.Locator", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.Router", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator\\.CollocationOptimized", false, null), + new Property("IceGrid\\.AdminRouter\\.Locator", false, null), + new Property("IceGrid\\.AdminRouter\\.PublishedEndpoints", false, null), + new Property("IceGrid\\.AdminRouter\\.ReplicaGroupId", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.EndpointSelection", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.ConnectionCached", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.PreferSecure", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.LocatorCacheTimeout", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.Locator", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.Router", false, null), + new Property("IceGrid\\.AdminRouter\\.Router\\.CollocationOptimized", false, null), + new Property("IceGrid\\.AdminRouter\\.Router", false, null), + new Property("IceGrid\\.AdminRouter\\.ProxyOptions", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Size", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeMax", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeWarn", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.StackSize", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Serialize", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadIdleTime", false, null), + new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadPriority", false, null), new Property("IceGrid\\.InstanceName", false, null), new Property("IceGrid\\.Node\\.ACM", false, null), new Property("IceGrid\\.Node\\.AdapterId", false, null), |