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 2016/02/19 18:40:43 UTC
[1/3] incubator-taverna-language git commit: TAVERNA-920 Force
jaxb-osgi dependency
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 0e08e3a53 -> 378425cb8
TAVERNA-920 Force jaxb-osgi dependency
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/745c1a46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/745c1a46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/745c1a46
Branch: refs/heads/master
Commit: 745c1a461cd8012281712683e3c47fdd01267a2b
Parents: 0e08e3a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Feb 19 17:15:59 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Feb 19 17:15:59 2016 +0000
----------------------------------------------------------------------
taverna-scufl2-ucfpackage/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/745c1a46/taverna-scufl2-ucfpackage/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/pom.xml b/taverna-scufl2-ucfpackage/pom.xml
index f099214..b30c993 100644
--- a/taverna-scufl2-ucfpackage/pom.xml
+++ b/taverna-scufl2-ucfpackage/pom.xml
@@ -28,6 +28,14 @@
<description>Adobe UCF compatible Package API, making a structured ZIP file with manifest</description>
<dependencies>
<dependency>
+ <!-- Avoid TAVERNA-920 namespace issue -->
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>${jaxb.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
[3/3] incubator-taverna-language git commit: Merge branch
'TAVERNA-919'
Posted by st...@apache.org.
Merge branch 'TAVERNA-919'
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/378425cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/378425cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/378425cb
Branch: refs/heads/master
Commit: 378425cb83217391896701e78f9d5a19ac83b476
Parents: 745c1a4 01f31a9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Feb 19 17:26:35 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Feb 19 17:26:35 2016 +0000
----------------------------------------------------------------------
.../apache/taverna/robundle/validator/RoValidator.java | 13 ++++++-------
.../taverna/robundle/validator/ValidatorTest.java | 12 ++----------
2 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-taverna-language git commit: TAVERNA-919 RoValidator
didn't close the bundle
Posted by st...@apache.org.
TAVERNA-919 RoValidator didn't close the bundle
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/01f31a97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/01f31a97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/01f31a97
Branch: refs/heads/master
Commit: 01f31a97cf4281b253cde3eea610520fe95495b0
Parents: 0e08e3a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Feb 19 17:22:00 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Feb 19 17:22:00 2016 +0000
----------------------------------------------------------------------
.../apache/taverna/robundle/validator/RoValidator.java | 13 ++++++-------
.../taverna/robundle/validator/ValidatorTest.java | 12 ++----------
2 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/01f31a97/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index 8d7a02a..b2bc7d3 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -54,7 +54,7 @@ import org.apache.taverna.robundle.manifest.PathMetadata;
public class RoValidator {
- private Path p;
+ private Path path;
//Store all aggregates to be checked
private List<PathMetadata> aggr;
@@ -76,20 +76,19 @@ public class RoValidator {
public RoValidator(Path path){
- this.p = path;
+ this.path = path;
this.validate();
}
public void validate(){
- Bundle bundle;
- try {
- bundle = Bundles.openBundle(this.p);
+ try (Bundle bundle = Bundles.openBundle(path)) {
+
Manifest manifest = bundle.getManifest();
this.aggr = manifest.getAggregates();
this.anno = manifest.getAnnotations();
- ZipFile zip = new ZipFile(new File(this.p.toString()));
+ ZipFile zip = new ZipFile(new File(path.toString()));
Enumeration<? extends ZipEntry> ent = zip.entries();
while(ent.hasMoreElements()){
ZipEntry entry = ent.nextElement();
@@ -145,7 +144,7 @@ public class RoValidator {
//This is ok and skip
}else{
if(!set.contains(s)){
- this.infoWarningList.add(p.toString());
+ this.infoWarningList.add(path.toString());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/01f31a97/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
index c826804..f37671b 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
@@ -18,20 +18,12 @@ package org.apache.taverna.robundle.validator;
* specific language governing permissions and limitations
* under the License.
*/
+import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
-import junit.framework.AssertionFailedError;
-
-import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
public class ValidatorTest {
@@ -42,6 +34,7 @@ public class ValidatorTest {
public void test() throws Exception{
path = Files.createTempFile("test", ".bundle.zip");
+ path.toFile().deleteOnExit();
Files.copy(getClass().getResourceAsStream("/workflowrun.bundle.zip"), path, StandardCopyOption.REPLACE_EXISTING);
RoValidator validator = new RoValidator(path);
@@ -52,7 +45,6 @@ public class ValidatorTest {
assertNotNull("Info Warnings List", r.getInfoWarnings_l());
Files.delete(path);
-
}
}