Release 5.2.5

core/pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>edu.isi.wings</groupId>
   <artifactId>wings-core</artifactId>
-  <version>5.2.4</version>
+  <version>5.2.5</version>
   <name>Wings Core</name>
   <packaging>pom</packaging>
   <description>Wings project for the IKCAP group</description>

planner/pom.xml

@@ -10,13 +10,13 @@
 	<parent>
 		<groupId>edu.isi.wings</groupId>
 		<artifactId>wings-core</artifactId>
-		<version>5.2.4</version>
+		<version>5.2.5</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<jsch.version>0.1.53</jsch.version>
-		<ontapi.version>1.2.6</ontapi.version>
+		<ontapi.version>1.2.7</ontapi.version>
 		<nanocloud.version>0.8.11</nanocloud.version>
 		<gson.version>2.2.4</gson.version>
 		<junit.version>4.5</junit.version>

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
  * </ul>
  */
-public class ComponentPacket {
-	private ComponentVariable component;
+public class ComponentPacket implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+  private ComponentVariable component;
 	private LinkedHashMap<Role, Variable> roleMap;
 	private ArrayList<KBTriple> requirements;
 

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);
 			}
 

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();

pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>edu.isi.wings</groupId>
     <artifactId>wings-core</artifactId>
-    <version>5.2.4</version>
+    <version>5.2.5</version>
     <relativePath>core/pom.xml</relativePath>
   </parent>
 

portal/.settings/org.eclipse.wst.common.component

@@ -69,7 +69,7 @@
         <dependent-module archiveName="wings-planner-5.2.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wings-planner/wings-planner">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="ontapi-1.2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ontapi/ontapi">
+        <dependent-module archiveName="ontapi-1.2.7.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ontapi/ontapi">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 

portal/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>edu.isi.wings</groupId>
 		<artifactId>wings-core</artifactId>
-		<version>5.2.4</version>
+		<version>5.2.5</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 

portal/src/main/webapp/html/home.html

@@ -87,6 +87,6 @@ <h2>About Wings</h2>
 	</p>
 
 	<p>
-		You are running WINGS version: 5.2.4 
+		You are running WINGS version: 5.2.5 
 	</p>
 </body>