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/12/07 04:13:37 UTC
incubator-taverna-language git commit: more Prov -> prov
Repository: incubator-taverna-language
Updated Branches:
refs/heads/no-ontologies 97739d674 -> 0d01d92ae
more Prov -> prov
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/0d01d92a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/0d01d92a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/0d01d92a
Branch: refs/heads/no-ontologies
Commit: 0d01d92ae2242b32cdb4e8f567a6dbea65f9e138
Parents: 97739d6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Dec 7 04:13:12 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Dec 7 04:13:12 2018 +0000
----------------------------------------------------------------------
.../taverna/scufl2/wfdesc/ROEvoSerializer.java | 10 +++---
.../taverna/scufl2/wfdesc/WfdescSerialiser.java | 34 ++++++++++----------
.../scufl2/wfdesc/TestRoEvoSerializer.java | 8 ++---
3 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0d01d92a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
index 80b092f..bc6a965 100644
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
+++ b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
@@ -25,7 +25,7 @@ package org.apache.taverna.scufl2.wfdesc;
import java.io.OutputStream;
-import org.apache.taverna.ro.vocabs.Prov;
+import org.apache.taverna.ro.vocabs.prov;
import org.apache.taverna.scufl2.api.annotation.Revision;
import org.apache.taverna.scufl2.api.core.Workflow;
import org.apache.taverna.scufl2.api.io.WriterException;
@@ -66,22 +66,22 @@ public class ROEvoSerializer {
private void addRevision(OntModel model,
Revision revision) {
OntClass VersionableResource = model.createClass("http://purl.org/wf4ever/roevo#VersionableResource");
- VersionableResource.addSuperClass(Prov.Entity);
+ VersionableResource.addSuperClass(prov.Entity);
Individual revisionResource = model.createIndividual(revision.getIdentifier().toASCIIString(),
VersionableResource);
- revisionResource.addRDFType(Prov.Entity);
+ revisionResource.addRDFType(prov.Entity);
}
private void addPrevious(OntModel model,
Revision revision, Revision previous) {
OntClass VersionableResource = model.createClass("http://purl.org/wf4ever/roevo#VersionableResource");
- VersionableResource.addSuperClass(Prov.Entity);
+ VersionableResource.addSuperClass(prov.Entity);
Individual revisionResource = model.createIndividual(revision.getIdentifier().toASCIIString(),
VersionableResource);
Individual previousResource = model.createIndividual(previous.getIdentifier().toASCIIString(),
VersionableResource);
- revisionResource.addProperty(Prov.wasRevisionOf, previousResource);
+ revisionResource.addProperty(prov.wasRevisionOf, previousResource);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0d01d92a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
index 912a72c..b940a1a 100644
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
+++ b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescSerialiser.java
@@ -39,9 +39,9 @@ import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.RiotException;
import org.apache.jena.vocabulary.OWL;
-import org.apache.taverna.ro.vocabs.Prov;
+import org.apache.taverna.ro.vocabs.prov;
import org.apache.taverna.ro.vocabs.roterms;
-import org.apache.taverna.ro.vocabs.Wf4ever;
+import org.apache.taverna.ro.vocabs.wf4ever;
import org.apache.taverna.ro.vocabs.wfdesc;
import org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.annotation.Annotation;
@@ -156,9 +156,9 @@ public class WfdescSerialiser {
Configuration c = scufl2Tools.configurationFor(a, b.getParent());
JsonNode json = c.getJson();
if (type.equals(BEANSHELL)) {
- process.addRDFType(Wf4ever.BeanshellScript);
+ process.addRDFType(wf4ever.BeanshellScript);
String s = json.get("script").asText();
- process.addProperty(Wf4ever.script, s);
+ process.addProperty(wf4ever.script, s);
JsonNode localDep = json.get("localDependency");
if (localDep != null && localDep.isArray()) {
for (int i = 0; i < localDep.size(); i++) {
@@ -179,20 +179,20 @@ public class WfdescSerialiser {
}
}
if (type.equals(RSHELL)) {
- process.addRDFType(Wf4ever.RScript);
+ process.addRDFType(wf4ever.RScript);
String s = json.get("script").asText();
- process.addProperty(Wf4ever.script, s);
+ process.addProperty(wf4ever.script, s);
}
if (type.equals(WSDL)) {
- process.addRDFType(Wf4ever.SOAPService);
+ process.addRDFType(wf4ever.SOAPService);
JsonNode operation = json.get("operation");
URI wsdl = URI.create(operation.get("wsdl").asText());
- process.addProperty(Wf4ever.wsdlURI, wsdl.toASCIIString());
- process.addProperty(Wf4ever.wsdlOperationName, operation.get("name").asText());
- process.addProperty(Wf4ever.rootURI, wsdl.resolve("/").toASCIIString());
+ process.addProperty(wf4ever.wsdlURI, wsdl.toASCIIString());
+ process.addProperty(wf4ever.wsdlOperationName, operation.get("name").asText());
+ process.addProperty(wf4ever.rootURI, wsdl.resolve("/").toASCIIString());
}
if (type.equals(REST)) {
- process.addRDFType(Wf4ever.RESTService);
+ process.addRDFType(wf4ever.RESTService);
// System.out.println(json);
JsonNode request = json.get("request");
String absoluteURITemplate = request.get("absoluteURITemplate").asText();
@@ -201,7 +201,7 @@ public class WfdescSerialiser {
// TODO: Detect {}
try {
URI root = new URI(uriTemplate).resolve("/");
- process.addProperty(Wf4ever.rootURI, root.toASCIIString());
+ process.addProperty(wf4ever.rootURI, root.toASCIIString());
} catch (URISyntaxException e) {
logger.warning("Potentially invalid URI template: " + absoluteURITemplate);
// Uncomment to temporarily break
@@ -210,12 +210,12 @@ public class WfdescSerialiser {
}
}
if (type.equals(TOOL)) {
- process.addRDFType(Wf4ever.CommandLineTool);
+ process.addRDFType(wf4ever.CommandLineTool);
JsonNode desc = json.get("toolDescription");
// System.out.println(json);
JsonNode command = desc.get("command");
if (command != null) {
- process.addProperty(Wf4ever.command, command.asText());
+ process.addProperty(wf4ever.command, command.asText());
}
}
if (type.equals(NESTED_WORKFLOW)) {
@@ -283,9 +283,9 @@ public class WfdescSerialiser {
}
private void specializationOf(WorkflowBean special, WorkflowBean general) {
- Individual specialEnt = entityForBean(special, Prov.Entity);
- Individual generalEnt = entityForBean(general, Prov.Entity);
- specialEnt.addProperty(Prov.specializationOf, generalEnt);
+ Individual specialEnt = entityForBean(special, prov.Entity);
+ Individual generalEnt = entityForBean(general, prov.Entity);
+ specialEnt.addProperty(prov.specializationOf, generalEnt);
}
private Individual entityForBean(WorkflowBean bean, Resource thing) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0d01d92a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
index 3a808a8..346cb27 100644
--- a/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
+++ b/taverna-scufl2-wfdesc/src/test/java/org/apache/taverna/scufl2/wfdesc/TestRoEvoSerializer.java
@@ -31,7 +31,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.taverna.ro.vocabs.Prov;
+import org.apache.taverna.ro.vocabs.prov;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.io.ReaderException;
import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
@@ -75,9 +75,9 @@ public class TestRoEvoSerializer {
OntModel m = ModelFactory.createOntologyModel();
m.read(new ByteArrayInputStream(os.toByteArray()), "http://example.com/", "Turtle");
Resource mainWf = m.getResource(helloWorld.getMainWorkflow().getIdentifier().toASCIIString());
- Resource older = mainWf.getProperty(Prov.wasRevisionOf).getResource();
- Resource oldest = older.getProperty(Prov.wasRevisionOf).getResource();
- assertNull(oldest.getProperty(Prov.wasRevisionOf));
+ Resource older = mainWf.getProperty(prov.wasRevisionOf).getResource();
+ Resource oldest = older.getProperty(prov.wasRevisionOf).getResource();
+ assertNull(oldest.getProperty(prov.wasRevisionOf));
}