summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/IceGridGUI/Application/Communicator.java1
-rwxr-xr-xjava/src/IceGridGUI/Application/PlainServer.java22
2 files changed, 5 insertions, 18 deletions
diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index c051fea25c7..76ecd061c1e 100755
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -486,6 +486,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
"",
null,
"",
+ "",
false,
true,
new java.util.LinkedList(),
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java
index 328f638d2c6..050a63b1fe0 100755
--- a/java/src/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/Application/PlainServer.java
@@ -86,27 +86,13 @@ class PlainServer extends Communicator implements Server
static public IceBoxDescriptor newIceBoxDescriptor()
{
- AdapterDescriptor serviceManager = new AdapterDescriptor(
- "IceBox.ServiceManager",
- "",
- "", // direct-adapter by default
- "",
- true,
- true,
- new java.util.LinkedList(),
- new java.util.LinkedList());
-
- java.util.LinkedList adapterList = new java.util.LinkedList();
- adapterList.add(serviceManager);
-
- PropertyDescriptor pd =
- new PropertyDescriptor("IceBox.ServiceManager.Endpoints",
- "tcp -h 127.0.0.1");
java.util.LinkedList properties = new java.util.LinkedList();
- properties.add(pd);
+ properties.add(new PropertyDescriptor("IceBox.InstanceName", "${server}"));
+ properties.add(new PropertyDescriptor("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
+ properties.add(new PropertyDescriptor("IceBox.RegisterProcess", "1"));
return new IceBoxDescriptor(
- adapterList,
+ new java.util.LinkedList(),
new PropertySetDescriptor(new String[0], properties),
new java.util.LinkedList(),
"",