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 2018/01/11 18:42:28 UTC
[1/6] incubator-taverna-language git commit: TAVERNA-1027: Avoid
app:// for Jena
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 63a168963 -> 304af94cd
TAVERNA-1027: Avoid app:// for Jena
.. by making a fake file:/// URI instead without the UUID
As Jena would fail with ERR_RESOLVING_AGAINST_MALFORMED_BASE
not recognising app:// from https://www.w3.org/TR/app-uri/
as a valid URL scheme
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/cb45105e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/cb45105e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/cb45105e
Branch: refs/heads/master
Commit: cb45105e7be1ca53eae3818bdaf9c82968d3a0e4
Parents: d9552b6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 5 15:59:32 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 5 15:59:32 2018 +0000
----------------------------------------------------------------------
.../manifest/combine/CombineManifest.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/cb45105e/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
index 0594f4e..13fa452 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
@@ -237,11 +237,21 @@ public class CombineManifest {
private static Model parseRDF(Path metadata) throws IOException {
Model model = createDefaultModel();
try (InputStream in = newInputStream(metadata)) {
- read(model, in, metadata.toUri().toASCIIString(), RDFXML);
+ // TAVERNA-1027: Avoid Jena error over non-IANA URI scheme app://
+ read(model, in, fakeFileURI(metadata), RDFXML);
}
return model;
}
+ private static String fakeFileURI(Path path) {
+ return fakeFileURI(path.toAbsolutePath().toUri());
+ }
+
+ private static String fakeFileURI(URI uri) {
+ // Assume path starts with "/"
+ return "file://" + uri.getPath();
+ }
+
protected static void setPrefixMapper(Marshaller marshaller) {
boolean setPrefixMapper = false;
@@ -330,6 +340,7 @@ public class CombineManifest {
Model metadata;
try {
metadata = parseRDF(metadataRdf);
+ metadata.write(System.out, "turtle");
} catch (IOException e) {
logger.log(WARNING, "Can't read " + metadataRdf, e);
return;
@@ -339,9 +350,11 @@ public class CombineManifest {
}
for (URI about : bundleSubjects()) {
- Resource resource = metadata.getResource(about.toString());
- if (!metadata.containsResource(resource))
+ Resource resource = metadata.getResource(fakeFileURI(about));
+ if (!metadata.containsResource(resource)) {
+ System.out.println("Nothing known about " + resource);
continue;
+ }
PathAnnotation ann = new PathAnnotation();
ann.setAbout(manifest.relativeToBundleRoot(about));
[4/6] incubator-taverna-language git commit: Merge branch 'master'
into TAVERNA-1027
Posted by st...@apache.org.
Merge branch 'master' into TAVERNA-1027
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/658f257c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/658f257c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/658f257c
Branch: refs/heads/master
Commit: 658f257c0b8cd2eee3490f8a2d15c2287a44c144
Parents: cb45105 bbcee92
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 9 23:53:44 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 9 23:53:44 2018 +0000
----------------------------------------------------------------------
taverna-scufl2-api/pom.xml | 13 ++++++++++++-
.../org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd | 2 +-
taverna-scufl2-scufl/pom.xml | 4 ++--
taverna-scufl2-t2flow/pom.xml | 4 ++--
.../scufl2/translator/t2flow/xsd/componentactivity.xsd | 4 ++--
.../translator/t2flow/xsd/externaltoolactivity.xsd | 4 ++--
.../translator/t2flow/xsd/interactionactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/restactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/t2activities.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/t2annotations.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/xpathactivity.xsd | 6 +++---
.../resources/semantic_annotations__eclipse.t2flow | 4 ++--
taverna-scufl2-ucfpackage/pom.xml | 6 +++---
taverna-scufl2-wfbundle/pom.xml | 4 ++--
.../org/apache/taverna/scufl2/rdfxml/roevo-test.xml | 2 +-
15 files changed, 40 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[5/6] incubator-taverna-language git commit: Merge branch 'master'
into TAVERNA-1027
Posted by st...@apache.org.
Merge branch 'master' into TAVERNA-1027
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/ac38bd99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ac38bd99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ac38bd99
Branch: refs/heads/master
Commit: ac38bd9938b30719544345bae3aac17c360b44d5
Parents: 658f257 63a1689
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 11 15:56:27 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 11 15:56:27 2018 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] incubator-taverna-language git commit: jaxen/jaxen now is an
OSGi bundle
Posted by st...@apache.org.
jaxen/jaxen now is an OSGi bundle
So no need for com.springsource.org.jaxen
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/bbcee927
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/bbcee927
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/bbcee927
Branch: refs/heads/master
Commit: bbcee927b4e95e337b800311c9f1170f4de21605
Parents: 5d755a6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 9 23:44:31 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 9 23:44:31 2018 +0000
----------------------------------------------------------------------
taverna-scufl2-scufl/pom.xml | 4 ++--
taverna-scufl2-t2flow/pom.xml | 4 ++--
taverna-scufl2-ucfpackage/pom.xml | 6 +++---
taverna-scufl2-wfbundle/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bbcee927/taverna-scufl2-scufl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/pom.xml b/taverna-scufl2-scufl/pom.xml
index 6b5cc81..f0c50c7 100644
--- a/taverna-scufl2-scufl/pom.xml
+++ b/taverna-scufl2-scufl/pom.xml
@@ -85,8 +85,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jaxen</groupId>
- <artifactId>com.springsource.org.jaxen</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bbcee927/taverna-scufl2-t2flow/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/pom.xml b/taverna-scufl2-t2flow/pom.xml
index 0e2a0cf..396b41c 100644
--- a/taverna-scufl2-t2flow/pom.xml
+++ b/taverna-scufl2-t2flow/pom.xml
@@ -148,8 +148,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jaxen</groupId>
- <artifactId>com.springsource.org.jaxen</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bbcee927/taverna-scufl2-ucfpackage/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/pom.xml b/taverna-scufl2-ucfpackage/pom.xml
index 976d299..c862117 100644
--- a/taverna-scufl2-ucfpackage/pom.xml
+++ b/taverna-scufl2-ucfpackage/pom.xml
@@ -48,8 +48,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jaxen</groupId>
- <artifactId>com.springsource.org.jaxen</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
@@ -64,7 +64,7 @@
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <comments>The package uk.org.taverna.scul2.ucfpackage.impl.odfdom
+ <comments>The package org.apache.taverna.scufl2.ucfpackage.impl.odfdom
contains a patched subset of ODFDOM 0.8.6 -
http://odftoolkit.org/projects/odfdom/pages/Home
Copyright 2008, 2010 Oracle and/or its affiliates.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bbcee927/taverna-scufl2-wfbundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/pom.xml b/taverna-scufl2-wfbundle/pom.xml
index b7efe33..131d056 100644
--- a/taverna-scufl2-wfbundle/pom.xml
+++ b/taverna-scufl2-wfbundle/pom.xml
@@ -88,8 +88,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jaxen</groupId>
- <artifactId>com.springsource.org.jaxen</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
[2/6] incubator-taverna-language git commit: uk.org.taverna ->
org.apache.taverna
Posted by st...@apache.org.
uk.org.taverna -> org.apache.taverna
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/5d755a68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/5d755a68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/5d755a68
Branch: refs/heads/master
Commit: 5d755a68706fcdbc3782918868b266b781146ebf
Parents: 6a0421e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 9 23:32:36 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 9 23:40:07 2018 +0000
----------------------------------------------------------------------
.../resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd | 2 +-
.../taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/externaltoolactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/interactionactivity.xsd | 4 ++--
.../taverna/scufl2/translator/t2flow/xsd/restactivity.xsd | 4 ++--
.../taverna/scufl2/translator/t2flow/xsd/t2activities.xsd | 4 ++--
.../taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd | 4 ++--
.../taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd | 6 +++---
.../src/test/resources/semantic_annotations__eclipse.t2flow | 4 ++--
.../resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml | 2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd
index 92daa62..b463d31 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd
@@ -24,7 +24,7 @@
<xs:annotation>
<xs:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
<jxb:globalBindings />
<jxb:schemaBindings>
<jxb:package name="org.apache.taverna.scufl2.xml" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd
index e55d6db..091d31e 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd
@@ -27,9 +27,9 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
- <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.interaction.jaxb"
+ <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.interaction.jaxb"
/> </jxb:schemaBindings> -->
</xsd:appinfo>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd
index 55a3a86..1d9b8f8 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd
@@ -26,10 +26,10 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
<jxb:schemaBindings>
- <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.externalTool.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.externalTool.jaxb" />
</jxb:schemaBindings>
</xsd:appinfo>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd
index e1a6b16..7699fa0 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd
@@ -27,9 +27,9 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
- <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.interaction.jaxb"
+ <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.interaction.jaxb"
/> </jxb:schemaBindings> -->
</xsd:appinfo>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd
index 7eb4e42..c22f5d5 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd
@@ -26,11 +26,11 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
<!--
<jxb:schemaBindings>
- <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.rest.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.rest.jaxb" />
</jxb:schemaBindings>
-->
</xsd:appinfo>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd
index ffd10c5..01d3940 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd
@@ -27,10 +27,10 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
<jxb:schemaBindings>
- <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.jaxb" />
</jxb:schemaBindings>
</xsd:appinfo>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd
index f56f228..216d332 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd
@@ -25,9 +25,9 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
- <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.annotations.jaxb"
+ <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.annotations.jaxb"
/> </jxb:schemaBindings> -->
</xsd:appinfo>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd
index 3f2a875..dcd0ca4 100644
--- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd
+++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd
@@ -26,9 +26,9 @@ under the License.
<xsd:annotation>
<xsd:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
+ <!-- -->
- <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.rest.jaxb"
+ <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.rest.jaxb"
/> </jxb:schemaBindings> -->
</xsd:appinfo>
</xsd:annotation>
@@ -65,4 +65,4 @@ under the License.
</xsd:sequence>
</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow b/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow
index f2d5e9c..91d7d66 100644
--- a/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow
+++ b/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow
@@ -18,7 +18,7 @@
* under the License.
-->
<workflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd "
+ xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd "
xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1"
producedBy="taverna-2.4.0SNAPSHOT">
<dataflow id="2d726ace-4635-4bd1-89d5-703a50c96c1a" role="top">
@@ -538,4 +538,4 @@ out = in;</script>
</annotation_chain>
</annotations>
</dataflow>
-</workflow>
\ No newline at end of file
+</workflow>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml b/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml
index 4b2415c..ed5a360 100644
--- a/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml
+++ b/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml
@@ -27,7 +27,7 @@
xmlns:dcterms="http://purl.org/dc/terms/" xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RoEvoDocument"
xml:base="http://example.com/test/base"
- xsi:schemaLocation="http://purl.org/wf4ever/roevo# ../../../../../../../main/resources/uk/org/taverna/scufl2/rdfxml/xsd/roevo.xsd">
+ xsi:schemaLocation="http://purl.org/wf4ever/roevo# ../../../../../../../main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd">
<VersionableResource rdf:about="v3">
<wasChangedBy>
<ChangeSpecification>
[6/6] incubator-taverna-language git commit: TAVERNA-1027: it's a
workaround for JENA-1462
Posted by st...@apache.org.
TAVERNA-1027: it's a workaround for JENA-1462
https://issues.apache.org/jira/browse/JENA-1462
This closes #37
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/304af94c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/304af94c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/304af94c
Branch: refs/heads/master
Commit: 304af94cd9c0b32b98e2b2a4cc988cb86fda793d
Parents: ac38bd9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 11 18:41:26 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 11 18:42:04 2018 +0000
----------------------------------------------------------------------
.../taverna/robundle/manifest/combine/CombineManifest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/304af94c/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
index 13fa452..2057253 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java
@@ -237,7 +237,10 @@ public class CombineManifest {
private static Model parseRDF(Path metadata) throws IOException {
Model model = createDefaultModel();
try (InputStream in = newInputStream(metadata)) {
- // TAVERNA-1027: Avoid Jena error over non-IANA URI scheme app://
+ // TAVERNA-1027: Workaround for JENA-1462 -
+ // RO Bundle URIs like
+ // app://fad6e1b4-c0d1-45be-a978-7a570b62aa8d/manifest.xml
+ // can't be used as base URI when parsing RDF/XML
read(model, in, fakeFileURI(metadata), RDFXML);
}
return model;