Separate PredefinedStepContainers for Agents and Items (and Server Item)

1 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index bcc5e68..0678729 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -17,8 +17,7 @@ import com.c2kernel.events.History;
 import com.c2kernel.lifecycle.CompositeActivityDef;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

 import com.c2kernel.lifecycle.instance.Workflow;

-import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer;

-import com.c2kernel.lifecycle.instance.predefined.ServerPredefinedStepContainer;

+import com.c2kernel.lifecycle.instance.predefined.server.ServerPredefinedStepContainer;

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

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

@@ -358,10 +357,7 @@ public class Bootstrap
 

     public static void initServerItemWf() throws Exception {

     	CompositeActivityDef serverWfCa = (CompositeActivityDef)LocalObjectLoader.getActDef("ServerItemWorkflow", 0);

-        Workflow wf = new Workflow((CompositeActivity)serverWfCa.instantiate());

-        PredefinedStepContainer predef = (PredefinedStepContainer)wf.search("workflow/predefined");

-        wf.getChildGraphModel().removeVertex(predef);

-        wf.addChild(new ServerPredefinedStepContainer(), predef.getCentrePoint());

+        Workflow wf = new Workflow((CompositeActivity)serverWfCa.instantiate(), new ServerPredefinedStepContainer());

         wf.initialise(thisServerPath.getSysKey(), systemAgents.get("system").getPath());

         Gateway.getStorage().put(thisServerPath.getSysKey(), wf, null);

     }