diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-06 15:17:43 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-06 15:17:43 +0000 |
| commit | 226310a48e7f6622911cf0582346990bf6220adc (patch) | |
| tree | 3da6b5100e1488e2afbb7b4e41019afbc4af6a33 /java | |
| parent | Added support for default templates. (diff) | |
| download | ice-226310a48e7f6622911cf0582346990bf6220adc.tar.bz2 ice-226310a48e7f6622911cf0582346990bf6220adc.tar.xz ice-226310a48e7f6622911cf0582346990bf6220adc.zip | |
Fixed properties and IceGrid descriptor change.
Diffstat (limited to 'java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServiceTemplates.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 74 |
2 files changed, 6 insertions, 70 deletions
diff --git a/java/src/IceGrid/TreeNode/ServiceTemplates.java b/java/src/IceGrid/TreeNode/ServiceTemplates.java index f693dbd1bd1..bbe398b9663 100755 --- a/java/src/IceGrid/TreeNode/ServiceTemplates.java +++ b/java/src/IceGrid/TreeNode/ServiceTemplates.java @@ -107,7 +107,7 @@ class ServiceTemplates extends Templates "");
newServiceTemplate(new TemplateDescriptor(
- sd, new java.util.LinkedList()));
+ sd, new java.util.LinkedList(), new java.util.TreeMap()));
}
void newServiceTemplate(TemplateDescriptor descriptor)
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 570c83ebeb8..f2085e528d6 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.def', Thu Sep 29 15:54:59 2005 +// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Oct 6 18:05:40 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -96,72 +96,6 @@ public final class PropertyNames null }; - public static final String IcePackProps[] = - { - "^IcePack\\.Node\\.AdapterId$", - "^IcePack\\.Node\\.ReplicaId$", - "^IcePack\\.Node\\.CollocateRegistry$", - "^IcePack\\.Node\\.Data$", - "^IcePack\\.Node\\.Endpoints$", - "^IcePack\\.Node\\.Name$", - "^IcePack\\.Node\\.Output$", - "^IcePack\\.Node\\.PrintServersReady$", - "^IcePack\\.Node\\.PropertiesOverride$", - "^IcePack\\.Node\\.PublishedEndpoints$", - "^IcePack\\.Node\\.RedirectErrToOut$", - "^IcePack\\.Node\\.ThreadPool\\.Size$", - "^IcePack\\.Node\\.ThreadPool\\.SizeMax$", - "^IcePack\\.Node\\.ThreadPool\\.SizeWarn$", - "^IcePack\\.Node\\.ThreadPool\\.StackSize$", - "^IcePack\\.Node\\.Trace\\.Activator$", - "^IcePack\\.Node\\.Trace\\.Adapter$", - "^IcePack\\.Node\\.Trace\\.Server$", - "^IcePack\\.Node\\.WaitTime$", - "^IcePack\\.Node\\.BackgroundRegistration$", - "^IcePack\\.Registry\\.Admin\\.AdapterId$", - "^IcePack\\.Registry\\.Admin\\.ReplicaId$", - "^IcePack\\.Registry\\.Admin\\.Endpoints$", - "^IcePack\\.Registry\\.Admin\\.PublishedEndpoints$", - "^IcePack\\.Registry\\.Admin\\.ThreadPool\\.Size$", - "^IcePack\\.Registry\\.Admin\\.ThreadPool\\.SizeMax$", - "^IcePack\\.Registry\\.Admin\\.ThreadPool\\.SizeWarn$", - "^IcePack\\.Registry\\.Admin\\.ThreadPool\\.StackSize$", - "^IcePack\\.Registry\\.AdminIdentity$", - "^IcePack\\.Registry\\.Client\\.AdapterId$", - "^IcePack\\.Registry\\.Client\\.ReplicaId$", - "^IcePack\\.Registry\\.Client\\.Endpoints$", - "^IcePack\\.Registry\\.Client\\.PublishedEndpoints$", - "^IcePack\\.Registry\\.Client\\.ThreadPool\\.Size$", - "^IcePack\\.Registry\\.Client\\.ThreadPool\\.SizeMax$", - "^IcePack\\.Registry\\.Client\\.ThreadPool\\.SizeWarn$", - "^IcePack\\.Registry\\.Client\\.ThreadPool\\.StackSize$", - "^IcePack\\.Registry\\.Data$", - "^IcePack\\.Registry\\.DynamicRegistration$", - "^IcePack\\.Registry\\.Internal\\.AdapterId$", - "^IcePack\\.Registry\\.Internal\\.ReplicaId$", - "^IcePack\\.Registry\\.Internal\\.Endpoints$", - "^IcePack\\.Registry\\.Internal\\.PublishedEndpoints$", - "^IcePack\\.Registry\\.Internal\\.ThreadPool\\.Size$", - "^IcePack\\.Registry\\.Internal\\.ThreadPool\\.SizeMax$", - "^IcePack\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn$", - "^IcePack\\.Registry\\.Internal\\.ThreadPool\\.StackSize$", - "^IcePack\\.Registry\\.LocatorIdentity$", - "^IcePack\\.Registry\\.QueryIdentity$", - "^IcePack\\.Registry\\.Server\\.AdapterId$", - "^IcePack\\.Registry\\.Server\\.ReplicaId$", - "^IcePack\\.Registry\\.Server\\.Endpoints$", - "^IcePack\\.Registry\\.Server\\.PublishedEndpoints$", - "^IcePack\\.Registry\\.Server\\.ThreadPool\\.Size$", - "^IcePack\\.Registry\\.Server\\.ThreadPool\\.SizeMax$", - "^IcePack\\.Registry\\.Server\\.ThreadPool\\.SizeWarn$", - "^IcePack\\.Registry\\.Server\\.ThreadPool\\.StackSize$", - "^IcePack\\.Registry\\.Trace\\.AdapterRegistry$", - "^IcePack\\.Registry\\.Trace\\.NodeRegistry$", - "^IcePack\\.Registry\\.Trace\\.ObjectRegistry$", - "^IcePack\\.Registry\\.Trace\\.ServerRegistry$", - null - }; - public static final String IceGridProps[] = { "^IceGrid\\.Node\\.AdapterId$", @@ -204,6 +138,7 @@ public final class PropertyNames "^IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeWarn$", "^IceGrid\\.Registry\\.Client\\.ThreadPool\\.StackSize$", "^IceGrid\\.Registry\\.Data$", + "^IceGrid\\.Registry\\.DefaultTemplates$", "^IceGrid\\.Registry\\.DynamicRegistration$", "^IceGrid\\.Registry\\.Internal\\.AdapterId$", "^IceGrid\\.Registry\\.Internal\\.ReplicaId$", @@ -258,9 +193,11 @@ public final class PropertyNames "^IcePatch2\\.Admin\\.ThreadPool\\.SizeMax$", "^IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn$", "^IcePatch2\\.Admin\\.ThreadPool\\.StackSize$", + "^IcePatch2\\.AdminIdentity$", "^IcePatch2\\.ChunkSize$", "^IcePatch2\\.Directory$", "^IcePatch2\\.Endpoints$", + "^IcePatch2\\.Identity$", "^IcePatch2\\.PublishedEndpoints$", "^IcePatch2\\.Remove$", "^IcePatch2\\.Thorough$", @@ -464,11 +401,10 @@ public final class PropertyNames public static final String[] validProps[] = { IcePatch2Props, - IcePackProps, IcePatchProps, + IceSSLProps, GlacierProps, IceStormProps, - IceSSLProps, IceProps, FreezeProps, IceGridProps, |