Cleanup + application destruction

18 files changed, 109 insertions, 605 deletions

diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java
index 61e88ddaff5..5bc69fe3aae 100755
--- a/java/src/IceGrid/Model.java
+++ b/java/src/IceGrid/Model.java
@@ -488,6 +488,40 @@ public class Model
 

     }

 

+    

+    public boolean removeApplication(String applicationName)

+    {

+	assert _writeSerial == _latestSerial;

+	_mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));

+

+	try

+	{

+	    _sessionKeeper.getSession().removeApplication(applicationName);

+	    return true;

+	}

+	catch(AccessDeniedException e)

+	{

+	    // Very unlikely

+	    accessDenied(e);

+	    return false;

+	}

+	catch(ApplicationNotExistException e)

+	{

+	    // Most likely an IceGrid bug, so no need to optimize!

+	    //

+	    JOptionPane.showMessageDialog(

+		_mainFrame,

+		"Can't remove Application '" + e.name + "': it does not exist!",

+		"Application does not exist",

+		JOptionPane.ERROR_MESSAGE);

+	    return true;

+	}

+	finally

+	{

+	    _mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

+	}

+    }

+

     private boolean saveUpdates()

     {

 	assert _writeSerial == _latestSerial;

@@ -536,7 +570,7 @@ public class Model
 		    //

 		    JOptionPane.showMessageDialog(

 			_mainFrame,

-			"Can't update Application " + e.name + ": it does not exist!",

+			"Can't update Application '" + e.name + "': it does not exist!",

 			"Application does not exist",

 			JOptionPane.ERROR_MESSAGE);

 		    return false;

@@ -545,7 +579,7 @@ public class Model
 		{

 		    JOptionPane.showMessageDialog(

 			_mainFrame,

-			"Application " + application.getId() + ": "+ e.reason,

+			"Application '" + application.getId() + "': "+ e.reason,

 			"Deployment Exception",

 			JOptionPane.ERROR_MESSAGE);

 		    return false;

diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index b6b74102d19..a56c29449e4 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -218,16 +218,31 @@ public class Application extends EditableParent
 	}

 	Root root = (Root)_parent;

 	

-	if(_ephemeral)

+	if(_ephemeral || isNew())

 	{

 	    root.removeChild(this, true);

 	    return true;

 	}

 	else if(_model.canUpdate())

 	{

+	    int confirm = JOptionPane.showConfirmDialog(

+		_model.getMainFrame(),

+		"This will immediately remove this application from "

+		+ "the IceGrid Registry. Do you want to proceed?", 

+		"Remove Confirmation",

+		JOptionPane.YES_NO_OPTION);

+

 	    //

-	    // TODO: must save immediately!

+	    // Asks for confirmation

 	    //

+	    if(confirm == JOptionPane.YES_OPTION)

+	    {

+		if(_model.removeApplication(_id))

+		{

+		    root.removeChild(this, true);

+		    return true;

+		}

+	    }

 	}

 	return false;

     }

@@ -269,90 +284,6 @@ public class Application extends EditableParent
 	_descriptor = descriptor;

     }

 

-

-

-    Application(Application o)

-    {

-	super(o);

-	

-	_ephemeral = false;

-	//

-	// We don't deep-copy _descriptor because it's difficult :)

-	// So we'll have to be carefull to properly recover the "old" descriptor.

-	//

-	_descriptor = o._descriptor;

-	_origVariables = o._origVariables;

-	_origDescription = o._origDescription;

-	

-	try

-	{

-	    _replicatedAdapters = new ReplicatedAdapters(o._replicatedAdapters);

-	    addChild(_replicatedAdapters);

-	    

-	    _serviceTemplates = new ServiceTemplates(o._serviceTemplates);

-	    addChild(_serviceTemplates);

-	    

-	    _serverTemplates = new ServerTemplates(o._serverTemplates);

-	    addChild(_serverTemplates);

-	    

-	    _nodes = new Nodes(o._nodes);

-	    addChild(_nodes);

-	}

-	catch(UpdateFailedException e)

-	{

-	    assert false; // impossible

-	}

-    }

-

-    //

-    // Try to apply a major update (the caller must change the descriptor,

-    // and restore it if the applyUpdate is unsuccessful

-    //

-    boolean applyUpdate()

-    {

-	Application copy = new Application(this);

-	

-	try

-	{

-	    update();

-	}

-	catch(UpdateFailedException e)

-	{

-	    JOptionPane.showMessageDialog(

-		_model.getMainFrame(),

-		e.toString(),

-		"Duplicate id error",

-		JOptionPane.ERROR_MESSAGE);

-	    

-	    _model.getRoot().restore(copy);

-	    return false;

-	}

-	return true;

-    }

-

-    //

-    // Major update than can't fail

-    //

-    void applySafeUpdate()

-    {

-	try

-	{

-	    update();

-	}

-	catch(UpdateFailedException e)

-	{

-	    assert false;

-	}

-    }

-

-    void update() throws UpdateFailedException

-    {

-	_replicatedAdapters.update();

-	_serviceTemplates.update();

-	_serverTemplates.update();

-	_nodes.update();

-    }

-

     //

     // Try to rebuild this application;

     // no-op if it fails!

diff --git a/java/src/IceGrid/TreeNode/CommonBaseI.java b/java/src/IceGrid/TreeNode/CommonBaseI.java
index 07c24dcf767..19ad6087228 100755
--- a/java/src/IceGrid/TreeNode/CommonBaseI.java
+++ b/java/src/IceGrid/TreeNode/CommonBaseI.java
@@ -230,7 +230,14 @@ abstract class CommonBaseI implements CommonBase
 	TreePath parentPath = getParent().getPath();

 	if(destroy())

 	{

-	    _model.setSelectionPath(parentPath);

+	    if(parentPath.getPathCount() > 1)

+	    {

+		_model.setSelectionPath(parentPath);

+	    }

+	    else

+	    {

+		// TODO: show splash

+	    }

 	}

     }

     public void substituteVars()

@@ -365,18 +372,6 @@ abstract class CommonBaseI implements CommonBase
 	}

     }

 

-    protected CommonBaseI(CommonBaseI o)

-    {

-	//

-	// Not attached to any tree yet

-	//

-	_path = null;

-	_parent = null;

-

-	_id = o._id;

-	_model = o._model;

-    }

-

     public Application getApplication()

     {

 	if(_path == null || _path.getPathCount() < 2)

diff --git a/java/src/IceGrid/TreeNode/EditableLeaf.java b/java/src/IceGrid/TreeNode/EditableLeaf.java
index 013fb6f9ec4..f0b0498dcc4 100755
--- a/java/src/IceGrid/TreeNode/EditableLeaf.java
+++ b/java/src/IceGrid/TreeNode/EditableLeaf.java
@@ -43,14 +43,6 @@ class EditableLeaf extends Leaf implements Editable
 	_isNew = brandNew;

     }

 

-    protected EditableLeaf(EditableLeaf o)

-    {

-	super(o);

-	_modified = o._modified;

-	_isNew = o._isNew;

-    }

-

-

     private boolean _isNew;

     private boolean _modified;

 }

diff --git a/java/src/IceGrid/TreeNode/EditableParent.java b/java/src/IceGrid/TreeNode/EditableParent.java
index 27507ff9294..60362fe8fa4 100755
--- a/java/src/IceGrid/TreeNode/EditableParent.java
+++ b/java/src/IceGrid/TreeNode/EditableParent.java
@@ -53,6 +53,11 @@ class EditableParent extends Parent implements Editable
 	    }

 	}

     }

+ 

+    public void markNew()

+    {

+	_isNew = true;

+    }

 

     void removeElement(CommonBase child, boolean fireEvent)

     {

@@ -65,27 +70,6 @@ class EditableParent extends Parent implements Editable
 	_removedElements.add(id);

     }

     

-    void purgeChildren(java.util.Set keepSet)

-    {

-	java.util.List toRemove = new java.util.LinkedList();

-

-	java.util.Iterator p = _children.iterator();

-	while(p.hasNext())

-	{

-	    CommonBase child = (CommonBase)p.next();

-	    if(!keepSet.contains(child.getId()))

-	    {

-		_removedElements.add(child.getId());

-		toRemove.add(child.getId());

-	    }

-	}

-

-	if(toRemove.size() > 0)

-	{

-	    removeChildren((String[])toRemove.toArray(new String[0]));

-	}

-    }

-

     String[] removedElements()

     {

 	return (String[])_removedElements.toArray(new String[0]);

@@ -102,28 +86,7 @@ class EditableParent extends Parent implements Editable
 	this(brandNew, id, model, false);

     }

 

-    protected EditableParent(EditableParent o, boolean copyChildren)

-    {

-	super(o, copyChildren);

-	_modified = o._modified;

-	_isNew = o._isNew;

-	_removedElements = (java.util.TreeSet)o._removedElements.clone();

-    }

-

-    protected EditableParent(EditableParent o)

-    {

-	this(o, false);

-    }

-

-    void clearNew()

-    {

-	_isNew = false;

-    }

-    

-    void markNew()

-    {

-	_isNew = true;

-    }

+  

 

     private boolean _isNew = false;

     private boolean _modified = false;

diff --git a/java/src/IceGrid/TreeNode/Leaf.java b/java/src/IceGrid/TreeNode/Leaf.java
index 4d03df9e152..0887c6500d8 100755
--- a/java/src/IceGrid/TreeNode/Leaf.java
+++ b/java/src/IceGrid/TreeNode/Leaf.java
@@ -66,9 +66,4 @@ class Leaf extends CommonBaseI
     {

 	super(id, model, false);

     }

-

-    protected Leaf(Leaf o)

-    {

-	super(o);

-    }

 }

diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java
index 21000f49e08..5be88e1afae 100755
--- a/java/src/IceGrid/TreeNode/Node.java
+++ b/java/src/IceGrid/TreeNode/Node.java
@@ -310,11 +310,27 @@ class Node extends EditableParent implements InstanceParent
 		instanceDescriptor.parameterValues = Editor.makeParameterValues(

 		    instanceDescriptor.parameterValues, templateDescriptor.parameters);

 	    }

-	    newServer = createServer(true, instanceDescriptor, getApplication());

+	    try

+	    {

+		newServer = createServer(false, instanceDescriptor, getApplication());

+	    }

+	    catch(UpdateFailedException e)

+	    {

+		e.addParent(this);

+		throw e;

+	    }

 	}

 	else

 	{

-	    newServer = createServer(true, server.getServerDescriptor(), getApplication()); 

+	    try

+	    {

+		newServer = createServer(false, server.getServerDescriptor(), getApplication());

+	    }

+	    catch(UpdateFailedException e)

+	    {

+		e.addParent(this);

+		throw e;

+	    }

 	}

 

 	if(server.getId().equals(newServer.getId()))

@@ -323,7 +339,6 @@ class Node extends EditableParent implements InstanceParent
 	    // A simple update. We can't simply rebuild server because 

 	    // we need to keep a backup

 	    //

-	    newServer.clearNew();

 	    if(server.isModified())

 	    {

 		newServer.markModified();

@@ -347,6 +362,7 @@ class Node extends EditableParent implements InstanceParent
 	}

 	else

 	{

+	    newServer.markNew();

 	    backup.removedElements = (java.util.TreeSet)_removedElements.clone();

 	    removeElement(server, true);

 	    try

@@ -355,6 +371,7 @@ class Node extends EditableParent implements InstanceParent
 	    }

 	    catch(UpdateFailedException e)

 	    {

+		e.addParent(this);

 		restoreChild(server, backup);

 		throw e;

 	    }

@@ -819,144 +836,6 @@ class Node extends EditableParent implements InstanceParent
 	_descriptor = descriptor;

     }

 

-    Node(Node o)

-    {

-	super(o);

-	_inRegistry = o._inRegistry;

-	_ephemeral = false;

-	assert o._ephemeral == false;

-

-	_descriptor = o._descriptor;

-	_resolver = o._resolver;

-	_origVariables = o._origVariables;

-	_up = o._up;

-

-	//

-	// Deep-copy children

-	//

-	java.util.Iterator p = o._children.iterator();

-	while(p.hasNext())

-	{

-	    Server server = (Server)p.next();

-	    try

-	    {

-		addChild(new Server(server));

-	    }

-	    catch(UpdateFailedException e)

-	    {

-		assert false; // impossible

-	    }

-	}

-    }

-    

-    void update() throws UpdateFailedException

-    {

-	Application application = getApplication();

-

-	_resolver = new Utils.Resolver(new java.util.Map[]

-	    {_descriptor.variables, application.getVariables()});

-				       

-	_resolver.put("application", application.getId());

-	_resolver.put("node", getId());

-	

-	//

-	// Existing servers not in this list will be removed

-	//

-	java.util.Set serverIdSet = new java.util.HashSet();

-

-	//

-	// Template instances

-	//

-	java.util.Iterator p = _descriptor.serverInstances.iterator();

-	while(p.hasNext())

-	{

-	    ServerInstanceDescriptor instanceDescriptor = 

-		(ServerInstanceDescriptor)p.next();

-	    

-	    //

-	    // Find template

-	    //

-	    TemplateDescriptor templateDescriptor = 

-		application.findServerTemplateDescriptor(instanceDescriptor.template);

-

-	    assert templateDescriptor != null;

-

-	    ServerDescriptor serverDescriptor = 

-		(ServerDescriptor)templateDescriptor.descriptor;

-	    

-	    assert serverDescriptor != null;

-	    

-	    //

-	    // Build resolver

-	    //

-	    Utils.Resolver instanceResolver = 

-		new Utils.Resolver(_resolver, 

-				   instanceDescriptor.parameterValues,

-				   templateDescriptor.parameterDefaults);

-	    

-	    String serverId = instanceResolver.substitute(serverDescriptor.id);

-	    instanceResolver.put("server", serverId);

-	    serverIdSet.add(serverId);

-	    

-	    //

-	    // Lookup server

-	    //

-	    Server server = (Server)findChild(serverId);

-	    if(server != null)

-	    {

-		server.rebuild(instanceResolver, instanceDescriptor, 

-			       serverDescriptor, application);

-	    }

-	    else

-	    {

-		//

-		// Create server

-		//

-		server = new Server(true, serverId, instanceResolver, instanceDescriptor, 

-				    serverDescriptor, application);

-		addChild(server, true);

-	    }

-	}

-

-	//

-	// Plain servers

-	//

-	p = _descriptor.servers.iterator();

-	while(p.hasNext())

-	{

-	    ServerDescriptor serverDescriptor = (ServerDescriptor)p.next();

-

-	    //

-	    // Build resolver

-	    //

-	    Utils.Resolver instanceResolver = new Utils.Resolver(_resolver);

-	    String serverId = instanceResolver.substitute(serverDescriptor.id);

-	    instanceResolver.put("server", serverId);

-	    serverIdSet.add(serverId);

-

-	    //

-	    // Lookup server

-	    //

-	    Server server = (Server)findChild(serverId);

-	    if(server != null)

-	    {

-		server.rebuild(instanceResolver, null, serverDescriptor, application);

-	    }

-	    else

-	    {

-		//

-		// Create server

-		//

-		server = new Server(true, serverId, instanceResolver, null, serverDescriptor, 

-				    application);

-		addChild(server);

-	    }

-	}

-

-	purgeChildren(serverIdSet);

-    }

-

-

     void removeInstanceDescriptor(ServerInstanceDescriptor d)

     {

 	//

diff --git a/java/src/IceGrid/TreeNode/Nodes.java b/java/src/IceGrid/TreeNode/Nodes.java
index fb1f4b73a5e..ca390eaab2a 100755
--- a/java/src/IceGrid/TreeNode/Nodes.java
+++ b/java/src/IceGrid/TreeNode/Nodes.java
@@ -113,28 +113,6 @@ public class Nodes extends EditableParent
 	}

     }

 

-    Nodes(Nodes o)

-    {

-	super(o);

-	_descriptors = o._descriptors;

-

-	//

-	// Deep-copy children

-	//

-	java.util.Iterator p = o._children.iterator();

-	while(p.hasNext())

-	{

-	    try

-	    {

-		addChild(new Node((Node)p.next()));

-	    }

-	    catch(UpdateFailedException e)

-	    {

-		assert false;

-	    }

-	}

-    }

-

     //

     // Try to rebuild all my children

     // No-op if it fails

@@ -189,25 +167,6 @@ public class Nodes extends EditableParent
 	return updates;

     }

 

-    void update() throws UpdateFailedException

-    {

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

-	while(p.hasNext())

-	{

-	    java.util.Map.Entry entry = (java.util.Map.Entry)p.next();

-	    String nodeName = (String)entry.getKey();

-	    NodeDescriptor nodeDescriptor = (NodeDescriptor)entry.getValue();

-

-	    Node node = findNode(nodeName);

-	    if(node != null)

-	    {

-		node.update();

-	    }

-	}

-	purgeChildren(_descriptors.keySet());

-	fireStructureChangedEvent(this);

-    }

-   

     void removeServerInstances(String templateId)

     {

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

diff --git a/java/src/IceGrid/TreeNode/Parent.java b/java/src/IceGrid/TreeNode/Parent.java
index 34d7e901a89..7d411b8e9b4 100755
--- a/java/src/IceGrid/TreeNode/Parent.java
+++ b/java/src/IceGrid/TreeNode/Parent.java
@@ -576,21 +576,6 @@ class Parent extends CommonBaseI
 	this(id, model, false);

     }

     

-    protected Parent(Parent o)

-    {

-	this(o, false);

-	// Derived class is responsible to populate the children

-    }

-

-    protected Parent(Parent o, boolean copyChildren)

-    {

-	super(o);

-	if(copyChildren)

-	{

-	    _children = (java.util.LinkedList)o._children.clone();

-	}

-    }

-    

     protected void sortChildren(boolean val)

     {

 	_sortChildren = val;

diff --git a/java/src/IceGrid/TreeNode/ReplicatedAdapter.java b/java/src/IceGrid/TreeNode/ReplicatedAdapter.java
index 946c779747d..271da592912 100755
--- a/java/src/IceGrid/TreeNode/ReplicatedAdapter.java
+++ b/java/src/IceGrid/TreeNode/ReplicatedAdapter.java
@@ -33,12 +33,6 @@ class ReplicatedAdapter extends EditableLeaf
 	rebuild(descriptor);

     }

 

-    ReplicatedAdapter(ReplicatedAdapter o)

-    {

-	super(o);

-	_descriptor = o._descriptor;

-    }

-

     void rebuild(ReplicatedAdapterDescriptor descriptor)

     {

 	_descriptor = descriptor;

diff --git a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java b/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
index ec69f4d9ef8..63daaa4dcd0 100755
--- a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
+++ b/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
@@ -45,19 +45,6 @@ class ReplicatedAdapters extends EditableParent
 	}

     }

 

-    ReplicatedAdapters(ReplicatedAdapters o)

-	throws UpdateFailedException

-    {

-	super(o);

-	_descriptors = o._descriptors;

-	java.util.Iterator p = o._children.iterator();

-	while(p.hasNext())

-	{

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

-	    addChild(new ReplicatedAdapter(ra));

-	}

-    }

-

     java.util.LinkedList getUpdates()

     {

 	java.util.LinkedList updates = new java.util.LinkedList();

@@ -73,27 +60,6 @@ class ReplicatedAdapters extends EditableParent
 	return updates;

     }

 

-

-    void update() throws UpdateFailedException

-    {

-	java.util.Set keepSet = new java.util.HashSet();

-

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

-	while(p.hasNext())

-	{

-	    ReplicatedAdapterDescriptor descriptor 

-		= (ReplicatedAdapterDescriptor)p.next();

-	    keepSet.add(descriptor.id);

-

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

-	    assert ra != null;

-	    ra.rebuild(descriptor);

-	}

-	purgeChildren(keepSet);

-	fireStructureChangedEvent(this);

-    }

-

-

     void update(java.util.List descriptors, String[] removeAdapters)

 	throws UpdateFailedException

     {

diff --git a/java/src/IceGrid/TreeNode/Root.java b/java/src/IceGrid/TreeNode/Root.java
index 62c20fde4c8..ac42556b5db 100755
--- a/java/src/IceGrid/TreeNode/Root.java
+++ b/java/src/IceGrid/TreeNode/Root.java
@@ -253,34 +253,6 @@ public class Root extends Parent
 	return _dynamicInfoMap.keySet();

     }

     

-    void tryAdd(ApplicationDescriptor ad) throws UpdateFailedException

-    {

-	try

-	{

-	    Application app = new Application(true, ad, _model);

-	    addChild(app, true);

-	}

-	catch(UpdateFailedException e)

-	{

-	    e.addParent(this);

-	    throw e;

-	}

-    }

-

-    void restore(Application copy)

-    {

-	removeChild(copy.getId(), true);

-	try

-	{

-	    addChild(copy, true);

-	}

-	catch(UpdateFailedException e)

-	{

-	    assert false; // impossible

-	}

-    }

-    

-    

     ServerState registerServer(String nodeName, String serverId, Server server, 

 			       Ice.IntHolder pid)

     {

@@ -424,6 +396,21 @@ public class Root extends Parent
 	}

     }

 

+    void tryAdd(ApplicationDescriptor ad) throws UpdateFailedException

+    {

+	try

+	{

+	    Application app = new Application(true, ad, _model);

+	    addChild(app, true);

+	}

+	catch(UpdateFailedException e)

+	{

+	    e.addParent(this);

+	    throw e;

+	}

+    }

+  

+

     private void newApplication(ApplicationDescriptor descriptor)

     {

 	descriptor.name = makeNewChildId(descriptor.name);

diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index cf0fa76ea55..79f0ca35e13 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -9,34 +9,14 @@
 package IceGrid.TreeNode;

 

 import java.awt.Component;

-import java.awt.event.ActionEvent;

-

-import javax.swing.AbstractAction;

-import javax.swing.Action;

-import javax.swing.DefaultComboBoxModel;

 import javax.swing.Icon;

-import javax.swing.JButton;

-import javax.swing.JCheckBox;

-import javax.swing.JComboBox;

-import javax.swing.JComponent;

-import javax.swing.JLabel;

 import javax.swing.JMenuItem;

-import javax.swing.JPanel;

+import javax.swing.JOptionPane;

 import javax.swing.JPopupMenu;

-import javax.swing.JRadioButton;

-import javax.swing.JScrollPane;

-import javax.swing.JTextField;

-import javax.swing.JToggleButton;

 import javax.swing.JTree;

-import javax.swing.UIManager;

-import javax.swing.tree.DefaultTreeCellRenderer;

 

-import com.jgoodies.forms.builder.DefaultFormBuilder;

-import com.jgoodies.forms.factories.Borders;

-import com.jgoodies.forms.layout.FormLayout;

-import com.jgoodies.forms.layout.Sizes;

-import com.jgoodies.forms.util.LayoutStyle;

-import IceGrid.SimpleInternalFrame;

+import javax.swing.tree.TreeCellRenderer;

+import javax.swing.tree.DefaultTreeCellRenderer;

 

 import IceGrid.AdapterDescriptor;

 import IceGrid.DistributionDescriptor;

@@ -49,6 +29,7 @@ import IceGrid.ServerDescriptor;
 import IceGrid.ServerDynamicInfo;

 import IceGrid.ServerInstanceDescriptor;

 import IceGrid.ServerState;

+import IceGrid.SimpleInternalFrame;

 import IceGrid.Utils;

 

 //

@@ -479,31 +460,10 @@ class Server extends EditableParent
 	}

     }

 

-    Server(Server o)

-    {

-	super(o, true);

-	_ephemeral = false;

-	assert o._ephemeral == false;

-

-	_state = o._state;

-	_stateIconIndex = o._stateIconIndex;

-	_pid = o._pid;

-	_toolTip = o._toolTip;

-

-	_instanceDescriptor = o._instanceDescriptor;

-	_serverDescriptor = o._serverDescriptor;

-

-	_resolver = o._resolver;

-

-	_services = o._services;

-	_adapters = o._adapters;

-	_dbEnvs = o._dbEnvs;

-    }

-

     Server(String serverId, ServerInstanceDescriptor instanceDescriptor, 

 	   ServerDescriptor serverDescriptor, Model model)

     {

-	super(true, serverId, model);

+	super(false, serverId, model);

 	_ephemeral = true;

 	try

 	{

@@ -522,13 +482,6 @@ class Server extends EditableParent
     //

     // Update the server and all its subtree

     //

-

-    void rebuild() throws UpdateFailedException

-    {

-	rebuild(_resolver, _instanceDescriptor, 

-		_serverDescriptor, getApplication());

-    }

-

     void rebuild(Utils.Resolver resolver,  

 		 ServerInstanceDescriptor instanceDescriptor,

 		 ServerDescriptor serverDescriptor,

diff --git a/java/src/IceGrid/TreeNode/ServerTemplate.java b/java/src/IceGrid/TreeNode/ServerTemplate.java
index c517d1fbfd7..d9579b012be 100755
--- a/java/src/IceGrid/TreeNode/ServerTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServerTemplate.java
@@ -185,7 +185,7 @@ class ServerTemplate extends EditableParent
     ServerTemplate(String name, TemplateDescriptor descriptor,

 		   Application application)

     {

-	super(true, name, application.getModel());

+	super(false, name, application.getModel());

 	_ephemeral = true;

 	try

 	{

@@ -197,21 +197,6 @@ class ServerTemplate extends EditableParent
 	}

     }

 

-    ServerTemplate(ServerTemplate o)

-    {

-	super(o, true);

-	assert o._ephemeral == false;

-	_ephemeral = false;

-

-	_templateDescriptor = o._templateDescriptor;

-	_iceBoxDescriptor = o._iceBoxDescriptor;

-	_services = o._services;

-	_dbEnvs = o._dbEnvs;

-	_adapters = o._adapters;

-	

-	_propertiesHolder = o._propertiesHolder;

-    }

-

     java.util.List findServiceInstances(String template)

     {

 	if(_services != null)

diff --git a/java/src/IceGrid/TreeNode/ServerTemplates.java b/java/src/IceGrid/TreeNode/ServerTemplates.java
index e1a8347f06c..b03e0a61355 100755
--- a/java/src/IceGrid/TreeNode/ServerTemplates.java
+++ b/java/src/IceGrid/TreeNode/ServerTemplates.java
@@ -108,28 +108,6 @@ class ServerTemplates extends Templates
 	}

     }

 

-    ServerTemplates(ServerTemplates o)

-    {

-	super(o);

-	_descriptors = o._descriptors;

-

-	//

-	// Deep-copy children

-	//

-	java.util.Iterator p = o._children.iterator();

-	while(p.hasNext())

-	{

-	    try

-	    {

-		addChild(new ServerTemplate((ServerTemplate)p.next()));

-	    }

-	    catch(UpdateFailedException e)

-	    {

-		assert false;

-	    }

-	}

-    }

-

     java.util.Map getUpdates()

     {

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

@@ -145,33 +123,6 @@ class ServerTemplates extends Templates
 	return updates;

     }

 

-    void update() throws UpdateFailedException

-    {

-	//

-	// The only template-descriptor update going through the

-	// update() calls is the update or removal of one template;

-	// template addition does not require a complex validation.

-	//

-

-	Application application = getApplication();

-

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

-	while(p.hasNext())

-	{

-	    java.util.Map.Entry entry = (java.util.Map.Entry)p.next();

-	    String templateId = (String)entry.getKey();

-	    TemplateDescriptor d = (TemplateDescriptor)entry.getValue();

-

-	    ServerTemplate t = (ServerTemplate)findChild(templateId);

-	    if(t != null)

-	    {

-		t.rebuild(d, application);

-	    }

-	}

-	purgeChildren(_descriptors.keySet());

-	fireStructureChangedEvent(this);

-    }

-

     java.util.List findServiceInstances(String template)

     {

 	java.util.List result = new java.util.LinkedList();

diff --git a/java/src/IceGrid/TreeNode/ServiceTemplate.java b/java/src/IceGrid/TreeNode/ServiceTemplate.java
index 826af93a9e4..03ed357f4a5 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplate.java
@@ -79,7 +79,7 @@ class ServiceTemplate extends EditableParent
     

     ServiceTemplate(String name, TemplateDescriptor descriptor, Model model)

     {

-	super(true, name, model);

+	super(false, name, model);

 	_ephemeral = true;

 	try

 	{

@@ -91,19 +91,6 @@ class ServiceTemplate extends EditableParent
 	}

     }

 

-    ServiceTemplate(ServiceTemplate o)

-    {

-	super(o, true);

-	assert o._ephemeral == false;

-	_ephemeral = false;

-

-	_templateDescriptor = o._templateDescriptor;

-	_adapters = o._adapters;

-	_dbEnvs = o._dbEnvs;

-	_propertiesHolder = o._propertiesHolder;

-    }

-

-

     void rebuild(TemplateDescriptor descriptor)

 	throws UpdateFailedException

     {

diff --git a/java/src/IceGrid/TreeNode/ServiceTemplates.java b/java/src/IceGrid/TreeNode/ServiceTemplates.java
index 5b01cd43716..edb2eb48b99 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplates.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplates.java
@@ -106,28 +106,6 @@ class ServiceTemplates extends Templates
 	}

     }

 

-    ServiceTemplates(ServiceTemplates o)

-    {

-	super(o);

-	_descriptors = o._descriptors;

-

-	//

-	// Deep-copy children

-	//

-	java.util.Iterator p = o._children.iterator();

-	while(p.hasNext())

-	{

-	    try

-	    {

-		addChild(new ServiceTemplate((ServiceTemplate)p.next()));

-	    }

-	    catch(UpdateFailedException e)

-	    {

-		assert false;

-	    }

-	}

-    }

-

     void newServiceTemplate(TemplateDescriptor descriptor)

     {

 	String id = makeNewChildId("NewServiceTemplate");

@@ -199,31 +177,6 @@ class ServiceTemplates extends Templates
 	return updates;

     }

 

-    void update() throws UpdateFailedException

-    {

-	//

-	// The only template-descriptor update going through the

-	// update() calls is the update or removal of one template;

-	// template addition does not require a complex validation.

-	//

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

-	while(p.hasNext())

-	{

-	    java.util.Map.Entry entry = (java.util.Map.Entry)p.next();

-	    String templateId = (String)entry.getKey();

-	    TemplateDescriptor d = (TemplateDescriptor)entry.getValue();

-

-	    ServiceTemplate t = (ServiceTemplate)findChild(templateId);

-	    if(t != null)

-	    {

-		t.rebuild(d);

-	    }

-	}

-	purgeChildren(_descriptors.keySet());

-	fireStructureChangedEvent(this);

-    }

-

-

     void update(java.util.Map descriptors, String[] removeTemplates)

 	throws UpdateFailedException

     {

diff --git a/java/src/IceGrid/TreeNode/Templates.java b/java/src/IceGrid/TreeNode/Templates.java
index 640fdcaec28..2a66376d567 100755
--- a/java/src/IceGrid/TreeNode/Templates.java
+++ b/java/src/IceGrid/TreeNode/Templates.java
@@ -25,11 +25,6 @@ abstract class Templates extends EditableParent
 	super(false, id, model, false);

     }

 

-    protected Templates(Templates o)

-    {

-	super(o);

-    }

-

     boolean tryUpdate(CommonBase child)

     {

 	java.util.List instanceList = findAllTemplateInstances(child.getId());