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/11 18:35:28 UTC
[09/31] incubator-taverna-language git commit: Pom -> dependencies
added
Pom -> dependencies 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/a2d712c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/a2d712c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/a2d712c2
Branch: refs/heads/master
Commit: a2d712c2b3c586cb900f590180f15df3297c419e
Parents: c63fdb2
Author: menaka121 <me...@gmail.com>
Authored: Tue Jun 9 01:47:53 2015 +0530
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 11 17:33:28 2015 +0100
----------------------------------------------------------------------
taverna-language-commandline/pom.xml | 28 ++++++++++++++++----
.../tavlang/commandline/CommandLineTool.java | 1 +
.../commandline/test/CommandLineTest.java | 12 ++++++---
3 files changed, 33 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a2d712c2/taverna-language-commandline/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/pom.xml b/taverna-language-commandline/pom.xml
index 26d1f6d..16d3593 100644
--- a/taverna-language-commandline/pom.xml
+++ b/taverna-language-commandline/pom.xml
@@ -33,7 +33,8 @@
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-scufl2-api</artifactId>
<version>${project.parent.version}</version>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>taverna-scufl2-wfbundle</artifactId>
@@ -53,6 +54,22 @@
<optional>true</optional>
</dependency>
-->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>taverna-robundle</artifactId>
@@ -66,10 +83,11 @@
</dependency>
<dependency>
- <groupId>io.airlift</groupId>
- <artifactId>airline</artifactId>
- <version>0.7</version>
- </dependency>
+ <groupId>io.airlift</groupId>
+ <artifactId>airline</artifactId>
+ <version>0.7</version>
+ </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a2d712c2/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java
index 17e3945..5201986 100644
--- a/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java
@@ -181,6 +181,7 @@ public class CommandLineTool {
public void execute(){
Tools to = new Tools();
+ System.out.println(filetypes.isTrue());
ConvertionTools t = ConvertionTools.valueOf(filetypes.isTrue());
t.run();
//
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a2d712c2/taverna-language-commandline/src/test/java/org/apache/tavlang/commandline/test/CommandLineTest.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/test/java/org/apache/tavlang/commandline/test/CommandLineTest.java b/taverna-language-commandline/src/test/java/org/apache/tavlang/commandline/test/CommandLineTest.java
index 2b72966..e97c715 100644
--- a/taverna-language-commandline/src/test/java/org/apache/tavlang/commandline/test/CommandLineTest.java
+++ b/taverna-language-commandline/src/test/java/org/apache/tavlang/commandline/test/CommandLineTest.java
@@ -28,7 +28,7 @@ public class CommandLineTest {
CommandLineTool commandLineTool = new CommandLineTool();
@Test
- public void test(){
+ public void testHelp(){
// Assert
commandLineTool.parse();
commandLineTool.parse("version");
@@ -37,9 +37,15 @@ public class CommandLineTest {
commandLineTool.parse("help", "inspect");
commandLineTool.parse("help", "validate");
commandLineTool.parse("help", "help");
+ }
+
+ @Test
+ public void testConvert(){
- commandLineTool.parse("convert", "-r", "-robundle", "-o", "/files/dir", "-i", "/files0/dir");
- commandLineTool.parse("convert", "-r", "-json", "-o", "/files/dir", "-i", "/files0/dir");
+// CommandLineTool tool = new CommandLineTool();
+ commandLineTool.parse("convert", "-r", "-wfbundle", "-o", "/files/dir", "-i", "/files0/dir");
+// CommandLineTool tool2 = new CommandLineTool();
+ commandLineTool.parse("convert", "-r", "-wfdesc", "-o", "/files/dir", "-i", "/files0/dir");
// commandLineTool.parse();
// commandLineTool.parse();
// commandLineTool.parse();