Remove workflow override - bad hack for neuGrid that is no longer

needed.

1 files changed, 6 insertions, 9 deletions

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", "");

         }