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/06/25 15:09:05 UTC

[3/5] incubator-taverna-language git commit: validation added

validation 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/1c0e93fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/1c0e93fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/1c0e93fe

Branch: refs/heads/master
Commit: 1c0e93fe139b80b892c388949751b7724d18f9db
Parents: 90551c0
Author: Menaka Madushanka <me...@gmail.com>
Authored: Wed Jun 24 19:23:44 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Wed Jun 24 19:23:44 2015 +0530

----------------------------------------------------------------------
 .../apache/taverna/tavlang/CommandLineTool.java    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/1c0e93fe/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 39db384..eb56801 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
@@ -42,6 +42,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.validate.Validate;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -257,20 +258,22 @@ public class CommandLineTool {
 	//Command for validation
 	@Command(name = "validate", description = "validate the given workflow")
 	public static class CommandValidate extends TvnLangTool{
-
-		@Inject
-		Optional optional = new Optional();
+		@Option(name = { "-l", "--log" }, description = "Specify the file name where results should be stored ([some dir]/log.txt)")
+		public String file;
 		
-		@Arguments(usage="<option> <input files> <output dir>", description="Validate the given workflow file/s")
+//		@Inject
+//		Optional optional = new Optional();
+
+//		@Arguments(usage = "<option> <input files> <output dir>", description = "Validate the given workflow file/s")
+		@Arguments(usage = "input files", description = "Validate the given workflow file/s")
 		public List<String> toValidate = Lists.newArrayList();
-		
+
 		@Override
 		public void execute() {
 			// TODO Auto-generated method stub
 			
+				Validate validate = new Validate(toValidate, file);
 		}
-		
 	}
 	
-	
 }