summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2007-11-26 12:06:11 +1000
committerMichi Henning <michi@zeroc.com>2007-11-26 12:06:11 +1000
commit6c4512e4ca81944c22042c833956c8c80c1eedeb (patch)
tree6334ea8cad1dd927879473472cd26d3596e2e8ee /java/src
parentBug 2474. (diff)
parentminor edits (diff)
downloadice-6c4512e4ca81944c22042c833956c8c80c1eedeb.tar.bz2
ice-6c4512e4ca81944c22042c833956c8c80c1eedeb.tar.xz
ice-6c4512e4ca81944c22042c833956c8c80c1eedeb.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceInternal/PropertyNames.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index d7c31efadf0..1f9fc892260 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Nov 20 11:07:30 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Nov 22 20:40:28 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -309,6 +309,19 @@ public final class PropertyNames
new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeMax", false, null),
new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeWarn", false, null),
new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.StackSize", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.AdapterId", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Endpoints", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.PublishedEndpoints", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.RegisterProcess", true, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ReplicaGroupId", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPerConnection", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPerConnection\\.StackSize", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.Size", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeMax", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeWarn", false, null),
+ new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.StackSize", false, null),
new Property("IceGrid\\.Registry\\.SessionTimeout", false, null),
new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EndpointSelection", false, null),
new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.ConnectionCached", false, null),