Fixed IceGrid build; replicated adapter is now replica group

13 files changed, 320 insertions, 197 deletions

diff --git a/java/build.xml b/java/build.xml
index 709de94f6e9..5220b82e6b1 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -139,21 +139,6 @@
         <depend srcdir="${generated.dir}:${src.dir}" destdir="${lib.dir}" cache="${cache.dir}"/>
         <javac srcdir="${generated.dir}:${src.dir}" destdir="${lib.dir}"
             source="1.4" debug="${debug}" optimize="${optimize}" deprecation="on">
-	  <exclude name="IceGrid/AdminGUI.java"/>
-	  <exclude name="IceGrid/RegistryObserverI.java"/>
-	  <exclude name="IceGrid/CellRenderer.java"/>
-	  <exclude name="IceGrid/SessionKeeper.java"/>
-	  <exclude name="IceGrid/ListDialog.java"/>
-	  <exclude name="IceGrid/SimpleInternalFrame.java"/>
-	  <exclude name="IceGrid/MainPane.java"/>
-	  <exclude name="IceGrid/StatusBar.java"/>
-	  <exclude name="IceGrid/Model.java"/>
-	  <exclude name="IceGrid/TableDialog.java"/>
-	  <exclude name="IceGrid/NodeObserverI.java"/>
-	  <exclude name="IceGrid/TreeModelI.java"/>
-	  <exclude name="IceGrid/ParametersDialog.java"/>
-	  <exclude name="IceGrid/Utils.java"/>
-          <exclude name="IceGrid/TreeNode/**"/>
         </javac>
     </target>
 
diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java
index dc94dfc21f4..7062875b55d 100755
--- a/java/src/IceGrid/TreeNode/Adapter.java
+++ b/java/src/IceGrid/TreeNode/Adapter.java
@@ -117,12 +117,9 @@ class Adapter extends Leaf
 	    //
 	    // In a server instance
 	    //
-	    _instanceId 
-		= new AdapterInstanceId(_resolver.find("server"),
-					_resolver.substitute(_descriptor.id));
-	    
+	    _adapterId = _resolver.substitute(_descriptor.id);
 	    _proxy = _model.getRoot().registerAdapter(_resolver.find("node"),
-						      _instanceId,
+						      _adapterId,
 						      this);
 	    createToolTip();
 	    //
@@ -130,16 +127,22 @@ class Adapter extends Leaf
 	    //  
 	}
 	super.setParent(parent);
+	
+	CommonBase grandParent = parent.getParent();
+	
+	_defaultAdapterId = (grandParent instanceof Service || 
+			     grandParent instanceof ServiceTemplate) ? 
+	    "${server}.${service}." + _id: "${server}." + _id;
     }
 
     public void clearParent()
     {
 	if(_parent != null)
 	{
-	    if(_instanceId != null)
+	    if(_adapterId != null)
 	    {
 		_model.getRoot().unregisterAdapter(_resolver.find("node"),
-						   _instanceId, this);
+						   _adapterId, this);
 	    }
 	    super.clearParent();
 	}
@@ -235,16 +238,23 @@ class Adapter extends Leaf
 		   newEndpoints);
     }
 
-    AdapterInstanceId getInstanceId()
+    String getAdapterId()
+    {
+	return _adapterId;
+    }
+    
+    String getDefaultAdapterId()
     {
-	return _instanceId;
+	return _defaultAdapterId;
     }
 
+
     public boolean isEphemeral()
     {
 	return _ephemeral;
     }
 
+
     private void createToolTip()
     {
 	if(_proxy == null)
@@ -261,10 +271,12 @@ class Adapter extends Leaf
     private AdapterDescriptor _descriptor;
     private Utils.Resolver _resolver;
 
-    private AdapterInstanceId _instanceId;
     private Ice.ObjectPrx _proxy;
     private String _toolTip;
 
+    private String _adapterId; // resolved adapter id, null when _resolver == null
+    private String _defaultAdapterId;
+
     static private DefaultTreeCellRenderer _cellRenderer;
     static private AdapterEditor _editor;
 }
diff --git a/java/src/IceGrid/TreeNode/AdapterEditor.java b/java/src/IceGrid/TreeNode/AdapterEditor.java
index 1a4c5586cca..33f713f2498 100755
--- a/java/src/IceGrid/TreeNode/AdapterEditor.java
+++ b/java/src/IceGrid/TreeNode/AdapterEditor.java
@@ -9,16 +9,22 @@
 package IceGrid.TreeNode;
 
 import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
 
 import IceGrid.AdapterDescriptor;
 import IceGrid.Model;
@@ -37,38 +43,41 @@ class AdapterEditor extends ListElementEditor
 	//
 	
 	//
-	// _idButton
+	// _replicaGroupButton
 	//
-	Action gotoReplicatedAdapter = new AbstractAction("->")
+	Action gotoReplicaGroup = new AbstractAction("->")
 	    {
 		public void actionPerformed(ActionEvent e) 
 		{
-		    Object obj = _id.getSelectedItem();
+		    Object obj = _replicaGroupId.getSelectedItem();
 		    Adapter adapter = getAdapter();
 
-		    if(obj != null && adapter != null)
+		    ReplicaGroup rg = null;
+		    if(obj instanceof ReplicaGroup)
 		    {
-			ReplicatedAdapter ra = null;
-			if(obj instanceof ReplicatedAdapter)
-			{
-			    ra = (ReplicatedAdapter)obj;
-			}
-			else
-			{
-			    ra = adapter.getApplication().
-				findReplicatedAdapter((String)obj);
-			}
-			if(ra != null)
-			{
-			    adapter.getModel().setSelectionPath
-				(ra.getPath());
-			}
+			rg = (ReplicaGroup)obj;
+		    }
+		    else
+		    {
+			String replicaGroupId = 
+			    Utils.substitute(obj.toString(), adapter.getResolver());
+		  
+			rg = adapter.getApplication().
+			    findReplicaGroup(replicaGroupId);
+		    }
+
+		    //
+		    // The button is enabled therefore rg should be != null
+		    //
+		    if(rg != null)
+		    {
+			adapter.getModel().setSelectionPath(rg.getPath());
 		    }
 		}
 	    };
-	gotoReplicatedAdapter.putValue(Action.SHORT_DESCRIPTION, 
-				       "Goto this replicated adapter");
-	_idButton = new JButton(gotoReplicatedAdapter);
+	gotoReplicaGroup.putValue(Action.SHORT_DESCRIPTION, 
+				       "Goto the definition of this replica group");
+	_replicaGroupButton = new JButton(gotoReplicaGroup);
 	
 	//
 	// _objectsButton
@@ -123,6 +132,10 @@ class AdapterEditor extends ListElementEditor
 	JTextField idTextField = (JTextField)
 	    _id.getEditor().getEditorComponent();
 	idTextField.getDocument().addDocumentListener(_updateListener);	
+
+	JTextField replicaGroupIdTextField = (JTextField)
+	    _replicaGroupId.getEditor().getEditorComponent();
+	replicaGroupIdTextField.getDocument().addDocumentListener(_updateListener);	
     }
     
    
@@ -135,7 +148,9 @@ class AdapterEditor extends ListElementEditor
 	AdapterDescriptor descriptor = 
 	    (AdapterDescriptor)getAdapter().getDescriptor();
 	descriptor.name = _name.getText();
+	descriptor.description = _description.getText();
 	descriptor.id = getIdAsString();
+	descriptor.replicaGroupId = getReplicaGroupIdAsString();
 	descriptor.registerProcess = _registerProcess.isSelected();
 	descriptor.waitForActivation = _waitForActivation.isSelected();
 	descriptor.objects = mapToObjectDescriptorSeq(_objectsMap);
@@ -145,19 +160,39 @@ class AdapterEditor extends ListElementEditor
     {
 	AdapterDescriptor descriptor = 
 	    (AdapterDescriptor)getAdapter().getDescriptor();
-	return descriptor.name.equals(_name.getText()); 
+
+	//
+	// When id change, we need to re-register for updates
+	//
+	return descriptor.name.equals(_name.getText()) 
+	    && descriptor.id.equals(getIdAsString());
     }
 
     void append(DefaultFormBuilder builder)
     {
-	builder.append("Name" );
+	builder.append("Adapter Name" );
 	builder.append(_name, 3);
 	builder.nextLine();
 	
-	builder.append("Id", _id );
-	builder.append(_idButton);
+	builder.append("Description");
+	builder.nextLine();
+	builder.append("");
+	builder.nextRow(-2);
+	CellConstraints cc = new CellConstraints();
+	JScrollPane scrollPane = new JScrollPane(_description);
+	builder.add(scrollPane, 
+		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
+	builder.nextRow(2);
+	builder.nextLine();
+
+	builder.append("Adapter ID");
+	builder.append(_id, 3);
 	builder.nextLine();
 	
+	builder.append("Replica Group", _replicaGroupId);
+	builder.append(_replicaGroupButton);
+	builder.nextLine();
+
 	builder.append("Endpoints" );
 	builder.append(_endpoints, 3);
 	builder.nextLine();
@@ -207,44 +242,68 @@ class AdapterEditor extends ListElementEditor
 	_objects.setToolTipText(toolTipHolder.value);
     }
     
-    void setId(String adapterId)
+    void setId(String id)
     {
-	ReplicatedAdapters replicatedAdapters =
-	    getAdapter().getApplication().getReplicatedAdapters();
-	
-	ReplicatedAdapter replicatedAdapter = 
-	    (ReplicatedAdapter)replicatedAdapters.findChild(adapterId);
-	
-	if(replicatedAdapter != null)
+	if(id.equals(""))
 	{
-	    _id.setSelectedItem(replicatedAdapter);
+	    _id.setSelectedItem(DIRECT_ADAPTER);
 	}
-	else
+	else 
 	{
-	    _id.setSelectedItem(adapterId);
+	    _id.setSelectedItem(id);
 	}
     }
-    
-    String getIdAsString()
+
+    void setReplicaGroupId(String replicaGroupId)
     {
-	Object obj = _id.getSelectedItem();
-	if(obj == null)
+	if(replicaGroupId.equals(""))
 	{
-	    return "";
+	    _replicaGroupId.setSelectedItem(NOT_REPLICATED);
 	}
 	else
 	{
-	    if(obj instanceof ReplicatedAdapter)
+	    ReplicaGroups replicaGroups =
+		getAdapter().getApplication().getReplicaGroups();
+	    
+	    ReplicaGroup replicaGroup = 
+		(ReplicaGroup)replicaGroups.findChild(replicaGroupId);
+	    
+	    if(replicaGroup != null)
 	    {
-		ReplicatedAdapter ra = (ReplicatedAdapter)obj;
-		return ra.getId();
+		_replicaGroupId.setSelectedItem(replicaGroup);
 	    }
 	    else
 	    {
-		return (String)obj;
+		_replicaGroupId.setSelectedItem(replicaGroupId);
 	    }
 	}
     }
+    
+    String getIdAsString()
+    {
+	Object obj = _id.getSelectedItem();
+	if(obj == DIRECT_ADAPTER)
+	{
+	    return "";
+	}
+	else
+	{
+	    return obj.toString();
+	}
+    }
+
+    String getReplicaGroupIdAsString()
+    {
+	Object obj = _replicaGroupId.getSelectedItem();
+	if(obj == NOT_REPLICATED)
+	{
+	    return "";
+	}
+	else
+	{
+	    return obj.toString();
+	}
+    }
 
     void show(Adapter adapter)
     {
@@ -253,35 +312,70 @@ class AdapterEditor extends ListElementEditor
 
 	AdapterDescriptor descriptor = (AdapterDescriptor)adapter.getDescriptor();
 	
-	Utils.Resolver resolver = null;
-	if(adapter.getModel().substitute())
-	{
-	    resolver = adapter.getResolver();
-	}
-	
+	final Utils.Resolver resolver = adapter.getModel().substitute() ?  
+	    adapter.getResolver() : null;
+
 	boolean isEditable = adapter.isEditable() && resolver == null;
 	boolean inIceBox = adapter.inIceBox();
 	
 	_name.setText(
 	    Utils.substitute(descriptor.name, resolver));
 	_name.setEditable(isEditable && !inIceBox);
+
+	_description.setText(
+	    Utils.substitute(descriptor.description, resolver));
+	_description.setEditable(isEditable);
 	
 	//
 	// Need to make control editable & enabled before changing it
 	//
 	_id.setEnabled(true);
-	_id.setEditable(true);
-	
-	ReplicatedAdapters replicatedAdapters =
-	    adapter.getApplication().getReplicatedAdapters();
-	_id.setModel(replicatedAdapters.createComboBoxModel());
-	
-	String adapterId = Utils.substitute(descriptor.id, resolver);
-	setId(adapterId);
-	
+	_id.setEditable(true);	
+	String defaultAdapterId = adapter.getDefaultAdapterId();
+	if(descriptor.id == null)
+	{
+	    descriptor.id = defaultAdapterId;
+	}
+	_id.setModel(new DefaultComboBoxModel(new Object[]
+	    {DIRECT_ADAPTER, defaultAdapterId}));
+
+	setId(Utils.substitute(descriptor.id, resolver));
 	_id.setEnabled(isEditable);
 	_id.setEditable(isEditable);
+
+	_replicaGroupId.setEnabled(true);
+	_replicaGroupId.setEditable(true);	
 	
+	final ReplicaGroups replicaGroups =
+	    adapter.getApplication().getReplicaGroups();
+	_replicaGroupId.setModel(replicaGroups.createComboBoxModel(NOT_REPLICATED));
+
+	_replicaGroupId.addItemListener(new ItemListener()
+	    {
+		public void itemStateChanged(ItemEvent e)
+		{
+		    if(e.getStateChange() == ItemEvent.SELECTED)
+		    {
+			Object item = e.getItem();
+			boolean enabled = (item instanceof ReplicaGroup);
+			if(!enabled && item != NOT_REPLICATED)
+			{
+			    if(resolver != null)
+			    {
+				String replicaGroupId = 
+				    resolver.substitute(item.toString());
+				enabled = (replicaGroups.findChild(replicaGroupId) != null);
+			    }
+			}
+			_replicaGroupButton.setEnabled(enabled);
+		    }
+		}
+	    });
+
+	setReplicaGroupId(Utils.substitute(descriptor.replicaGroupId, resolver));
+	_replicaGroupId.setEnabled(isEditable);
+	_replicaGroupId.setEditable(isEditable);
+
 	_endpoints.setText(
 	    Utils.substitute(adapter.getEndpoints(), resolver));
 	_endpoints.setEditable(isEditable);
@@ -337,7 +431,12 @@ class AdapterEditor extends ListElementEditor
     }
     
     private JTextField _name = new JTextField(20);
+    private JTextArea _description = new JTextArea(3, 20);
+
     private JComboBox _id = new JComboBox();
+    private JComboBox _replicaGroupId = new JComboBox();
+    private JButton _replicaGroupButton;
+
     private JTextField _endpoints = new JTextField(20);
     private JCheckBox _registerProcess;
     private JCheckBox _waitForActivation;
@@ -346,6 +445,20 @@ class AdapterEditor extends ListElementEditor
     private java.util.Map _objectsMap;
     private TableDialog _objectsDialog;
     private JButton _objectsButton;
-    
-    private JButton _idButton;
+
+    static private final Object DIRECT_ADAPTER = new Object()
+	{
+	    public String toString()
+	    {
+		return "No ID (a direct adapter)";
+	    }
+	};
+
+    static private final Object NOT_REPLICATED = new Object()
+	{
+	    public String toString()
+	    {
+		return "Does not belong to a replica group";
+	    }
+	};
 }
diff --git a/java/src/IceGrid/TreeNode/AdapterInstanceId.java b/java/src/IceGrid/TreeNode/AdapterInstanceId.java
deleted file mode 100755
index 53d0498dbfc..00000000000
--- a/java/src/IceGrid/TreeNode/AdapterInstanceId.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-package IceGrid.TreeNode;

-

-class AdapterInstanceId

-{

-    AdapterInstanceId(String serverId, String adapterId)

-    {

-	this.serverId = serverId;

-	this.adapterId = adapterId;

-    }

-    

-    public boolean equals(Object obj)

-    {

-	try

-	{

-	    AdapterInstanceId other = (AdapterInstanceId)obj;

-	    return serverId.equals(other.serverId) 

-		&& adapterId.equals(other.adapterId);

-	}

-	catch(ClassCastException e)

-	{

-	    return false;

-	}

-    }

-    

-    public int hashCode()

-    {

-	return serverId.hashCode() ^ adapterId.hashCode();

-    }

-    

-    String serverId;

-    String adapterId;

-};

diff --git a/java/src/IceGrid/TreeNode/Adapters.java b/java/src/IceGrid/TreeNode/Adapters.java
index 17d4d3f7737..1c4c16a1062 100755
--- a/java/src/IceGrid/TreeNode/Adapters.java
+++ b/java/src/IceGrid/TreeNode/Adapters.java
@@ -70,15 +70,11 @@ class Adapters extends ListParent
     public void newAdapter()
     {
 	String name = makeNewChildId("NewAdapter");
-	CommonBase parent = getParent();
-	String defaultId = (parent instanceof Service || 
-			    parent instanceof ServiceTemplate) ? 
-	    "${server}.${service}." + name : "${server}." + name;
-
 	AdapterDescriptor descriptor = new AdapterDescriptor(
 	    name,
-	    defaultId,
-	    "${server}",
+	    "",
+	    null,
+	    "",
 	    false,
 	    true,
 	    new java.util.LinkedList());   
diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index a56c29449e4..acf638e18ee 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -29,8 +29,8 @@ public class Application extends EditableParent
     {

 	ApplicationDescriptor copy = (ApplicationDescriptor)ad.clone();

 	

-	copy.replicatedAdapters = 

-	    ReplicatedAdapters.copyDescriptors(copy.replicatedAdapters);

+	copy.replicaGroups = 

+	    ReplicaGroups.copyDescriptors(copy.replicaGroups);

 	

 	copy.serverTemplates = 

 	    ServerTemplates.copyDescriptors(copy.serverTemplates);

@@ -134,8 +134,8 @@ public class Application extends EditableParent
 	//

 	// Replicated Adapters

 	//

-	update.removeReplicatedAdapters = _replicatedAdapters.removedElements();

-	update.replicatedAdapters = _replicatedAdapters.getUpdates();

+	update.removeReplicaGroups = _replicaGroups.removedElements();

+	update.replicaGroups = _replicaGroups.getUpdates();

 	

 	//

 	// Server Templates

@@ -261,9 +261,9 @@ public class Application extends EditableParent
 	_origDescription = _descriptor.description;

 

 

-	_replicatedAdapters = new ReplicatedAdapters(_descriptor.replicatedAdapters,

+	_replicaGroups = new ReplicaGroups(_descriptor.replicaGroups,

 						     _model);

-	addChild(_replicatedAdapters);

+	addChild(_replicaGroups);

 

 	_serviceTemplates = new ServiceTemplates(_descriptor.serviceTemplates,

 						 _model);	

@@ -337,14 +337,14 @@ public class Application extends EditableParent
 	//

 	// Replicated adapters

 	//

-	for(int i = 0; i < desc.removeReplicatedAdapters.length; ++i)

+	for(int i = 0; i < desc.removeReplicaGroups.length; ++i)

 	{

-	    _descriptor.replicatedAdapters.remove(desc.

-						  removeReplicatedAdapters[i]);

+	    _descriptor.replicaGroups.remove(desc.

+						  removeReplicaGroups[i]);

 	}

-	_descriptor.replicatedAdapters.addAll(desc.replicatedAdapters);

-	_replicatedAdapters.update(desc.replicatedAdapters, 

-				   desc.removeReplicatedAdapters);

+	_descriptor.replicaGroups.addAll(desc.replicaGroups);

+	_replicaGroups.update(desc.replicaGroups, 

+				   desc.removeReplicaGroups);

 

 

 	//

@@ -393,9 +393,9 @@ public class Application extends EditableParent
 	return (ServiceTemplate)_serviceTemplates.findChild(id);

     }

 

-    ReplicatedAdapter findReplicatedAdapter(String id)

+    ReplicaGroup findReplicaGroup(String id)

     {

-	return (ReplicatedAdapter)_replicatedAdapters.findChild(id);

+	return (ReplicaGroup)_replicaGroups.findChild(id);

     }

 

     Node findNode(String id)

@@ -438,9 +438,9 @@ public class Application extends EditableParent
 	return _serviceTemplates;

     }

 

-    ReplicatedAdapters getReplicatedAdapters()

+    ReplicaGroups getReplicaGroups()

     {

-	return _replicatedAdapters;

+	return _replicaGroups;

     }

 

     //

@@ -476,7 +476,7 @@ public class Application extends EditableParent
     //

     // Children

     //

-    private ReplicatedAdapters _replicatedAdapters;

+    private ReplicaGroups _replicaGroups;

     private ServerTemplates _serverTemplates;

     private ServiceTemplates _serviceTemplates;

     private Nodes _nodes;

diff --git a/java/src/IceGrid/TreeNode/DbEnvEditor.java b/java/src/IceGrid/TreeNode/DbEnvEditor.java
index 4cd1a65cb1d..df58f9b992f 100755
--- a/java/src/IceGrid/TreeNode/DbEnvEditor.java
+++ b/java/src/IceGrid/TreeNode/DbEnvEditor.java
@@ -15,9 +15,12 @@ import javax.swing.Action;
 import javax.swing.JButton;
 
 import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
 
 import IceGrid.DbEnvDescriptor;
 import IceGrid.Model;
@@ -30,6 +33,7 @@ class DbEnvEditor extends ListElementEditor
     DbEnvEditor(JFrame parentFrame)
     {
 	_name.getDocument().addDocumentListener(_updateListener);
+	_description.getDocument().addDocumentListener(_updateListener);
 	_dbHome.getDocument().addDocumentListener(_updateListener);
 
 	_properties.setEditable(false);
@@ -70,6 +74,7 @@ class DbEnvEditor extends ListElementEditor
 	DbEnvDescriptor descriptor = 
 	    (DbEnvDescriptor)getDbEnv().getDescriptor();
 	descriptor.name = _name.getText();
+	descriptor.description = _description.getText();
 	descriptor.dbHome = _dbHome.getText();
 	descriptor.properties = Editor.mapToProperties(_propertiesMap);
     }	    
@@ -86,6 +91,17 @@ class DbEnvEditor extends ListElementEditor
 	builder.append("Name" );
 	builder.append(_name, 3);
 	builder.nextLine();
+
+	builder.append("Description");
+	builder.nextLine();
+	builder.append("");
+	builder.nextRow(-2);
+	CellConstraints cc = new CellConstraints();
+	JScrollPane scrollPane = new JScrollPane(_description);
+	builder.add(scrollPane, 
+		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
+	builder.nextRow(2);
+	builder.nextLine();
 	
 	builder.append("DB Home" );
 	builder.append(_dbHome, 3);
@@ -114,6 +130,10 @@ class DbEnvEditor extends ListElementEditor
 	    Utils.substitute(descriptor.name, resolver));
 	_name.setEditable(isEditable);
 
+	_description.setText(
+	    Utils.substitute(descriptor.description, resolver));
+	_description.setEditable(isEditable);
+
 	_dbHome.setText(
 	    Utils.substitute(descriptor.dbHome, resolver));
 	_dbHome.setEditable(isEditable);
@@ -156,6 +176,9 @@ class DbEnvEditor extends ListElementEditor
     }
 
     private JTextField _name = new JTextField(20);
+    private JTextArea _description = new JTextArea(3, 20);
+
+
     private JTextField _dbHome = new JTextField(20);
 
     private JTextField _properties = new JTextField(20);
diff --git a/java/src/IceGrid/TreeNode/DbEnvs.java b/java/src/IceGrid/TreeNode/DbEnvs.java
index c68690ff85b..82372088392 100755
--- a/java/src/IceGrid/TreeNode/DbEnvs.java
+++ b/java/src/IceGrid/TreeNode/DbEnvs.java
@@ -70,6 +70,7 @@ class DbEnvs extends ListParent
 	DbEnvDescriptor descriptor = new DbEnvDescriptor(

 	    "NewDbEnv",

 	    "",

+	    "",

 	    new java.util.LinkedList());   

 	

 	newDbEnv(descriptor);

diff --git a/java/src/IceGrid/TreeNode/Parent.java b/java/src/IceGrid/TreeNode/Parent.java
index 4be2012b0e5..485b5f08b3b 100755
--- a/java/src/IceGrid/TreeNode/Parent.java
+++ b/java/src/IceGrid/TreeNode/Parent.java
@@ -28,12 +28,33 @@ class Parent extends CommonBaseI
     {

 	public Object getElementAt(int index)

 	{

-	    return getChildAt(index);

+	    if(_firstItem != null)

+	    {

+		if(index == 0)

+		{

+		    return _firstItem;

+		}

+		else

+		{

+		    return getChildAt(index - 1);

+		}

+	    }

+	    else

+	    {

+		return getChildAt(index);

+	    }

 	}

 

 	public int getSize()

 	{

-	    return getChildCount();

+	    if(_firstItem != null)

+	    {

+		return getChildCount() + 1;

+	    }

+	    else

+	    {

+		return getChildCount();

+	    }

 	}

 	

 	public Object getSelectedItem()

@@ -50,6 +71,17 @@ class Parent extends CommonBaseI
 	    }

 	}

 

+	ComboBoxModel(Object firstItem)

+	{

+	    _firstItem = firstItem;

+	}

+

+	ComboBoxModel()

+	{

+	    _firstItem = null;

+	}

+

+	private final Object _firstItem;

 	private Object _selectedItem;

     }

 

@@ -565,6 +597,11 @@ class Parent extends CommonBaseI
     {

 	return new ComboBoxModel();

     }

+    

+    javax.swing.ComboBoxModel createComboBoxModel(Object item)

+    {

+	return new ComboBoxModel(item);

+    }

 

     Parent(String id, Model model, boolean root)

     {

diff --git a/java/src/IceGrid/TreeNode/ReplicatedAdapter.java b/java/src/IceGrid/TreeNode/ReplicaGroup.java
index 271da592912..2c5432a17c3 100755
--- a/java/src/IceGrid/TreeNode/ReplicatedAdapter.java
+++ b/java/src/IceGrid/TreeNode/ReplicaGroup.java
@@ -8,20 +8,20 @@
 // **********************************************************************

 package IceGrid.TreeNode;

 

-import IceGrid.ReplicatedAdapterDescriptor;

+import IceGrid.ReplicaGroupDescriptor;

 import IceGrid.Model;

 import IceGrid.Utils;

 

-class ReplicatedAdapter extends EditableLeaf

+class ReplicaGroup extends EditableLeaf

 {

-    static public ReplicatedAdapterDescriptor 

-    copyDescriptor(ReplicatedAdapterDescriptor d)

+    static public ReplicaGroupDescriptor 

+    copyDescriptor(ReplicaGroupDescriptor d)

     {

-	return (ReplicatedAdapterDescriptor)d.clone();

+	return (ReplicaGroupDescriptor)d.clone();

     }

 

-    ReplicatedAdapter(boolean brandNew, 

-		      ReplicatedAdapterDescriptor descriptor,

+    ReplicaGroup(boolean brandNew, 

+		      ReplicaGroupDescriptor descriptor,

 		      Model model)

     {

 	//

@@ -33,7 +33,7 @@ class ReplicatedAdapter extends EditableLeaf
 	rebuild(descriptor);

     }

 

-    void rebuild(ReplicatedAdapterDescriptor descriptor)

+    void rebuild(ReplicaGroupDescriptor descriptor)

     {

 	_descriptor = descriptor;

 	//

@@ -46,5 +46,5 @@ class ReplicatedAdapter extends EditableLeaf
 	return _descriptor;

     }

 

-    private ReplicatedAdapterDescriptor _descriptor;

+    private ReplicaGroupDescriptor _descriptor;

 }

diff --git a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java b/java/src/IceGrid/TreeNode/ReplicaGroups.java
index 63daaa4dcd0..1ef6b629493 100755
--- a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
+++ b/java/src/IceGrid/TreeNode/ReplicaGroups.java
@@ -10,11 +10,11 @@ package IceGrid.TreeNode;
 

 import javax.swing.AbstractListModel;

 

-import IceGrid.ReplicatedAdapterDescriptor;

+import IceGrid.ReplicaGroupDescriptor;

 import IceGrid.Model;

 import IceGrid.Utils;

 

-class ReplicatedAdapters extends EditableParent

+class ReplicaGroups extends EditableParent

 {

     static public java.util.LinkedList

     copyDescriptors(java.util.List descriptors)

@@ -23,25 +23,25 @@ class ReplicatedAdapters extends EditableParent
 	java.util.Iterator p = descriptors.iterator();

 	while(p.hasNext())

 	{

-	    copy.add(ReplicatedAdapter.copyDescriptor(

-			 (ReplicatedAdapterDescriptor)p.next()));

+	    copy.add(ReplicaGroup.copyDescriptor(

+			 (ReplicaGroupDescriptor)p.next()));

 	}

 	return copy;

     }

 

-    ReplicatedAdapters(java.util.List descriptors, Model model)

+    ReplicaGroups(java.util.List descriptors, Model model)

 	throws UpdateFailedException

     {

-	super(false, "Replicated Adapters", model);

+	super(false, "Replica Groups", model);

 	_descriptors = descriptors;

 

 	java.util.Iterator p = _descriptors.iterator();

 	while(p.hasNext())

 	{

-	    ReplicatedAdapterDescriptor descriptor 

-		= (ReplicatedAdapterDescriptor)p.next();

+	    ReplicaGroupDescriptor descriptor 

+		= (ReplicaGroupDescriptor)p.next();

 	    

-	    addChild(new ReplicatedAdapter(false, descriptor, _model));

+	    addChild(new ReplicaGroup(false, descriptor, _model));

 	}

     }

 

@@ -51,7 +51,7 @@ class ReplicatedAdapters extends EditableParent
 	java.util.Iterator p = _children.iterator();

 	while(p.hasNext())

 	{

-	    ReplicatedAdapter ra = (ReplicatedAdapter)p.next();

+	    ReplicaGroup ra = (ReplicaGroup)p.next();

 	    if(ra.isNew() || ra.isModified())

 	    {

 		updates.add(ra.getDescriptor());

@@ -79,14 +79,14 @@ class ReplicatedAdapters extends EditableParent
 	java.util.Iterator p = descriptors.iterator();

 	while(p.hasNext())

 	{

-	    ReplicatedAdapterDescriptor descriptor =

-		(ReplicatedAdapterDescriptor)p.next();

+	    ReplicaGroupDescriptor descriptor =

+		(ReplicaGroupDescriptor)p.next();

 	    

-	    ReplicatedAdapter child 

-		= (ReplicatedAdapter)findChild(descriptor.id);

+	    ReplicaGroup child 

+		= (ReplicaGroup)findChild(descriptor.id);

 	    if(child == null)

 	    {

-		newChildren.add(new ReplicatedAdapter(false, descriptor,

+		newChildren.add(new ReplicaGroup(false, descriptor,

 						      _model));

 	    }

 	    else

diff --git a/java/src/IceGrid/TreeNode/Root.java b/java/src/IceGrid/TreeNode/Root.java
index ac42556b5db..5776d33e2ef 100755
--- a/java/src/IceGrid/TreeNode/Root.java
+++ b/java/src/IceGrid/TreeNode/Root.java
@@ -30,7 +30,7 @@ public class Root extends Parent
 	java.util.Map serverInfoMap = new java.util.HashMap();

 

 	//

-	// AdapterInstanceId to Ice.ObjectPrx

+	// AdapterId to Ice.ObjectPrx

 	//

 	java.util.Map adapterInfoMap = new java.util.HashMap();

     };

@@ -159,9 +159,7 @@ public class Root extends Parent
 	for(int i = 0; i < updatedInfo.adapters.length; ++i)

 	{

 	    assert(updatedInfo.adapters[i].proxy != null);

-	    AdapterInstanceId instanceId = new AdapterInstanceId(

-		updatedInfo.adapters[i].serverId, updatedInfo.adapters[i].id);

-	    info.adapterInfoMap.put(instanceId, updatedInfo.adapters[i].proxy);

+	    info.adapterInfoMap.put(updatedInfo.adapters[i].id, updatedInfo.adapters[i].proxy);

 	}

 

 	//

@@ -198,7 +196,7 @@ public class Root extends Parent
 	    {

 		Adapter adapter = (Adapter)p.next();

 		Ice.ObjectPrx proxy = 

-		    (Ice.ObjectPrx)info.adapterInfoMap.get(adapter.getInstanceId());

+		    (Ice.ObjectPrx)info.adapterInfoMap.get(adapter.getAdapterId());

 		if(proxy != null)

 		{

 		    adapter.updateProxy(proxy);

@@ -329,15 +327,15 @@ public class Root extends Parent
 

 

     

-    Ice.ObjectPrx registerAdapter(String nodeName, AdapterInstanceId instanceId,

+    Ice.ObjectPrx registerAdapter(String nodeName, String adapterId,

 				  Adapter adapter)

     {

-	java.util.List adapterList = (java.util.List)_adapterMap.get(instanceId);

+	java.util.List adapterList = (java.util.List)_adapterMap.get(adapterId);

 

 	if(adapterList == null)

 	{

 	    adapterList = new java.util.LinkedList();

-	    _adapterMap.put(instanceId, adapterList);

+	    _adapterMap.put(adapterId, adapterList);

 	}

 	adapterList.add(adapter);

 

@@ -357,16 +355,16 @@ public class Root extends Parent
 	}

 	else

 	{

-	    return (Ice.ObjectPrx)info.adapterInfoMap.get(instanceId);

+	    return (Ice.ObjectPrx)info.adapterInfoMap.get(adapterId);

 	}

     }

     

     void unregisterAdapter(String nodeName, 

-			   AdapterInstanceId instanceId, 

+			   String adapterId, 

 			   Adapter adapter)

     {

 	java.util.List adapterList = (java.util.List)_adapterMap.

-	    get(instanceId);

+	    get(adapterId);

 	adapterList.remove(adapter);

 

 	adapterList = (java.util.List)_nodeAdapterMap.get(nodeName);

@@ -381,15 +379,12 @@ public class Root extends Parent
 	//

 	DynamicInfo info = (DynamicInfo)_dynamicInfoMap.get(nodeName);

 	assert info != null;

-	AdapterInstanceId instanceId 

-	    = new AdapterInstanceId(updatedInfo.serverId, 

-				    updatedInfo.id);

-	info.adapterInfoMap.put(instanceId, updatedInfo.proxy);

+	info.adapterInfoMap.put(updatedInfo.id, updatedInfo.proxy);

 	

 	//

 	// Is this Adapter registered?

 	//

-	Adapter adapter = (Adapter)_adapterMap.get(instanceId);

+	Adapter adapter = (Adapter)_adapterMap.get(updatedInfo.id);

 	if(adapter != null)

 	{

 	    adapter.updateProxy(updatedInfo.proxy);

@@ -447,10 +442,10 @@ public class Root extends Parent
     private java.util.Map _dynamicInfoMap = new java.util.HashMap();

 

     //

-    // AdapterInstanceId to list of Adapters

-    // The registry enforeces a single adapter per adapterInstanceId;

+    // AdapterId to list of Adapters

+    // The registry enforces a single adapter per adapterId;

     // however in order to support copy & paste, we can have temporarily

-    // an inconsistency: several adapters with the same instance id.

+    // an inconsistency: several adapters with the same xid.

     //

     private java.util.Map _adapterMap = new java.util.HashMap();

 

diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index 79f0ca35e13..a9e07721b4b 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -110,6 +110,7 @@ class Server extends EditableParent
     {

 	AdapterDescriptor serviceManager = new AdapterDescriptor(

 	    "IceBox.ServiceManager",

+	    "", 

 	    "", // direct-adapter by default

 	    "",

 	    true,