diff --git a/core/pom.xml b/core/pom.xml index 7bd8ad3c..b6bdbc83 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ 4.0.0 edu.isi.wings wings-core - 5.2.4 + 5.2.5 Wings Core pom Wings project for the IKCAP group diff --git a/planner/pom.xml b/planner/pom.xml index d530d24c..fa04fee6 100644 --- a/planner/pom.xml +++ b/planner/pom.xml @@ -10,13 +10,13 @@ edu.isi.wings wings-core - 5.2.4 + 5.2.5 ../core/pom.xml 0.1.53 - 1.2.6 + 1.2.7 0.8.11 2.2.4 4.5 diff --git a/planner/src/main/java/edu/isi/wings/catalog/component/classes/ComponentPacket.java b/planner/src/main/java/edu/isi/wings/catalog/component/classes/ComponentPacket.java index 488ab1cb..d37f7eb5 100644 --- a/planner/src/main/java/edu/isi/wings/catalog/component/classes/ComponentPacket.java +++ b/planner/src/main/java/edu/isi/wings/catalog/component/classes/ComponentPacket.java @@ -17,6 +17,7 @@ package edu.isi.wings.catalog.component.classes; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -39,8 +40,10 @@ * basically a list of KBTriple Objects * */ -public class ComponentPacket { - private ComponentVariable component; +public class ComponentPacket implements Serializable { + private static final long serialVersionUID = 1L; + + private ComponentVariable component; private LinkedHashMap roleMap; private ArrayList requirements; diff --git a/planner/src/main/java/edu/isi/wings/execution/engine/api/impl/local/LocalExecutionEngine.java b/planner/src/main/java/edu/isi/wings/execution/engine/api/impl/local/LocalExecutionEngine.java index 6d90fe3b..bab99415 100644 --- a/planner/src/main/java/edu/isi/wings/execution/engine/api/impl/local/LocalExecutionEngine.java +++ b/planner/src/main/java/edu/isi/wings/execution/engine/api/impl/local/LocalExecutionEngine.java @@ -140,7 +140,7 @@ public void onStepEnd(RuntimePlan exe) { // - checks for next steps and executes them // - or replans // - or ends - System.out.println("Plan: Step End"); + //System.out.println("Plan: Step End"); // If aborted, shut it down if(exe.getRuntimeInfo().getStatus() == Status.FAILURE) { exe.onEnd(this.logger, Status.FAILURE, "Finished"); @@ -158,13 +158,13 @@ public void onStepEnd(RuntimePlan exe) { if(exe.getQueue().getFinishedSteps().size() == exe.getQueue().getAllSteps().size()) { if(exe.getPlan().isIncomplete()) { - System.out.println("* Workflow is Incomplete !"); + //System.out.println("* Workflow is Incomplete !"); if(!exe.isReplanned()) { exe.setReplanned(true); // If the plan is incomplete, then replan and continue - System.out.println("* Workflow needs Replanning"); - System.out.println(">> Replanning, and re-executing"); + //System.out.println("* Workflow needs Replanning"); + //System.out.println(">> Replanning, and re-executing"); exe = this.monitor.rePlan(exe); if(exe.getRuntimeInfo().getStatus() != @@ -181,10 +181,10 @@ public void onStepEnd(RuntimePlan exe) { } else { status = RuntimeInfo.Status.SUCCESS; - System.out.println("* Successful Finish"); + //System.out.println("* Successful Finish"); } } - System.out.println("** Shutting down execution !"); + //System.out.println("** Shutting down execution !"); exe.onEnd(this.logger, status, endlog); this.shutdown(); } @@ -197,7 +197,7 @@ public void onStepEnd(RuntimePlan exe) { } for(RuntimeStep stepexe : steps) { - System.out.println(">> Executing " + stepexe.getName()); + //System.out.println(">> Executing " + stepexe.getName()); this.stepEngine.execute(stepexe, exe); } diff --git a/planner/src/main/java/edu/isi/wings/planner/api/impl/kb/WorkflowGenerationKB.java b/planner/src/main/java/edu/isi/wings/planner/api/impl/kb/WorkflowGenerationKB.java index a78ac6f7..d5cf41c9 100644 --- a/planner/src/main/java/edu/isi/wings/planner/api/impl/kb/WorkflowGenerationKB.java +++ b/planner/src/main/java/edu/isi/wings/planner/api/impl/kb/WorkflowGenerationKB.java @@ -1312,7 +1312,6 @@ else if (!cons.getObject().getValue() */ public ExecutionPlan getExecutionPlan(Template template) { this.addExplanation("INFO: --------- Creating an execution plan ---------"); - System.out.println("INFO: --------- Creating an execution plan ---------"); try { String planid = UuidGen.generateURIUuid((URIEntity)template); @@ -2397,7 +2396,8 @@ public PortBindingList configureBindings(PortBindingList ipblist, Node origNode, } c.setBinding(cb); - ComponentPacket ccmr = cmr.clone(); + ComponentPacket ccmr = (ComponentPacket) SerializableObjectCloner.clone(cmr); //cmr.clone(); + ccmr.setRequirements(cmr.getRequirements()); ccmr.setComponent(c); PortBinding pb = ipblist.getPortBinding(); diff --git a/pom.xml b/pom.xml index 26cb85f0..284b5dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ edu.isi.wings wings-core - 5.2.4 + 5.2.5 core/pom.xml diff --git a/portal/.settings/org.eclipse.wst.common.component b/portal/.settings/org.eclipse.wst.common.component index bd42d815..72b47a5e 100644 --- a/portal/.settings/org.eclipse.wst.common.component +++ b/portal/.settings/org.eclipse.wst.common.component @@ -69,7 +69,7 @@ uses - + uses diff --git a/portal/pom.xml b/portal/pom.xml index 88169732..b4911559 100644 --- a/portal/pom.xml +++ b/portal/pom.xml @@ -10,7 +10,7 @@ edu.isi.wings wings-core - 5.2.4 + 5.2.5 ../core/pom.xml diff --git a/portal/src/main/webapp/html/home.html b/portal/src/main/webapp/html/home.html index 644b4bd0..60a0da50 100644 --- a/portal/src/main/webapp/html/home.html +++ b/portal/src/main/webapp/html/home.html @@ -87,6 +87,6 @@

About Wings

- You are running WINGS version: 5.2.4 + You are running WINGS version: 5.2.5

\ No newline at end of file