diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
| commit | d07fdae285690f699a70f97f36232e516dcad2bc (patch) | |
| tree | c239def689c5e6cc53ac76dbe3e60ec11c306964 /java/src/IceGridGUI | |
| parent | Fixed tryLock() comment (diff) | |
| download | ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2 ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip | |
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'java/src/IceGridGUI')
4 files changed, 7 insertions, 7 deletions
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index aa96cb4f8c1..fd854398a79 100755 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -89,8 +89,8 @@ class PlainServer extends Communicator implements Server { java.util.LinkedList properties = new java.util.LinkedList(); 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")); + properties.add(new PropertyDescriptor("Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); + properties.add(new PropertyDescriptor("Ice.OA.IceBox.RegisterProcess", "1")); return new IceBoxDescriptor( new java.util.LinkedList(), diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java index 0de2e690502..f5e84bf10ff 100755 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/Application/PropertiesField.java @@ -94,8 +94,8 @@ public class PropertiesField extends JTable while(p.hasNext()) { AdapterDescriptor ad = (AdapterDescriptor)p.next(); - hiddenPropertyNames.add(ad.name + ".Endpoints"); - hiddenPropertyNames.add(ad.name + ".PublishedEndpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".PublishedEndpoints"); } } diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java index b74fd1f2698..d974135f158 100755 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/Application/TreeNode.java @@ -141,7 +141,7 @@ public abstract class TreeNode extends TreeNodeBase while(p.hasNext()) { AdapterDescriptor ad = (AdapterDescriptor)p.next(); - hiddenPropertyNames.add(ad.name + ".Endpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints"); } } diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index aa44dfc081c..e69428ea9b3 100755 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -71,9 +71,9 @@ class AdapterEditor extends Editor java.util.Map properties = adapter.getProperties(); // getId() returns the name of the adapter! - _endpoints.setText(resolver.substitute((String)properties.get(adapter.getId() + ".Endpoints"))); + _endpoints.setText(resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".Endpoints"))); _publishedEndpoints.setText( - resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints"))); + resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".PublishedEndpoints"))); _registerProcess.setSelected(descriptor.registerProcess); _serverLifetime.setSelected(descriptor.serverLifetime); |