You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/07/02 18:51:08 UTC
[01/23] incubator-taverna-language git commit: File type detection
removed
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 3446ea37d -> 9bfcf0fe1
File type detection removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/68e8170c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/68e8170c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/68e8170c
Branch: refs/heads/master
Commit: 68e8170c3d910c27ded1b93914fe08594821708d
Parents: 3bd4874
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jun 25 19:31:24 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jun 25 19:31:24 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/convert/Scufl2Convert.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/68e8170c/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
index 03a9f89..d7267a3 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
@@ -167,11 +167,11 @@ public class Scufl2Convert{
public void convertFile(File t2File, File outFile){
//Check weather the input files are in valid format...!!!
- String ext = FilenameUtils.getExtension(t2File.getName());
- if(!ext.equals("t2flow")||!ext.equals("wfbundle")){
- System.err.println("Invalid input file format...!!!");
- return;
- }
+// String ext = FilenameUtils.getExtension(t2File.getName());
+// if(!ext.equals("t2flow")||!ext.equals("wfbundle")){
+// System.err.println("Invalid input file format...!!!");
+// return;
+// }
WorkflowBundleIO wfbio = new WorkflowBundleIO();
String filename = t2File.getName();
[11/23] incubator-taverna-language git commit: Verbose mode added -
Stats
Posted by st...@apache.org.
Verbose mode added - Stats
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/aeb2b2e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/aeb2b2e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/aeb2b2e9
Branch: refs/heads/master
Commit: aeb2b2e9d67e468f7b2fb1cf19499b5a4719ec2f
Parents: 131f02b
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 11:24:18 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 11:24:18 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/tavlang/CommandLineTool.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/aeb2b2e9/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 251b4ad..da84803 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -336,10 +336,13 @@ public class CommandLineTool {
// @Option(name={"-wf", "--workflow"}, description ="Specify the input is workflow file or bundle")
// public boolean isWf;
- @Option(name = {"-l", "--log"}, description="Save the workflow statictics in a file")
+ @Option(name = {"-l", "--log"}, description ="Save the workflow statictics in a file")
public String file;
- @Arguments(usage="input files", description = "Enter the workflow bundles")
+ @Option(name = {"-v", "--verbose"}, description = "Verbose mode")
+ public boolean verbose;
+
+ @Arguments(usage="input files", description = "Enter the workflow bundle files")
public List<String> files;
@Override
@@ -357,7 +360,7 @@ public class CommandLineTool {
}
- GetWfStat stat = new GetWfStat(files, file);
+ GetWfStat stat = new GetWfStat(files, file, verbose);
}
[02/23] incubator-taverna-language git commit: ToJSON miss print
removed
Posted by st...@apache.org.
ToJSON miss print removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/ec51e35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ec51e35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ec51e35d
Branch: refs/heads/master
Commit: ec51e35da6e92caf73d6f373096f884ca39ba6dd
Parents: 68e8170
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jun 25 19:32:39 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jun 25 19:32:39 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ec51e35d/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java
index 47d6b57..f11424c 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToJson.java
@@ -138,7 +138,7 @@ public class ToJson {
WorkflowBundle wfBundle = io.readBundle(in, null);
io.writeBundle(wfBundle, workflowFile, "application/ld+json");
- System.out.println(workflowFile);
+// System.out.println(workflowFile);
}
[23/23] incubator-taverna-language git commit: myGrid snapshot
repository
Posted by st...@apache.org.
myGrid snapshot repository
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/9bfcf0fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/9bfcf0fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/9bfcf0fe
Branch: refs/heads/master
Commit: 9bfcf0fe15fd92d7caa460687f4178485383bb5a
Parents: 1a22817
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jul 2 17:50:05 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jul 2 17:50:05 2015 +0100
----------------------------------------------------------------------
taverna-language-commandline/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/9bfcf0fe/taverna-language-commandline/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/pom.xml b/taverna-language-commandline/pom.xml
index b4faa57..3a7a5c8 100644
--- a/taverna-language-commandline/pom.xml
+++ b/taverna-language-commandline/pom.xml
@@ -186,6 +186,15 @@
<name>myGrid Repository</name>
<url>http://www.mygrid.org.uk/maven/repository</url>
</repository>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>mygrid-snapshot-repository</id>
+ <name>myGrid Snapshot Repository</name>
+ <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
+ </repository>
<repository>
<id>apache.snapshots</id>
[18/23] incubator-taverna-language git commit: File save - saved into
Posted by st...@apache.org.
File save - saved into <file>
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/81acb4fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/81acb4fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/81acb4fc
Branch: refs/heads/master
Commit: 81acb4fca13674a044ed1b0d4661996dfafcf409
Parents: fef9830
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 01:23:19 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 01:23:19 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/81acb4fc/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 63f0024..885d3c8 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -176,6 +176,7 @@ public class GetWfStat {
bfw.write(report);
bfw.close();
writer.close();
+ System.out.println("Results were saved into " + file.getPath());
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
[19/23] incubator-taverna-language git commit: Stop the conversion if
workflow has problems
Posted by st...@apache.org.
Stop the conversion if workflow has problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/29300ed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/29300ed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/29300ed1
Branch: refs/heads/master
Commit: 29300ed172ec4a4ea09a08c476ece35184441ef0
Parents: 81acb4f
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 01:35:27 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 01:35:27 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/taverna/tavlang/CommandLineTool.java | 2 ++
.../org/apache/taverna/tavlang/tools/validate/Validate.java | 6 ++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29300ed1/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 3efa17e..97673bf 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -217,6 +217,8 @@ public class CommandLineTool {
//Validate before convert
if(validate){
Validate validate = new Validate(files, null, false);
+ if(!validate.getCheck())
+ return;
}
if (Filetypes.isRo) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29300ed1/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
index 8f3fc4f..aa8ef5e 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
@@ -42,6 +42,7 @@ public class Validate {
private String nonVerbose = "";
private String finalrep = "";
private boolean verbose;
+ private boolean check = false;
public Validate(List<String> files, String file, boolean verbose) {
@@ -116,6 +117,7 @@ public class Validate {
if(detect){
System.out.println("The workflow bundle has following problems: \n"+report2.toString());
+ check = true;
}
if(verbose){
@@ -144,5 +146,9 @@ public class Validate {
}
}
+
+ public boolean getCheck(){
+ return this.check;
+ }
}
[07/23] incubator-taverna-language git commit: Workflow statistics
Posted by st...@apache.org.
Workflow statistics
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/95e54a70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/95e54a70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/95e54a70
Branch: refs/heads/master
Commit: 95e54a705af5da2d5a2f8f436eb017eb730e0f17
Parents: 41ddbd6
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:29:46 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:29:46 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/stats/GetWfStat.java | 38 ++++++++++++++++++++
1 file changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95e54a70/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
new file mode 100644
index 0000000..4d8eb98
--- /dev/null
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -0,0 +1,38 @@
+package org.apache.taverna.tavlang.tools.stats;
+
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.taverna.scufl2.api.common.NamedSet;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.io.ReaderException;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+
+public class GetWfStat {
+
+ public Workflow wflow;
+ public NamedSet<Workflow> set;
+
+ public GetWfStat(){
+
+ }
+
+ public void read(File file){
+ WorkflowBundleIO io = new WorkflowBundleIO();
+ try {
+ WorkflowBundle wf = io.readBundle(file, null);
+ this.set = wf.getWorkflows();
+
+ for(Workflow wrf : set){
+ System.out.println(wrf.getInputPorts());
+ }
+
+ } catch (ReaderException | IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
[09/23] incubator-taverna-language git commit: log file error
detection fixed
Posted by st...@apache.org.
log file error detection fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/20c25bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/20c25bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/20c25bba
Branch: refs/heads/master
Commit: 20c25bbab5030896bcf1417681e80d2e328c6a2a
Parents: 81b720e
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:58:02 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:58:02 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 34 ++++++++++++++------
1 file changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/20c25bba/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index cc9b04e..251b4ad 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -40,6 +40,7 @@ import org.apache.taverna.tavlang.tools.convert.Scufl2Convert;
import org.apache.taverna.tavlang.tools.convert.ToRobundle;
import org.apache.taverna.tavlang.tools.inspect.ProcessorNames;
import org.apache.taverna.tavlang.tools.inspect.ServiceTypes;
+import org.apache.taverna.tavlang.tools.stats.GetWfStat;
import org.apache.taverna.tavlang.tools.validate.Validate;
import com.google.common.base.Joiner;
@@ -296,6 +297,7 @@ public class CommandLineTool {
// Command for validation
@Command(name = "validate", description = "validate the given workflow")
public static class CommandValidate extends TvnLangTool{
+
@Option(name = { "-l", "--log" }, description = "Specify the file name where results should be stored ([some dir]/log.txt)")
public String file;
@@ -308,13 +310,18 @@ public class CommandLineTool {
@Override
public void execute() {
- File f = new File(file);
+ if(file!=null){
+ File f = new File(file);
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ return;
+ }
+
}
+
Validate validate = new Validate(toValidate, file);
@@ -338,13 +345,20 @@ public class CommandLineTool {
@Override
public void execute() {
// TODO Auto-generated method stub
- File f = new File(file);
+ if(file!=null){
+ File f = new File(file);
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ return;
+ }
+
}
+
+ GetWfStat stat = new GetWfStat(files, file);
+
}
}
[04/23] incubator-taverna-language git commit: Unwanted print removed
Posted by st...@apache.org.
Unwanted print removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/7bdae42d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/7bdae42d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/7bdae42d
Branch: refs/heads/master
Commit: 7bdae42d30b99adb4601effcbc8b6725b9e6d936
Parents: 8aaa7f2
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sat Jun 27 22:37:24 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sat Jun 27 22:37:24 2015 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/taverna/tavlang/CommandLineTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7bdae42d/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 345f0b5..e3f9ec2 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -66,7 +66,7 @@ public class CommandLineTool {
};
public void parse(String... args) {
- System.out.println("$ tavlang " + Joiner.on(" ").join(args));
+// System.out.println("$ tavlang " + Joiner.on(" ").join(args));
TvnLangTool command = parser().parse(args);
command.execute();
System.out.println();
[17/23] incubator-taverna-language git commit: Validation - verbose
mode, file save, integrated into conversion
Posted by st...@apache.org.
Validation - verbose mode, file save, integrated into conversion
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/fef98303
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/fef98303
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/fef98303
Branch: refs/heads/master
Commit: fef98303b5bd1da3ba19a070c80c76854cec5974
Parents: bb795c3
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 01:22:16 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 01:22:16 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 11 ++++-
.../tavlang/tools/validate/Validate.java | 48 ++++++++++++++------
2 files changed, 44 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/fef98303/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index d040ae0..3efa17e 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -213,6 +213,12 @@ public class CommandLineTool {
@Override
public void execute() {
+
+ //Validate before convert
+ if(validate){
+ Validate validate = new Validate(files, null, false);
+ }
+
if (Filetypes.isRo) {
try {
new ToRobundle(files, Optional.getOutFile());
@@ -301,6 +307,9 @@ public class CommandLineTool {
@Option(name = { "-l", "--log" }, description = "Specify the file name where results should be stored ([some dir]/log.txt)")
public String file;
+ @Option(name = {"-v", "--verbose"}, description = "Verbose mode")
+ public boolean verbose;
+
// @Inject
// Optional optional = new Optional();
@@ -311,7 +320,7 @@ public class CommandLineTool {
@Override
public void execute() {
- Validate validate = new Validate(toValidate, file);
+ Validate validate = new Validate(toValidate, file, verbose);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/fef98303/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
index 5cb0c47..8f3fc4f 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
@@ -39,13 +39,26 @@ import org.apache.taverna.scufl2.validation.correctness.ReportCorrectnessValidat
public class Validate {
private String logfile;
+ private String nonVerbose = "";
private String finalrep = "";
+ private boolean verbose;
+
- public Validate(List<String> files, String file) {
+ public Validate(List<String> files, String file, boolean verbose) {
+ this.verbose = verbose;
this.logfile = file;
+ System.out.println("Validation started....");
for (String f : files) {
+ System.out.println("Validating " + f);
File wfile = new File(f);
read(wfile);
+
+ }
+ System.out.println("Validation completed.......");
+
+
+ if (this.logfile != null) {
+ saveToLog(this.finalrep);
}
}
@@ -53,9 +66,7 @@ public class Validate {
WorkflowBundleIO io = new WorkflowBundleIO();
try {
this.finalrep += validate(io.readBundle(file, null), file.getName());
- if (this.logfile != null) {
- saveToLog(finalrep);
- }
+
} catch (ReaderException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -68,21 +79,22 @@ public class Validate {
}
public String validate(WorkflowBundle wfb, String file) {
- System.out.println("Validation started...");
+
StringBuilder report2 = new StringBuilder();
- CorrectnessValidationListener r = new ReportCorrectnessValidationListener();
- CorrectnessValidator v = new CorrectnessValidator();
- r = v.validate(wfb);
- String report = r.toString().replace(
+ CorrectnessValidationListener correctnessValidationListener = new ReportCorrectnessValidationListener();
+ CorrectnessValidator correctnessValidator = new CorrectnessValidator();
+ correctnessValidationListener = correctnessValidator.validate(wfb);
+ String report = correctnessValidationListener.toString().replace(
"ReportCorrectnessValidationListener [", "");
String[] sections = report.split(", ");
- HashMap<String, String> map = new HashMap<>();
- System.out.println("Validation completed.......");
-
- if (!r.detectedProblems()){
+
+
+ boolean detect = correctnessValidationListener.detectedProblems();
+ if (!detect){
report2.append("The workflow " + file + " has no errors. \n\n");
+ this.nonVerbose = "The workflow " + file + " has no errors. \n";
}
@@ -102,8 +114,15 @@ public class Validate {
}
report2.append("--------------------------------------------------------------------------------- \n\n");
- if(r.detectedProblems())
+ if(detect){
+ System.out.println("The workflow bundle has following problems: \n"+report2.toString());
+ }
+
+ if(verbose){
System.out.println(report2.toString());
+ }else{
+ System.out.println(this.nonVerbose);
+ }
return report2.toString();
@@ -118,6 +137,7 @@ public class Validate {
blw.write(s);
blw.close();
logwriter.close();
+ System.out.println("Results were saved into " + logFile.getPath());
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
[16/23] incubator-taverna-language git commit: Input -> output
Posted by st...@apache.org.
Input -> output
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/bb795c35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/bb795c35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/bb795c35
Branch: refs/heads/master
Commit: bb795c35ad1758d9251e13be37e556a53f6a6d56
Parents: 962f19c
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 21:07:15 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 21:07:15 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bb795c35/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index f77f0ad..63f0024 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -140,7 +140,7 @@ public class GetWfStat {
this.str_verb.append(" |--> Number of Output Ports = " + wrf.getOutputPorts().size()+"\n");
if(this.verbose && wrf.getOutputPorts().size()!=0){
- this.str_verb.append(" | |--> Input Ports\n");
+ this.str_verb.append(" | |--> Output Ports\n");
for(OutputPort o_port : wrf.getOutputPorts()){
this.str_verb.append(" | |--> " + o_port.toString()+"\n");
}
[10/23] incubator-taverna-language git commit: stat
Posted by st...@apache.org.
stat
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/131f02b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/131f02b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/131f02b8
Branch: refs/heads/master
Commit: 131f02b8695f658ea675de10cc5570255951d905
Parents: 20c25bb
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:58:15 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:58:15 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/stats/GetWfStat.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/131f02b8/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 4d8eb98..26b6f95 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -3,6 +3,7 @@ package org.apache.taverna.tavlang.tools.stats;
import java.io.File;
import java.io.IOException;
+import java.util.List;
import org.apache.taverna.scufl2.api.common.NamedSet;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
@@ -14,9 +15,19 @@ public class GetWfStat {
public Workflow wflow;
public NamedSet<Workflow> set;
+ public String logFile;
- public GetWfStat(){
-
+ //If given file is a workflow file
+ public GetWfStat(List<String> wf_files, String log){
+ this.logFile = log;
+ for(String files : wf_files){
+ File f = new File(files);
+ if(f.isFile()){
+ this.read(f);
+ }else{
+ System.out.println("Error reading the file " + f.getName());
+ }
+ }
}
public void read(File file){
[21/23] incubator-taverna-language git commit: File save - print
output
Posted by st...@apache.org.
File save - print output
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/aa1ef161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/aa1ef161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/aa1ef161
Branch: refs/heads/master
Commit: aa1ef1613cfb5f6ca65a229dd883bbe52d24bac8
Parents: ab341d7
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 09:33:12 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 09:33:12 2015 +0530
----------------------------------------------------------------------
.../org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java | 1 +
.../java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/aa1ef161/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
index c9d763a..f93aadc 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
@@ -90,6 +90,7 @@ public class ProcessorNames {
bw.write(sb.toString());
bw.close();
fw.close();
+ System.out.println("Results were saved into " + file2);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/aa1ef161/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java
index d27e024..ddff2ab 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ServiceTypes.java
@@ -104,6 +104,7 @@ public class ServiceTypes {
bw.write(sb.toString());
bw.close();
fw.close();
+ System.out.println("Results were saved into " + save);
}
}
[22/23] incubator-taverna-language git commit: Merge remote-tracking
branch 'menaka/new_features2'
Posted by st...@apache.org.
Merge remote-tracking branch 'menaka/new_features2'
This closes #10.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/1a228178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/1a228178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/1a228178
Branch: refs/heads/master
Commit: 1a228178b6af825ff329a99e17a060dad494fa97
Parents: 3446ea3 aa1ef16
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jul 2 17:46:51 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jul 2 17:46:51 2015 +0100
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 60 ++++--
.../org/apache/taverna/tavlang/tools/Tools.java | 1 -
.../tavlang/tools/convert/Scufl2Convert.java | 3 +-
.../taverna/tavlang/tools/convert/ToJson.java | 2 +-
.../tavlang/tools/convert/ToRobundle.java | 1 -
.../tavlang/tools/inspect/ProcessorNames.java | 40 ++--
.../tavlang/tools/inspect/ServiceTypes.java | 1 +
.../taverna/tavlang/tools/stats/GetWfStat.java | 195 +++++++++++++++++++
.../tavlang/tools/validate/Validate.java | 55 ++++--
9 files changed, 307 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
[13/23] incubator-taverna-language git commit: Apache llicense header
Posted by st...@apache.org.
Apache llicense header
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/9ad21fa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/9ad21fa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/9ad21fa5
Branch: refs/heads/master
Commit: 9ad21fa525b11d4544b02d90875d05746f85d806
Parents: 63203f7
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 18:28:27 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 18:28:27 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/stats/GetWfStat.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/9ad21fa5/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 0ea728d..bf127c3 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -1,5 +1,24 @@
package org.apache.taverna.tavlang.tools.stats;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.BufferedWriter;
import java.io.File;
[15/23] incubator-taverna-language git commit: File detection modified
Posted by st...@apache.org.
File detection modified
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/962f19c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/962f19c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/962f19c5
Branch: refs/heads/master
Commit: 962f19c5cd552622feb1fbccc713377b341edbc4
Parents: dff1243
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 19:57:49 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 19:57:49 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 24 +-------------------
1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/962f19c5/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index da84803..d040ae0 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -310,18 +310,7 @@ public class CommandLineTool {
@Override
public void execute() {
- if(file!=null){
- File f = new File(file);
-
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
- return;
- }
-
- }
-
+
Validate validate = new Validate(toValidate, file);
@@ -348,17 +337,6 @@ public class CommandLineTool {
@Override
public void execute() {
// TODO Auto-generated method stub
- if(file!=null){
- File f = new File(file);
-
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
- return;
- }
-
- }
GetWfStat stat = new GetWfStat(files, file, verbose);
[08/23] incubator-taverna-language git commit: Option removed
Posted by st...@apache.org.
Option removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/81b720e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/81b720e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/81b720e0
Branch: refs/heads/master
Commit: 81b720e00d415a5cfb33c68ae34d4ab5e21327f2
Parents: 95e54a7
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:38:32 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:38:32 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/tavlang/CommandLineTool.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/81b720e0/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 4a50489..cc9b04e 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -325,14 +325,14 @@ public class CommandLineTool {
//Command for getting workflow stats
@Command (name = "stats", description = "Shows the workflow statistics")
public static class CommandStat extends TvnLangTool{
-
- @Option(name={"-wf", "--workflow"}, description ="Specify the input is workflow file or bundle")
- public boolean isWf;
+//
+// @Option(name={"-wf", "--workflow"}, description ="Specify the input is workflow file or bundle")
+// public boolean isWf;
@Option(name = {"-l", "--log"}, description="Save the workflow statictics in a file")
public String file;
- @Arguments(usage="option> <input files", description = "Enter the workflow bundles/ files")
+ @Arguments(usage="input files", description = "Enter the workflow bundles")
public List<String> files;
@Override
[05/23] incubator-taverna-language git commit: Save file - error
detection added
Posted by st...@apache.org.
Save file - error detection added
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/bebd11b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/bebd11b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/bebd11b4
Branch: refs/heads/master
Commit: bebd11b4be0614b5b8b460aad811d59b85a1a6ad
Parents: 7bdae42
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sun Jun 28 01:43:41 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sun Jun 28 01:43:41 2015 +0530
----------------------------------------------------------------------
.../org/apache/taverna/tavlang/CommandLineTool.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bebd11b4/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index e3f9ec2..cda9ba7 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -26,7 +26,10 @@ import io.airlift.airline.Command;
import io.airlift.airline.Help;
import io.airlift.airline.Option;
+import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.List;
import javax.inject.Inject;
@@ -304,10 +307,15 @@ public class CommandLineTool {
@Override
public void execute() {
- // TODO Auto-generated method stub
- System.out.println("Invalid argument....");
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
+ File f = new File(file);
+
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ }
+ Validate validate = new Validate(toValidate, file);
+
}
[03/23] incubator-taverna-language git commit: Input file type
detection restored
Posted by st...@apache.org.
Input file type detection restored
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/8aaa7f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/8aaa7f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/8aaa7f27
Branch: refs/heads/master
Commit: 8aaa7f27b6043669812dd20ec04fd57d4ec9f7eb
Parents: ec51e35
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jun 25 22:51:17 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jun 25 22:51:17 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/convert/Scufl2Convert.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8aaa7f27/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
index d7267a3..cefdd67 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
@@ -167,11 +167,11 @@ public class Scufl2Convert{
public void convertFile(File t2File, File outFile){
//Check weather the input files are in valid format...!!!
-// String ext = FilenameUtils.getExtension(t2File.getName());
-// if(!ext.equals("t2flow")||!ext.equals("wfbundle")){
-// System.err.println("Invalid input file format...!!!");
-// return;
-// }
+ String ext = FilenameUtils.getExtension(t2File.getName());
+ if(!ext.equalsIgnoreCase("t2flow")&&!ext.equalsIgnoreCase("wfbundle")){
+ System.err.println("Invalid input file format...!!!");
+ return;
+ }
WorkflowBundleIO wfbio = new WorkflowBundleIO();
String filename = t2File.getName();
[14/23] incubator-taverna-language git commit: Stats completed
Posted by st...@apache.org.
Stats completed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/dff1243f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/dff1243f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/dff1243f
Branch: refs/heads/master
Commit: dff1243fd527b76aa9faf06208fa71960901e979
Parents: 9ad21fa
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 19:57:11 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 19:57:11 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/stats/GetWfStat.java | 124 ++++++++++++-------
1 file changed, 81 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/dff1243f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index bf127c3..f77f0ad 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -42,7 +42,8 @@ public class GetWfStat {
private NamedSet<Workflow> set;
private String logFile;
private boolean verbose;
- private StringBuilder str;
+ private StringBuilder str_verb = new StringBuilder();
+ private StringBuilder str_nverb = new StringBuilder();
//If given file is a workflow file
@@ -54,73 +55,101 @@ public class GetWfStat {
File f = new File(files);
if(f.isFile()){
this.read(f);
+
}else{
System.err.println("Error reading the file " + f.getName());
}
}
+
+ this.isVerbose();
+
+ if(log!=null){
+ this.writefile(this.str_verb.toString(), this.logFile);
+ }
}
-
+ //Read the workflow file and extract the resources.
+ //And append them to a String builder
public void read(File file){
WorkflowBundleIO io = new WorkflowBundleIO();
try {
WorkflowBundle wf = io.readBundle(file, null);
this.set = wf.getWorkflows();
- System.out.println("Statistics of the workflow bundle: " + wf.getName());
+
+ //String to be written to a file.
+ this.str_nverb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
+ this.str_verb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
+
for(Workflow wrf : set){
//TODO :- Take each type of resource and make a system to view them to the user.
- System.out.println("Name of the workflow = " + wrf.getName());
- System.out.println(" |--> Number of Processors = " + wrf.getProcessors().size());
+ String name = "Name of the workflow = " + wrf.getName();
+ this.str_verb.append(name + "\n");
+ this.str_nverb.append(name + "\n");
+
+
+ String noP = " |--> Number of Processors = " + wrf.getProcessors().size();
+ this.str_verb.append(noP + "\n");
+ this.str_nverb.append(noP + "\n");
if(this.verbose && wrf.getProcessors().size()!=0){
- System.out.println(" | |--> Processors: ");
+ this.str_verb.append(" | |--> Processors: " + "\n");
+
for(Processor p : wrf.getProcessors()){
- System.out.println(" | |--> " + p.getName());
+ this.str_verb.append(" | |--> " + p.getName() + "\n");
}
- System.out.println(" |");
+ this.str_verb.append(" |" + "\n");
}
- System.out.println(" |--> Number of Data Links = " + wrf.getDataLinks().size());
+ this.str_verb.append(" |--> Number of Data Links = " + wrf.getDataLinks().size() + "\n");
+ this.str_nverb.append(" |--> Number of Data Links = " + wrf.getDataLinks().size() + "\n");
if(this.verbose && wrf.getDataLinks().size()!=0){
- System.out.println(" | |--> Data Links");
+ this.str_verb.append(" | |--> Data Links" + "\n");
+
for(DataLink link : wrf.getDataLinks()){
- System.out.println(" | |--> " + link);
+ this.str_verb.append(" | |--> " + link + "\n");
}
- System.out.println(" |");
+ this.str_verb.append(" |" + "\n");
}
- System.out.println(" |--> Number of Control Links = " + wrf.getControlLinks().size());
+ this.str_nverb.append(" |--> Number of Control Links = " + wrf.getControlLinks().size() + "\n");
+ this.str_verb.append(" |--> Number of Control Links = " + wrf.getControlLinks().size() + "\n");
+
if(this.verbose && wrf.getControlLinks().size()!=0){
- System.out.println(" | |--> Control Links");
+ this.str_verb.append(" | |--> Control Links\n");
for(ControlLink link : wrf.getControlLinks()){
- System.out.println(" | |--> " + link);
+ this.str_verb.append(" | |--> " + link + "\n");
}
- System.out.println(" |");
+ this.str_verb.append(" |\n");
}
- System.out.println(" |--> Number of Input ports = " + wrf.getInputPorts().size());
+ this.str_nverb.append(" |--> Number of Input ports = " + wrf.getInputPorts().size()+"\n");
+ this.str_verb.append(" |--> Number of Input ports = " + wrf.getInputPorts().size()+"\n");
+
if(this.verbose && wrf.getInputPorts().size()!=0){
- System.out.println(" | |--> Input Ports");
+ this.str_verb.append(" | |--> Input Ports\n");
for(InputPort iport : wrf.getInputPorts()){
- System.out.println(" | |--> " + iport.toString());
+ this.str_verb.append(" | |--> " + iport.toString()+"\n");
}
- System.out.println(" |");
+ this.str_verb.append(" |\n");
}
-
- System.out.println(" |--> Number of Output Ports = " + wrf.getOutputPorts().size());
+
+ this.str_nverb.append(" |--> Number of Output Ports = " + wrf.getOutputPorts().size()+"\n");
+ this.str_verb.append(" |--> Number of Output Ports = " + wrf.getOutputPorts().size()+"\n");
if(this.verbose && wrf.getOutputPorts().size()!=0){
- System.out.println(" | |--> Input Ports");
+ this.str_verb.append(" | |--> Input Ports\n");
for(OutputPort o_port : wrf.getOutputPorts()){
- System.out.println(" | |--> " + o_port.toString());
+ this.str_verb.append(" | |--> " + o_port.toString()+"\n");
}
- System.out.println("");
+
+ this.str_verb.append("\n");
}
- System.out.println("");
+ this.str_nverb.append("\n");
+ this.str_verb.append("\n");
}
} catch (ReaderException | IOException e) {
@@ -129,27 +158,36 @@ public class GetWfStat {
}
}
+
+ //Saving the output into a log
public void writefile(String report, String url){
- File file = new File(url);
-
- if(!file.isFile()){
- System.err.println("Error in writing the log file...");
- }
+ File file = new File(url);
+
+ if(!file.isFile()){
+ System.err.println("Error in writing the log file...");
+ }
+
+ FileWriter writer;
+ BufferedWriter bfw;
+ try {
+ writer = new FileWriter(file);
+ bfw = new BufferedWriter(writer);
+ bfw.write(report);
+ bfw.close();
+ writer.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- FileWriter writer;
- BufferedWriter bfw;
- try {
- writer = new FileWriter(file);
- bfw = new BufferedWriter(writer);
- bfw.write(report);
- bfw.close();
- writer.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ }
+ public void isVerbose(){
+ if(verbose)
+ System.out.println(this.str_verb.toString());
+ else
+ System.out.println(this.str_nverb.toString());
}
[06/23] incubator-taverna-language git commit: Workflow stats -
command added
Posted by st...@apache.org.
Workflow stats - command added
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/41ddbd65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/41ddbd65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/41ddbd65
Branch: refs/heads/master
Commit: 41ddbd65ce97041e13418487c0bb03a560e4e060
Parents: bebd11b
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:22:46 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:22:46 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 38 +++++++++++++++++---
1 file changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/41ddbd65/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index cda9ba7..4a50489 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -56,11 +56,12 @@ public class CommandLineTool {
CliBuilder<TvnLangTool> build = Cli.<TvnLangTool> builder("tavlang")
.withDescription("Convert, manage workflows")
.withDefaultCommand(HelpCommand.class)
- .withCommand(CommandConvert.class)
- .withCommand(HelpCommand.class)
- .withCommand(CommandInspect.class)
- .withCommand(CommandValidate.class)
- .withCommand(CommandVersion.class);
+ .withCommand(CommandConvert.class) // Conversion
+ .withCommand(HelpCommand.class) // Help
+ .withCommand(CommandInspect.class) // Inspect
+ .withCommand(CommandValidate.class) // Validate
+ .withCommand(CommandVersion.class) // Version
+ .withCommand(CommandStat.class); // Statistics
return build.build();
}
@@ -320,5 +321,32 @@ public class CommandLineTool {
}
}
+
+ //Command for getting workflow stats
+ @Command (name = "stats", description = "Shows the workflow statistics")
+ public static class CommandStat extends TvnLangTool{
+
+ @Option(name={"-wf", "--workflow"}, description ="Specify the input is workflow file or bundle")
+ public boolean isWf;
+
+ @Option(name = {"-l", "--log"}, description="Save the workflow statictics in a file")
+ public String file;
+
+ @Arguments(usage="option> <input files", description = "Enter the workflow bundles/ files")
+ public List<String> files;
+
+ @Override
+ public void execute() {
+ // TODO Auto-generated method stub
+ File f = new File(file);
+
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ }
+ }
+
+ }
}
[12/23] incubator-taverna-language git commit: Stats complete - todo
- log file
Posted by st...@apache.org.
Stats complete - todo - log file
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/63203f72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/63203f72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/63203f72
Branch: refs/heads/master
Commit: 63203f724a5fd4931a0d19e106c5e2abc8c64435
Parents: aeb2b2e
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 11:24:46 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 11:24:46 2015 +0530
----------------------------------------------------------------------
.../taverna/tavlang/tools/stats/GetWfStat.java | 102 +++++++++++++++++--
1 file changed, 95 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/63203f72/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 26b6f95..0ea728d 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -1,43 +1,107 @@
package org.apache.taverna.tavlang.tools.stats;
+import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.util.List;
import org.apache.taverna.scufl2.api.common.NamedSet;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.ControlLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.Processor;
import org.apache.taverna.scufl2.api.core.Workflow;
import org.apache.taverna.scufl2.api.io.ReaderException;
import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.port.InputPort;
+import org.apache.taverna.scufl2.api.port.OutputPort;
public class GetWfStat {
- public Workflow wflow;
- public NamedSet<Workflow> set;
- public String logFile;
+ private NamedSet<Workflow> set;
+ private String logFile;
+ private boolean verbose;
+ private StringBuilder str;
+
//If given file is a workflow file
- public GetWfStat(List<String> wf_files, String log){
+ public GetWfStat(List<String> wf_files, String log, boolean verbose){
this.logFile = log;
+ this.verbose = verbose;
+
for(String files : wf_files){
File f = new File(files);
if(f.isFile()){
this.read(f);
}else{
- System.out.println("Error reading the file " + f.getName());
+ System.err.println("Error reading the file " + f.getName());
}
}
}
+
public void read(File file){
WorkflowBundleIO io = new WorkflowBundleIO();
try {
WorkflowBundle wf = io.readBundle(file, null);
this.set = wf.getWorkflows();
-
+ System.out.println("Statistics of the workflow bundle: " + wf.getName());
for(Workflow wrf : set){
- System.out.println(wrf.getInputPorts());
+ //TODO :- Take each type of resource and make a system to view them to the user.
+ System.out.println("Name of the workflow = " + wrf.getName());
+ System.out.println(" |--> Number of Processors = " + wrf.getProcessors().size());
+
+ if(this.verbose && wrf.getProcessors().size()!=0){
+ System.out.println(" | |--> Processors: ");
+ for(Processor p : wrf.getProcessors()){
+ System.out.println(" | |--> " + p.getName());
+ }
+ System.out.println(" |");
+ }
+
+ System.out.println(" |--> Number of Data Links = " + wrf.getDataLinks().size());
+
+ if(this.verbose && wrf.getDataLinks().size()!=0){
+ System.out.println(" | |--> Data Links");
+ for(DataLink link : wrf.getDataLinks()){
+ System.out.println(" | |--> " + link);
+ }
+ System.out.println(" |");
+ }
+
+ System.out.println(" |--> Number of Control Links = " + wrf.getControlLinks().size());
+
+ if(this.verbose && wrf.getControlLinks().size()!=0){
+ System.out.println(" | |--> Control Links");
+ for(ControlLink link : wrf.getControlLinks()){
+ System.out.println(" | |--> " + link);
+ }
+ System.out.println(" |");
+ }
+
+ System.out.println(" |--> Number of Input ports = " + wrf.getInputPorts().size());
+
+ if(this.verbose && wrf.getInputPorts().size()!=0){
+ System.out.println(" | |--> Input Ports");
+ for(InputPort iport : wrf.getInputPorts()){
+ System.out.println(" | |--> " + iport.toString());
+ }
+ System.out.println(" |");
+ }
+
+ System.out.println(" |--> Number of Output Ports = " + wrf.getOutputPorts().size());
+
+ if(this.verbose && wrf.getOutputPorts().size()!=0){
+ System.out.println(" | |--> Input Ports");
+ for(OutputPort o_port : wrf.getOutputPorts()){
+ System.out.println(" | |--> " + o_port.toString());
+ }
+ System.out.println("");
+ }
+
+ System.out.println("");
}
} catch (ReaderException | IOException e) {
@@ -45,5 +109,29 @@ public class GetWfStat {
e.printStackTrace();
}
}
+
+ public void writefile(String report, String url){
+
+ File file = new File(url);
+
+ if(!file.isFile()){
+ System.err.println("Error in writing the log file...");
+ }
+
+ FileWriter writer;
+ BufferedWriter bfw;
+ try {
+ writer = new FileWriter(file);
+ bfw = new BufferedWriter(writer);
+ bfw.write(report);
+ bfw.close();
+ writer.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+
}
[20/23] incubator-taverna-language git commit: Organized code
Posted by st...@apache.org.
Organized code
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/ab341d7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ab341d7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ab341d7f
Branch: refs/heads/master
Commit: ab341d7fd98041b85d0985454e8b7e272c30b27e
Parents: 29300ed
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 09:23:28 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 09:23:28 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 4 --
.../org/apache/taverna/tavlang/tools/Tools.java | 1 -
.../tavlang/tools/convert/Scufl2Convert.java | 1 -
.../tavlang/tools/convert/ToRobundle.java | 1 -
.../tavlang/tools/inspect/ProcessorNames.java | 39 ++++++++++----------
.../taverna/tavlang/tools/stats/GetWfStat.java | 4 +-
.../tavlang/tools/validate/Validate.java | 1 -
7 files changed, 21 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 97673bf..11c4032 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -26,10 +26,7 @@ import io.airlift.airline.Command;
import io.airlift.airline.Help;
import io.airlift.airline.Option;
-import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.List;
import javax.inject.Inject;
@@ -43,7 +40,6 @@ import org.apache.taverna.tavlang.tools.inspect.ServiceTypes;
import org.apache.taverna.tavlang.tools.stats.GetWfStat;
import org.apache.taverna.tavlang.tools.validate.Validate;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
/*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
index fb878fb..c708b3c 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
@@ -20,7 +20,6 @@ package org.apache.taverna.tavlang.tools;
*/
-import javax.print.attribute.standard.Media;
public class Tools {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
index cefdd67..8243d43 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
@@ -30,7 +30,6 @@ import org.apache.taverna.scufl2.api.io.ReaderException;
import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
import org.apache.taverna.scufl2.api.io.WriterException;
import org.apache.taverna.tavlang.tools.Tools.ConvertionTools;
-import org.apache.taverna.tavlang.tools.validate.Validate;
/*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
index 0b7a6a0..394f9ec 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
@@ -20,7 +20,6 @@ package org.apache.taverna.tavlang.tools.convert;
*/
-import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
index 8cbf989..c9d763a 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
@@ -1,5 +1,24 @@
package org.apache.taverna.tavlang.tools.inspect;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -23,26 +42,6 @@ import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
import org.apache.taverna.scufl2.api.profiles.Profile;
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/*
* list the processor names used in the workflow.
* Supported formats: .t2flow, .wfbundle
* */
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 885d3c8..9dcfa5a 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -77,8 +77,8 @@ public class GetWfStat {
this.set = wf.getWorkflows();
//String to be written to a file.
- this.str_nverb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
- this.str_verb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
+ this.str_nverb.append(">>> Statistics of the workflow bundle: " + file.getName() + " <<<\n");
+ this.str_verb.append(">>> Statistics of the workflow bundle: " + file.getName() + " <<<\n");
for(Workflow wrf : set){
//TODO :- Take each type of resource and make a system to view them to the user.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
index aa8ef5e..29220b7 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
@@ -23,7 +23,6 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.util.HashMap;
import java.util.List;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;