Fixed build

1 files changed, 284 insertions, 13 deletions

diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index 07501665182..76ca587b55b 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -8,21 +8,23 @@
 // **********************************************************************

 package IceGrid.TreeNode;

 

+import IceGrid.AdapterDynamicInfo;

 import IceGrid.ApplicationDescriptor;

 import IceGrid.ApplicationUpdateDescriptor;

-import IceGrid.TemplateDescriptor;

 import IceGrid.Model;

 import IceGrid.ServerDynamicInfo;

-import IceGrid.AdapterDynamicInfo;

+import IceGrid.ServerState;

+import IceGrid.TemplateDescriptor;

 

-class Application extends Parent

+class Application extends EditableParent

 {

     //

     // Builds the application and all its subtrees

     //

     Application(ApplicationDescriptor descriptor, Model model)

+	throws DuplicateIdException

     {

-	super(descriptor.name, model);

+	super(false, descriptor.name, model);

 	_descriptor = descriptor;

 

 	_replicatedAdapters = new ReplicatedAdapters(_descriptor.replicatedAdapters,

@@ -41,7 +43,74 @@ class Application extends Parent
 	addChild(_nodes);

     }

 

+    Application(Application o)

+    {

+	super(o);

+	

+	//

+	// 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;

+	

+	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(DuplicateIdException 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()

+    {

+	// TODO: hourglass

+

+	Application copy = new Application(this);

+	

+	try

+	{

+	    update();

+	}

+	catch(DuplicateIdException e)

+	{

+	    // TODO: error message to the user

+

+	    

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

+	    return false;

+	}

+	

+

+	return true;

+    }

+

+    void update() throws DuplicateIdException

+    {

+	_replicatedAdapters.update();

+	_serverTemplates.update();

+	_serviceTemplates.update();

+	_nodes.update();

+    }

+

+

     void update(ApplicationUpdateDescriptor desc)

+	throws DuplicateIdException

     {

 	//

 	// Description

@@ -115,6 +184,17 @@ class Application extends Parent
 	return (ServerTemplate)_serverTemplates.findChild(id);

     }

 

+    ReplicatedAdapter findReplicatedAdapter(String id)

+    {

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

+    }

+

+    Node findNode(String id)

+    {

+	return (Node)_nodes.findChild(id);

+    }

+

+

     TemplateDescriptor findServerTemplateDescriptor(String templateName)

     {

 	return (TemplateDescriptor)

@@ -126,12 +206,6 @@ class Application extends Parent
 	return (TemplateDescriptor)

 	    _descriptor.serviceTemplates.get(templateName);

     }

-

-

-    Node findNode(String id)

-    {

-	return (Node)_nodes.findChild(id);

-    }

     

     ServerTemplates getServerTemplates()

     {

@@ -151,25 +225,222 @@ class Application extends Parent
 	return _descriptor.variables;

     }

 

-    void nodeUp(String nodeName)

+    void nodeUp(String nodeName, Root.DynamicInfo info)

     {

+	//

+	// Need to tell *every* server on this node

+	//

+	java.util.List serverList = (java.util.List)_nodeServerMap.get(nodeName);

+	if(serverList != null)

+	{

+	    java.util.Iterator p = serverList.iterator();

+	    while(p.hasNext())

+	    {

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

+		ServerDynamicInfo serverInfo = (ServerDynamicInfo)

+		    info.serverInfoMap.get(server.getId());

+		if(serverInfo == null)

+		{

+		    server.updateDynamicInfo(ServerState.Inactive, 0);

+		}

+		else

+		{

+		    server.updateDynamicInfo(serverInfo.state, serverInfo.pid);

+		}

+	    }

+	}

+	

+	//

+	// Tell adapters 

+	//

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

+	if(adapterList != null)

+	{

+	    java.util.Iterator p = adapterList.iterator();

+	    while(p.hasNext())

+	    {

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

+		Ice.ObjectPrx proxy = 

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

+		if(proxy != null)

+		{

+		    adapter.updateProxy(proxy);

+		}

+	    }

+	}

+	

 	_nodes.nodeUp(nodeName);

     }

 

     void nodeDown(String nodeName)

     {

 	_nodes.nodeDown(nodeName);

+	

+	java.util.List serverList = (java.util.List)_nodeServerMap.get(nodeName);

+	if(serverList != null)

+	{

+	    java.util.Iterator p = serverList.iterator();

+	    while(p.hasNext())

+	    {

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

+		server.updateDynamicInfo(null, 0);

+	    }

+	}

+

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

+	if(adapterList != null)

+	{

+	    java.util.Iterator p = adapterList.iterator();

+	    while(p.hasNext())

+	    {

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

+		adapter.updateProxy(null);

+	    }

+	}

     }

     

-    public void cleanup()

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

+				  Adapter adapter)

     {

-	_nodes.cleanup();

+	_adapterMap.put(instanceId, adapter);

+	

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

+	if(adapterList == null)

+	{

+	    adapterList = new java.util.LinkedList();

+	    _nodeAdapterMap.put(nodeName, adapterList);

+	}

+	adapterList.add(adapter);

+	

+	Root.DynamicInfo info = (Root.DynamicInfo)_model.getRoot().getDynamicInfo(nodeName);

+	if(info == null)

+	{

+	    // Node is down

+	    return null;

+	}

+	else

+	{

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

+	}

     }

+    

+    void unregisterAdapter(String nodeName, AdapterInstanceId instanceId, 

+			   Adapter adapter)

+    {

+	_adapterMap.remove(instanceId);

 

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

+	if(adapterList != null)

+	{

+	    adapterList.remove(adapter);

+	}

+    }

+

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

+			       Ice.IntHolder pid)

+    {

+	_serverMap.put(serverId, server);

+	

+	java.util.List serverList = (java.util.List)_nodeServerMap.get(nodeName);

+	if(serverList == null)

+	{

+	    serverList = new java.util.LinkedList();

+	    _nodeServerMap.put(nodeName, serverList);

+	}

+	serverList.add(server);

+

+	Root.DynamicInfo info = (Root.DynamicInfo)_model.getRoot().getDynamicInfo(nodeName);

+	if(info == null)

+	{	

+	    // Node is down

+	    pid.value = 0;

+	    return null;

+	}

+	else

+	{

+	    ServerDynamicInfo serverInfo = 

+		(ServerDynamicInfo)info.serverInfoMap.get(serverId);

+	    if(serverInfo == null)

+	    {

+		pid.value = 0;

+		return ServerState.Inactive;

+	    }

+	    else

+	    {

+		pid.value = serverInfo.pid;

+		return serverInfo.state;

+	    }

+	}

+    }

+    

+    void unregisterServer(String nodeName, String serverId, Server server)

+    {

+	_serverMap.remove(serverId);

+	java.util.List serverList = (java.util.List)_nodeServerMap.get(nodeName);

+	if(serverList != null)

+	{

+	    serverList.remove(server);

+	}

+    }

+

+    public boolean updateServer(ServerDynamicInfo updatedInfo)

+    {

+	//

+	// Is this Server registered?

+	//

+	Server server = (Server)_serverMap.get(updatedInfo.id);

+	if(server != null)

+	{

+	    server.updateDynamicInfo(updatedInfo.state, updatedInfo.pid);

+	    return true;

+	}

+	else

+	{

+	    return false;

+	}

+    }

+

+    public boolean updateAdapter(AdapterInstanceId instanceId, Ice.ObjectPrx proxy)

+    {

+	//

+	// Is this Adapter registered?

+	//

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

+	if(adapter != null)

+	{

+	    adapter.updateProxy(proxy);

+	    return true;

+	}

+	else

+	{

+	    return false;

+	}

+    }

+    

 

     private ApplicationDescriptor _descriptor;

 

     //

+    // AdapterInstanceId to Adapter

+    //

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

+

+    //

+    // Nodename to list of Adapter (used when a node goes down)

+    //

+    private java.util.Map _nodeAdapterMap = new java.util.HashMap();

+

+    //

+    // ServerId to Server

+    //

+    private java.util.Map _serverMap = new java.util.HashMap();

+

+    //

+    // Nodename to list of Server (used when a node goes down)

+    //

+    private java.util.Map _nodeServerMap = new java.util.HashMap();

+

+    //

     // Children

     //

     private ReplicatedAdapters _replicatedAdapters;