diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 11:16:08 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 11:16:08 +0800 |
| commit | b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce (patch) | |
| tree | 2b7620aa78f750ce178e39d1b8a99c3e5f6e01db /java/src | |
| parent | removed bogus rule. (diff) | |
| parent | minor edits to README for secure IceGrid demo (diff) | |
| download | ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.bz2 ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.xz ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/Application/PlainServer.java | 11 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/Coordinator.java | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index 2e5415622cb..cf10e4b4163 100755 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -64,12 +64,9 @@ class PlainServer extends Communicator implements Server static public ServerDescriptor newServerDescriptor() { - java.util.LinkedList properties = new java.util.LinkedList(); - properties.add(new PropertyDescriptor("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); - return new ServerDescriptor( new java.util.LinkedList(), - new PropertySetDescriptor(new String[0], properties), + new PropertySetDescriptor(new String[0], new java.util.LinkedList()), new java.util.LinkedList(), new String[0], "", @@ -90,13 +87,9 @@ class PlainServer extends Communicator implements Server static public IceBoxDescriptor newIceBoxDescriptor() { - java.util.LinkedList properties = new java.util.LinkedList(); - properties.add(new PropertyDescriptor("IceBox.InstanceName", "${server}")); - properties.add(new PropertyDescriptor("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); - return new IceBoxDescriptor( new java.util.LinkedList(), - new PropertySetDescriptor(new String[0], properties), + new PropertySetDescriptor(new String[0], new java.util.LinkedList()), new java.util.LinkedList(), new String[0], "", diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 041133946e7..494f742effc 100755 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -2458,14 +2458,14 @@ public class Coordinator else { BareBonesBrowserLaunch.openURL("http://www.zeroc.com/doc/Ice-" - + IceUtil.Version.ICE_STRING_VERSION + "/IceGridAdmin/index.html"); + + Ice.Util.stringVersion() + "/IceGridAdmin/index.html"); } } private void about() { String text = "IceGrid Admin version " - + IceUtil.Version.ICE_STRING_VERSION + "\n" + + Ice.Util.stringVersion() + "\n" + "Copyright \u00A9 2005-2008 ZeroC, Inc. All rights reserved.\n"; JOptionPane.showMessageDialog( |