3.0-SNAPSHOT (Will be first open source version)

New StateMachine desc
IssueID #28

4 files changed, 14 insertions, 25 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
index 9ec6519..c9ec808 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
@@ -7,9 +7,7 @@
 

 package com.c2kernel.lifecycle.instance.predefined.entitycreation;

 

-import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.InvalidTransitionException;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.process.Gateway;

@@ -24,23 +22,20 @@ public class CreateNewAgent extends PredefinedStep
 

 	//requestdata is xmlstring

     @Override

-	public void request( AgentPath agent, int transitionID, String requestData)

-        throws AccessRightsException,

-               InvalidTransitionException,

-               InvalidDataException

-    {

-        checkAccessRights(agent);

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+    	

         String redactedRequestData;

         try {

             NewAgent newAgent = (NewAgent)Gateway.getMarshaller().unmarshall(requestData);

             newAgent.create(agent.getSysKey());

             newAgent.password = "REDACTED";

             redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

+            return requestData;

         } catch (Exception ex) {

             Logger.error(ex);

             throw new InvalidDataException("Error creating agent", "");

         }

 

-        sendEventStoreOutcome(transitionID, redactedRequestData, agent);

     }

 }

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
index 5776a5a..2db4fe6 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
@@ -10,9 +10,7 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 

 

-import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.InvalidTransitionException;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.process.Gateway;

@@ -27,20 +25,16 @@ public class CreateNewItem extends PredefinedStep
 

 	//requestdata is xmlstring

     @Override

-	public void request( AgentPath agent, int transitionID, String requestData)

-        throws AccessRightsException,

-               InvalidTransitionException,

-               InvalidDataException

-    {

-        checkAccessRights(agent);

-

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+    	

         try {

             NewItem item = (NewItem)Gateway.getMarshaller().unmarshall(requestData);

             item.create(agent.getSysKey(), false);

+            return requestData;

         } catch (Exception ex) {

             Logger.error(ex);

             throw new InvalidDataException("Error creating item", "");

         }

-        sendEventStoreOutcome(transitionID, requestData, agent);

     }

 }

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index ed6fd20..dacb1a3 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -16,8 +16,7 @@ import com.c2kernel.entity.TraceableEntity;
 import com.c2kernel.events.Event;

 import com.c2kernel.events.History;

 import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.lifecycle.instance.stateMachine.States;

-import com.c2kernel.lifecycle.instance.stateMachine.Transitions;

+import com.c2kernel.lifecycle.instance.stateMachine.Transition;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.EntityPath;

 import com.c2kernel.persistency.ClusterStorage;

@@ -87,7 +86,7 @@ public class NewItem extends ModuleImport {
         try {

 

         	// find workflow def

-        	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, "0");

+        	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, 0);

             newItem.initialise(

                     agentId,

                     Gateway.getMarshaller().marshall(new PropertyArrayList(properties)),

@@ -130,7 +129,8 @@ public class NewItem extends ModuleImport {
 			}

         	

         	// write new view/outcome/event

-            Event newEvent = hist.addEvent("system", "Admin", Transitions.DONE, "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, thisOutcome.viewname, States.FINISHED);

+        	Transition predefDone = new Transition(0, "Done", 0, 0);

+            Event newEvent = hist.addEvent("system", "Admin", "Import", "Import", "Import", thisOutcome.schema, thisOutcome.version, "PredefinedStep", 0, predefDone, thisOutcome.viewname);

             newOutcome.setID(newEvent.getID());

             impView.setEventId(newEvent.getID());

             try {

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java
index a8431de..9ab5793 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java
@@ -10,10 +10,10 @@ public class Outcome {
 	public Outcome() {

 	}

 	

-	public Outcome(String schema, String version, String viewname, String path) {

+	public Outcome(String schema, int version, String viewname, String path) {

 		super();

 		this.schema = schema;

-		this.version = Integer.parseInt(version);

+		this.version = version;

 		this.viewname = viewname;

 		this.path = path;

 	}