Removed property attributes and added iceVersion

10 files changed, 25 insertions, 23 deletions

diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 50745007aff..96ed449a240 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -566,7 +566,7 @@ class AdapterEditor extends CommunicatorChildEditor
 	    Ice.Identity id = 
 		Ice.Util.stringToIdentity((String)entry.getKey());
 	    String[] val = (String[])entry.getValue();
-	    result.add(new ObjectDescriptor(id, val[0], "")); // TODO: Bernard: Remove "property"
+	    result.add(new ObjectDescriptor(id, val[0]));
 	}
 	return result;
     }
diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index 7839ef03d97..7ff63f0c94c 100755
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -585,7 +585,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
 		new ServiceDescriptor(new java.util.LinkedList(),
 				      new PropertySetDescriptor(new String[0], new java.util.LinkedList()),
 				      new java.util.LinkedList(),
-				      new LogDescriptor[0],
+				      new String[0],
 				      "",
 				      "NewService",
 				      "");
diff --git a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
index 04c1340beec..5bb1b2cb428 100755
--- a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
+++ b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
@@ -98,7 +98,7 @@ class CommunicatorSubEditor
 
 	java.util.TreeMap tm = _logFiles.get();
 	java.util.Iterator p = tm.entrySet().iterator();
-	descriptor.logs = new LogDescriptor[tm.size()];
+	descriptor.logs = new String[tm.size()];
 	int i = 0;
 
 	while(p.hasNext())
@@ -107,7 +107,7 @@ class CommunicatorSubEditor
 	    String path = (String)entry.getKey();
 	    String prop = ((String)entry.getValue()).trim();
 
-	    descriptor.logs[i++] = new LogDescriptor(path, "");
+	    descriptor.logs[i++] = path;
 	    if(!prop.equals(""))
 	    {
 		setProperty((java.util.LinkedList)descriptor.propertySet.properties, prop, path);
@@ -127,8 +127,8 @@ class CommunicatorSubEditor
 	for(int i = 0; i < descriptor.logs.length; ++i)
 	{
 	    String prop = lookupKey(descriptor.propertySet.properties,
-				    descriptor.logs[i].path);
-	    map.put(descriptor.logs[i].path, prop);
+				    descriptor.logs[i]);
+	    map.put(descriptor.logs[i], prop);
 	}
 	_logFiles.set(map, detailResolver, isEditable);
 
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java
index 1d7f563a14d..5712c137a06 100755
--- a/java/src/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/Application/PlainServer.java
@@ -68,7 +68,7 @@ class PlainServer extends Communicator implements Server
 	    new java.util.LinkedList(),
 	    new PropertySetDescriptor(new String[0], new java.util.LinkedList()),
 	    new java.util.LinkedList(),
-	    new LogDescriptor[0],
+	    new String[0],
 	    "",
 	    "NewServer",
 	    "",
@@ -81,7 +81,8 @@ class PlainServer extends Communicator implements Server
 	    true,
 	    new DistributionDescriptor("", new java.util.LinkedList()),
 	    false, // Allocatable
-	    ""
+	    "",
+	    "" // Ice version
 	    );
     }
 
@@ -96,7 +97,7 @@ class PlainServer extends Communicator implements Server
 	    new java.util.LinkedList(),
 	    new PropertySetDescriptor(new String[0], properties),
 	    new java.util.LinkedList(),
-	    new LogDescriptor[0],
+	    new String[0],
 	    "",
 	    "NewIceBox",
 	    "",
@@ -110,6 +111,7 @@ class PlainServer extends Communicator implements Server
 	    new DistributionDescriptor("", new java.util.LinkedList()),
 	    false, // Allocatable
 	    "",
+	    "", // Ice version
 	    new java.util.LinkedList()
 	    );
     }
diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java
index b497368454a..f78b45c26e4 100755
--- a/java/src/IceGridGUI/Application/PropertiesField.java
+++ b/java/src/IceGridGUI/Application/PropertiesField.java
@@ -77,7 +77,7 @@ public class PropertiesField extends JTable
 
     public void setProperties(java.util.List properties,
 			      java.util.List adapters,
-			      LogDescriptor[] logs,
+			      String[] logs,
 			      Utils.Resolver resolver, boolean editable)
     {
 	_editable = editable;
@@ -127,7 +127,7 @@ public class PropertiesField extends JTable
 	{
 	    for(int i = 0; i < logs.length; ++i)
 	    {
-		hiddenPropertyValues.add(logs[i].path);
+		hiddenPropertyValues.add(logs[i]);
 	    }
 	}
 	
diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
index 34a4c683be8..4d83942ecac 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
@@ -427,7 +427,7 @@ class ReplicaGroupEditor extends Editor
 	    Ice.Identity id = 
 		Ice.Util.stringToIdentity((String)entry.getKey());
 	    String type = (String)entry.getValue();
-	    result.add(new ObjectDescriptor(id, type, "")); // TODO: Bernard: remove property!
+	    result.add(new ObjectDescriptor(id, type));
 	}
 	return result;
     }
diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java
index 66ce47c3d07..769b3a30a71 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplates.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplates.java
@@ -70,7 +70,7 @@ class ServiceTemplates extends Templates
 	    new java.util.LinkedList(),
 	    new PropertySetDescriptor(new String[0], new java.util.LinkedList()),
 	    new java.util.LinkedList(),
-	    new LogDescriptor[0],
+	    new String[0],
 	    "",
 	    "",
 	    "");
diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java
index e9543fe027a..58b599c8b70 100755
--- a/java/src/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/Application/TreeNode.java
@@ -115,7 +115,7 @@ public abstract class TreeNode extends TreeNodeBase
     }
 
     static void writePropertySet(XMLWriter writer, PropertySetDescriptor psd, 
-				 java.util.List adapters, LogDescriptor[] logs)
+				 java.util.List adapters, String[] logs)
 	throws java.io.IOException
     {
 	writePropertySet(writer, "", "", psd, adapters, logs);
@@ -123,7 +123,7 @@ public abstract class TreeNode extends TreeNodeBase
 
     static void writePropertySet(XMLWriter writer, String id, String idAttrName,
 				 PropertySetDescriptor psd, 
-				 java.util.List adapters, LogDescriptor[] logs)
+				 java.util.List adapters, String[] logs)
 	throws java.io.IOException
     {
 	if(id.length() == 0 && psd.references.length == 0 && psd.properties.size() == 0)
@@ -165,7 +165,7 @@ public abstract class TreeNode extends TreeNodeBase
 	{
 	    for(int i = 0; i < logs.length; ++i)
 	    {
-		hiddenPropertyValues.add(logs[i].path);
+		hiddenPropertyValues.add(logs[i]);
 	    }
 	}
 
@@ -216,14 +216,14 @@ public abstract class TreeNode extends TreeNodeBase
 	}
     }
 
-    static void writeLogs(XMLWriter writer, LogDescriptor[] logs, java.util.List properties)
+    static void writeLogs(XMLWriter writer, String[] logs, java.util.List properties)
 	throws java.io.IOException
     {
 	for(int i = 0; i < logs.length; ++i)
 	{
 	    java.util.List attributes = new java.util.LinkedList();
-	    attributes.add(createAttribute("path", logs[i].path));
-	    String prop = lookupName(logs[i].path, properties);
+	    attributes.add(createAttribute("path", logs[i]));
+	    String prop = lookupName(logs[i], properties);
 	    if(prop != null)
 	    {
 		attributes.add(createAttribute("property", prop));
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 8a5ad3cc9c2..9e70cb72394 100755
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -209,14 +209,14 @@ class Server extends ListArrayTreeNode
 	
 	if(_serverDescriptor.logs.length == 1)
 	{
-	    path = _resolver.substitute(_serverDescriptor.logs[0].path);
+	    path = _resolver.substitute(_serverDescriptor.logs[0]);
 	}
 	else
 	{
 	    Object[] pathArray = new Object[_serverDescriptor.logs.length];
 	    for(int i = 0; i < _serverDescriptor.logs.length; ++i)
 	    {
-		pathArray[i] = _resolver.substitute(_serverDescriptor.logs[i].path);
+		pathArray[i] = _resolver.substitute(_serverDescriptor.logs[i]);
 	    }
 	
 	    path  = (String)JOptionPane.showInputDialog(
diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java
index 1a1e17f0a18..fe48916bf71 100755
--- a/java/src/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/LiveDeployment/Service.java
@@ -44,14 +44,14 @@ class Service extends ListArrayTreeNode
 	
 	if(_serviceDescriptor.logs.length == 1)
 	{
-	    path = _resolver.substitute(_serviceDescriptor.logs[0].path);
+	    path = _resolver.substitute(_serviceDescriptor.logs[0]);
 	}
 	else
 	{
 	    Object[] pathArray = new Object[_serviceDescriptor.logs.length];
 	    for(int i = 0; i < _serviceDescriptor.logs.length; ++i)
 	    {
-		pathArray[i] = _resolver.substitute(_serviceDescriptor.logs[i].path);
+		pathArray[i] = _resolver.substitute(_serviceDescriptor.logs[i]);
 	    }
 	
 	    path = (String)JOptionPane.showInputDialog(