diff options
Diffstat (limited to 'java/src')
-rwxr-xr-x | java/src/IceGrid/TreeNode/Node.java | 1 | ||||
-rwxr-xr-x | java/src/IceGrid/TreeNode/Nodes.java | 4 | ||||
-rwxr-xr-x | java/src/IceGrid/TreeNode/ReplicaGroups.java | 3 | ||||
-rw-r--r-- | java/src/IceInternal/PropertyNames.java | 7 |
4 files changed, 7 insertions, 8 deletions
diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java index 7d8f7cd0065..30ced966957 100755 --- a/java/src/IceGrid/TreeNode/Node.java +++ b/java/src/IceGrid/TreeNode/Node.java @@ -791,6 +791,7 @@ class Node extends EditableParent descriptor = new NodeDescriptor(new java.util.TreeMap(),
new java.util.LinkedList(),
new java.util.LinkedList(),
+ "",
"");
}
diff --git a/java/src/IceGrid/TreeNode/Nodes.java b/java/src/IceGrid/TreeNode/Nodes.java index 269dca6f8ab..2829a42bc88 100755 --- a/java/src/IceGrid/TreeNode/Nodes.java +++ b/java/src/IceGrid/TreeNode/Nodes.java @@ -77,6 +77,7 @@ public class Nodes extends EditableParent new java.util.TreeMap(),
new java.util.LinkedList(),
new java.util.LinkedList(),
+ "",
""
));
}
@@ -231,7 +232,8 @@ public class Nodes extends EditableParent NodeDescriptor nodeDescriptor = new NodeDescriptor(update.variables,
update.serverInstances,
update.servers,
- update.loadFactor.value);
+ update.loadFactor.value,
+ update.description.value);
_descriptors.put(update.name, nodeDescriptor);
node = new Node(false, update.name, nodeDescriptor, application, false);
newChildren.add(node);
diff --git a/java/src/IceGrid/TreeNode/ReplicaGroups.java b/java/src/IceGrid/TreeNode/ReplicaGroups.java index daa73b18961..1a7d51d6f75 100755 --- a/java/src/IceGrid/TreeNode/ReplicaGroups.java +++ b/java/src/IceGrid/TreeNode/ReplicaGroups.java @@ -66,7 +66,8 @@ class ReplicaGroups extends EditableParent ReplicaGroupDescriptor(
makeNewChildId("NewReplicaGroup"),
null,
- new java.util.LinkedList());
+ new java.util.LinkedList(),
+ "");
newReplicaGroup(descriptor);
}
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index ac45280cf03..0296f3464dd 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', Wed Oct 12 16:57:50 2005 +// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Oct 13 21:51:09 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -129,7 +129,6 @@ public final class PropertyNames "^IceGrid\\.Registry\\.Admin\\.ThreadPool\\.SizeMax$", "^IceGrid\\.Registry\\.Admin\\.ThreadPool\\.SizeWarn$", "^IceGrid\\.Registry\\.Admin\\.ThreadPool\\.StackSize$", - "^IceGrid\\.Registry\\.AdminIdentity$", "^IceGrid\\.Registry\\.Client\\.AdapterId$", "^IceGrid\\.Registry\\.Client\\.ReplicaGroupId$", "^IceGrid\\.Registry\\.Client\\.Endpoints$", @@ -149,9 +148,7 @@ public final class PropertyNames "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeMax$", "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn$", "^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.StackSize$", - "^IceGrid\\.Registry\\.LocatorIdentity$", "^IceGrid\\.Registry\\.NodeSessionTimeout$", - "^IceGrid\\.Registry\\.QueryIdentity$", "^IceGrid\\.Registry\\.Server\\.AdapterId$", "^IceGrid\\.Registry\\.Server\\.ReplicaGroupId$", "^IceGrid\\.Registry\\.Server\\.Endpoints$", @@ -160,8 +157,6 @@ public final class PropertyNames "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeMax$", "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeWarn$", "^IceGrid\\.Registry\\.Server\\.ThreadPool\\.StackSize$", - "^IceGrid\\.Registry\\.SessionManagerIdentity$", - "^IceGrid\\.Registry\\.TopicManagerIdentity$", "^IceGrid\\.Registry\\.Trace\\.Application$", "^IceGrid\\.Registry\\.Trace\\.Adapter$", "^IceGrid\\.Registry\\.Trace\\.Node$", |