pull master devs

2 files changed, 34 insertions, 26 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
index f311dc1..a7971f3 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
@@ -14,11 +14,12 @@ package com.c2kernel.lifecycle.instance.predefined.agent;
 import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.CorbaServer;

 import com.c2kernel.entity.agent.ActiveEntity;

 import com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription;

 import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.lookup.RolePath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -34,27 +35,36 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
 		super();

 	}

 

-	//requestdata is xmlstring

+	/**

+	 * Params:

+	 * <ol><li>1: new Agent name</li>

+	 * <li>2...: Roles to assign to the agent. Must already exist.

+	 * @see com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription#runActivityLogic(com.c2kernel.lookup.AgentPath, int, int, java.lang.String)

+	 */

 	@Override

 	protected String runActivityLogic(AgentPath agent, int itemSysKey,

 			int transitionID, String requestData) throws InvalidDataException {

 		

 		String[] input = getDataList(requestData);

 		String newName = input[0];

-		String domPath = input[1];

-        String wfDefName = null;

-        int wfDefVer = -1;

-        if (input.length > 2)  // override wf

-            wfDefName = input[2];

 

 		Logger.msg(1, "CreateAgentFromDescription::request() - Starting.");

 

         try {

+        	

+        	if (input.length < 2)

+        		throw new InvalidDataException("Agent should have at least one Role defined on creation");

+        	// check if given roles exist

+        	for(int i=1; i<input.length; i++) {

+            	RolePath thisRole = new RolePath(input[i]);

+            	if (!thisRole.exists()) throw new InvalidDataException("Role "+input[i]+" does not exist");

+            }

+        	

             // check if the path is already taken

-			DomainPath context = new DomainPath(new DomainPath(domPath), newName);

-			Logger.debug(8,"context "+context.getSysKey()+" "+context.getPath()+" "+context.getString());

-			if (context.getSysKey()!=-1)

-                throw new ObjectAlreadyExistsException("The agent name " +newName+ " exists already.", "");

+        	try {

+        		Gateway.getLookup().getAgentPath(newName);

+        		throw new ObjectAlreadyExistsException("The agent name " +newName+ " exists already.", "");

+        	} catch (ObjectNotFoundException ex) { }

 

             // generate new entity key

             Logger.msg(6, "CreateItemFromDescription - Requesting new sysKey");

@@ -70,7 +80,6 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
             ActiveEntity newAgent = (ActiveEntity)factory.createEntity(newAgentPath);

             Gateway.getLookupManager().add(newAgentPath);

 

-

             // initialise it with its properties and workflow

 

             Logger.msg(3, "CreateItemFromDescription - Initializing Item");

@@ -78,14 +87,16 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
             newAgent.initialise(

                 agent.getSysKey(),

             	Gateway.getMarshaller().marshall(getNewProperties(itemSysKey, newName, agent)),

-            	Gateway.getMarshaller().marshall(getNewWorkflow(itemSysKey, wfDefName, wfDefVer)),

+            	Gateway.getMarshaller().marshall(getNewWorkflow(itemSysKey)),

             	Gateway.getMarshaller().marshall(getNewCollections(itemSysKey))

             	);

+            

+            // add roles if given

+            

+            for(int i=1; i<input.length; i++) {

+            	newAgent.addRole(input[i]);

+            }

 

-            // add its domain path

-            Logger.msg(3, "CreateItemFromDescription - Creating "+context);

-            context.setEntity(newAgentPath);

-            Gateway.getLookupManager().add(context);

             return requestData;

         } catch (Exception e) {

             Logger.error(e);

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
index f63c188..728631c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java
@@ -59,10 +59,6 @@ public class CreateItemFromDescription extends PredefinedStep
 		String[] input = getDataList(requestData);

 		String newName = input[0];

 		String domPath = input[1];

-        String wfDefName = null;

-        int wfDefVer = -1;

-        if (input.length > 2)  // override wf

-            wfDefName = input[2];

 

 		Logger.msg(1, "CreateItemFromDescription - Starting.");

 

@@ -99,7 +95,7 @@ public class CreateItemFromDescription extends PredefinedStep
             newItem.initialise(

                 agent.getSysKey(),

             	Gateway.getMarshaller().marshall(getNewProperties(itemSysKey, newName, agent)),

-            	Gateway.getMarshaller().marshall(getNewWorkflow(itemSysKey, wfDefName, wfDefVer)),

+            	Gateway.getMarshaller().marshall(getNewWorkflow(itemSysKey)),

             	Gateway.getMarshaller().marshall(getNewCollections(itemSysKey))

             	);

 

@@ -132,11 +128,12 @@ public class CreateItemFromDescription extends PredefinedStep
         return props;

 	}

 	

-	protected CompositeActivity getNewWorkflow(int itemSysKey, String wfDefName, int wfDefVer) throws ClusterStorageException, ObjectNotFoundException, InvalidDataException {

+	protected CompositeActivity getNewWorkflow(int itemSysKey) throws ClusterStorageException, ObjectNotFoundException, InvalidDataException {

         // loop through collections, collecting instantiated descriptions and finding the default workflow def

         String[] collNames = Gateway.getStorage().getClusterContents(itemSysKey, ClusterStorage.COLLECTION);

+        String wfDefName = null; Integer wfDefVer = null;

         for (String collName : collNames) {

-        	if (collName.equalsIgnoreCase("workflow") && wfDefName == null) {

+        	if (collName.equalsIgnoreCase("workflow")) {

             	Collection<? extends CollectionMember> thisCol = (Collection<? extends CollectionMember>)Gateway.getStorage().get(itemSysKey, ClusterStorage.COLLECTION+"/"+collName, null);

         		ArrayList<? extends CollectionMember> members = thisCol.getMembers().list;

         		// get the first member from the wf collection

@@ -154,14 +151,14 @@ public class CreateItemFromDescription extends PredefinedStep
         // load workflow def

         if (wfDefName == null)

             throw new InvalidDataException("No workflow given or defined", "");

-        if (wfDefVer == -1)

+        if (wfDefVer == null)

         	throw new InvalidDataException("No workflow def version given","");

 

         try {

         	CompositeActivityDef wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, wfDefVer);

             return (CompositeActivity)wfDef.instantiate();

         } catch (ObjectNotFoundException ex) {

-            throw new InvalidDataException("Workflow def '"+wfDefName+"' item not found", "");

+            throw new InvalidDataException("Workflow def '"+wfDefName+"'v"+wfDefVer+" not found", "");

         } catch (ClassCastException ex) {

          	throw new InvalidDataException("Activity def '"+wfDefName+"' was not Composite", "");

         }