lowercase vocabulary prefix name
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Bundle.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/bundle.java
similarity index 98%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Bundle.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/bundle.java
index 7ad5f75..0b85416 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Bundle.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/bundle.java
@@ -28,7 +28,7 @@
*
* @see https://w3id.org/bundle/owl
*/
-public class Bundle {
+public class bundle {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Foaf.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/foaf.java
similarity index 95%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Foaf.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/foaf.java
index 150f49c..ca22582 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Foaf.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/foaf.java
@@ -19,17 +19,25 @@
*/
package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.AnnotationProperty;
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
import org.apache.jena.sparql.vocabulary.FOAF;
-import org.apache.jena.ontology.*;
/**
* Constants from the Friend of a Friend (FOAF) namespace
*
* @see http://xmlns.com/foaf/0.1/
+ * @see FOAF
*
*/
-public class Foaf extends FOAF {
+public class foaf {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Oa.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/oa.java
similarity index 94%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Oa.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/oa.java
index d524e22..21580d9 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Oa.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/oa.java
@@ -28,7 +28,7 @@
* @see https://www.w3.org/ns/oa
* @see https://www.w3.org/TR/2017/REC-annotation-vocab-20170223/
*/
-public class Oa {
+public class oa {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null);
@@ -39,7 +39,7 @@
* @return namespace as String
* @see #NS */
public static String getURI() {return NS;}
- 0
+
/** <p>The namespace of the vocabulary as a resource</p> */
public static final Resource NAMESPACE = M_MODEL.createResource( NS);
@@ -96,7 +96,10 @@
public static final OntClass TimeState = M_MODEL.createClass(NS + "TimeState");
public static final OntClass XPathSelector = M_MODEL.createClass(NS + "XPathSelector");
- public static final Individual motivationScheme = M_MODEL.createIndividual(NS + "motivationScheme", M_MODEL.createClass( "http://www.w3.org/2004/02/skos/core#ConceptScheme"));
+ private static final OntClass ConceptScheme = M_MODEL.createClass( "http://www.w3.org/2004/02/skos/core#ConceptScheme");
+ private static final OntClass Concept = M_MODEL.createClass( "http://www.w3.org/2004/02/skos/core#Concept") ;
+
+ public static final Individual motivationScheme = M_MODEL.createIndividual(NS + "motivationScheme", ConceptScheme);
public static final Individual assessing = M_MODEL.createIndividual(NS + "assessing", Motivation);
public static final Individual bookmarking = M_MODEL.createIndividual(NS + "bookmarking", Motivation);
public static final Individual classifying = M_MODEL.createIndividual(NS + "classifying", Motivation);
@@ -113,10 +116,8 @@
public static final Individual ltrDirection = M_MODEL.createIndividual(NS + "ltrDirection", Direction);
public static final Individual rtlDirection = M_MODEL.createIndividual(NS + "rtlDirection", Direction);
-
- // TODO: type M_MODEL.createClass( "http://www.w3.org/2004/02/skos/core#Concept") ?
- public static final Individual PreferContainedDescriptions = M_MODEL.createIndividual(NS + "PreferContainedDescriptions");
- public static final Individual PreferContainedIRIs = M_MODEL.createIndividual(NS + "PreferContainedIRIs");
+ public static final Individual PreferContainedDescriptions = M_MODEL.createIndividual(NS + "PreferContainedDescriptions", Concept);
+ public static final Individual PreferContainedIRIs = M_MODEL.createIndividual(NS + "PreferContainedIRIs", Concept);
}
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Ore_owl.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ore.java
similarity index 98%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Ore_owl.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ore.java
index 5fa7a0d..6eddbce 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Ore_owl.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ore.java
@@ -28,7 +28,7 @@
* @see http://www.openarchives.org/ore/terms/
* @see http://www.openarchives.org/ore/toc"
*/
-public class Ore_owl {
+public class ore {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Pav.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/pav.java
similarity index 99%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Pav.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/pav.java
index fd684f4..49cc426 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Pav.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/pav.java
@@ -59,7 +59,7 @@
* Vocabulary definitions from file:/home/stain/src/incubator-taverna-language/taverna-ro-vocabs/src/main/resources/ontologies/pav.rdf
* @author Auto-generated by schemagen on 07 Dec 2018 00:45
*/
-public class Pav {
+public class pav {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Prov_o.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/prov.java
similarity index 95%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Prov_o.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/prov.java
index 7c51be5..cbcbd5b 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Prov_o.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/prov.java
@@ -17,16 +17,23 @@
* under the License.
*
*/
-package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+package org.apache.taverna.ro.vocabs;
+
+import org.apache.jena.ontology.AnnotationProperty;
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
- * Constants from the W3C PROV-O vocabulary
+ * Constants from the W3C Prov-O vocabulary
*
* @see https://www.w3.org/TR/prov-o/
*/
-public class Prov_o {
+public class prov {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
@@ -143,7 +150,7 @@
public static final OntClass Usage = M_MODEL.createClass(NS + "Usage");
/**
- * Constants from the W3C PROV-AQ extension to PROV vocabulary
+ * Constants from the W3C Prov-AQ extension to Prov vocabulary
*
* @see https://www.w3.org/TR/prov-aq/
*/
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/RO.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ro.java
similarity index 86%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/RO.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ro.java
index 2630c6d..f232393 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/RO.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ro.java
@@ -17,16 +17,22 @@
* under the License.
*
*/
-package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+package org.apache.taverna.ro.vocabs;
+
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants for the Research Object ro vocabulary
*
* @see https://w3id.org/ro/2016-01-28/ro
*/
-public class RO {
+public class ro {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ROEvo.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roevo.java
similarity index 92%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ROEvo.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roevo.java
index 585de1c..6e2abdd 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ROEvo.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roevo.java
@@ -18,15 +18,20 @@
*
*/
package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants for the Research Object roevo vocabulary
*
* @see https://w3id.org/ro/2016-01-28/roevo
*/
-public class ROEvo {
+public class roevo {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Roterms.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roterms.java
similarity index 90%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Roterms.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roterms.java
index bc2da06..32bfe9f 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Roterms.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roterms.java
@@ -17,16 +17,22 @@
* under the License.
*
*/
-package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+package org.apache.taverna.ro.vocabs;
+
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants from the Research Object Terms (roterms) vocabulary
*
* @see http://wf4ever.github.io/ro/2016-01-28/roterms/
*/
-public class Roterms {
+public class roterms {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wf4ever.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wf4ever.java
similarity index 92%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wf4ever.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wf4ever.java
index 75bb41a..c475f38 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wf4ever.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wf4ever.java
@@ -18,15 +18,20 @@
*
*/
package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants for the Research Object wf4ever vocabulary
*
* @see https://w3id.org/ro/2016-01-28/wf4ever
*/
-public class Wf4ever {
+public class wf4ever {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfdesc.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfdesc.java
similarity index 91%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfdesc.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfdesc.java
index da542f2..e3963a0 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfdesc.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfdesc.java
@@ -17,16 +17,21 @@
* under the License.
*
*/
-package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+package org.apache.taverna.ro.vocabs;
+
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants for the Research Object wfdesc vocabulary
*
* @see https://w3id.org/ro/2016-01-28/wfdesc
*/
-public class Wfdesc {
+public class wfdesc {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfprov.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfprov.java
similarity index 89%
rename from taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfprov.java
rename to taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfprov.java
index c2b0871..1019aee 100644
--- a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfprov.java
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfprov.java
@@ -17,16 +17,21 @@
* under the License.
*
*/
-package org.apache.taverna.ro.vocabs;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
+package org.apache.taverna.ro.vocabs;
+
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
/**
* Constants for the Research Object wfprov vocabulary
*
* @see https://w3id.org/ro/2016-01-28/wfprov
*/
-public class Wfprov {
+public class wfprov {
/** <p>The ontology model that holds the vocabulary terms</p> */
private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
index e542735..e90d0c1 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java
@@ -163,11 +163,11 @@
protected OntModel getOntModel() {
OntModel ontModel = createOntologyModel(OWL_DL_MEM_RULE_INF);
- ontModel.setNsPrefix("foaf", Foaf.);
- ontModel.setNsPrefix("prov", PROV);
- ontModel.setNsPrefix("ore", ORE);
- ontModel.setNsPrefix("pav", PAV);
- ontModel.setNsPrefix("dct", DCT);
+ ontModel.setNsPrefix("foaf", Foaf.NS);
+ ontModel.setNsPrefix("prov", PROV.NS);
+ ontModel.setNsPrefix("ore", ORE.NS);
+ ontModel.setNsPrefix("pav", PAV.NS);
+ ontModel.setNsPrefix("dct", DCT.NS);
// ontModel.getDocumentManager().loadImports(foaf.getOntModel());
return ontModel;
}
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 0a8d684..80b092f 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 @@
import java.io.OutputStream;
-import org.apache.taverna.ro.vocabs.Prov_o;
+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 @@
private void addRevision(OntModel model,
Revision revision) {
OntClass VersionableResource = model.createClass("http://purl.org/wf4ever/roevo#VersionableResource");
- VersionableResource.addSuperClass(Prov_o.Entity);
+ VersionableResource.addSuperClass(Prov.Entity);
Individual revisionResource = model.createIndividual(revision.getIdentifier().toASCIIString(),
VersionableResource);
- revisionResource.addRDFType(Prov_o.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_o.Entity);
+ VersionableResource.addSuperClass(Prov.Entity);
Individual revisionResource = model.createIndividual(revision.getIdentifier().toASCIIString(),
VersionableResource);
Individual previousResource = model.createIndividual(previous.getIdentifier().toASCIIString(),
VersionableResource);
- revisionResource.addProperty(Prov_o.wasRevisionOf, previousResource);
+ revisionResource.addProperty(Prov.wasRevisionOf, previousResource);
}
}
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 8459618..912a72c 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,10 +39,10 @@
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_o;
-import org.apache.taverna.ro.vocabs.Roterms;
+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.Wfdesc;
+import org.apache.taverna.ro.vocabs.wfdesc;
import org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.annotation.Annotation;
import org.apache.taverna.scufl2.api.common.Child;
@@ -107,35 +107,35 @@
// @SuppressWarnings("rawtypes")
if (node instanceof org.apache.taverna.scufl2.api.core.Workflow) {
- entityForBean(node, Wfdesc.Workflow);
+ entityForBean(node, wfdesc.Workflow);
} else if (node instanceof Processor) {
Processor processor = (Processor) node;
- Individual process = entityForBean(processor, Wfdesc.Process);
- Individual wf = entityForBean(processor.getParent(), Wfdesc.Workflow);
- wf.addProperty(Wfdesc.hasSubProcess, process);
+ Individual process = entityForBean(processor, wfdesc.Process);
+ Individual wf = entityForBean(processor.getParent(), wfdesc.Workflow);
+ wf.addProperty(wfdesc.hasSubProcess, process);
} else if (node instanceof InputPort) {
WorkflowBean parent = ((Child) node).getParent();
- Individual input = entityForBean(node, Wfdesc.Input);
- Individual process = entityForBean(parent, Wfdesc.Process);
- process.addProperty(Wfdesc.hasInput, input);
+ Individual input = entityForBean(node, wfdesc.Input);
+ Individual process = entityForBean(parent, wfdesc.Process);
+ process.addProperty(wfdesc.hasInput, input);
} else if (node instanceof OutputPort) {
WorkflowBean parent = ((Child) node).getParent();
- Individual output = entityForBean(node, Wfdesc.Output);
- Individual process = entityForBean(parent, Wfdesc.Process);
- process.addProperty(Wfdesc.hasOutput, output);
+ Individual output = entityForBean(node, wfdesc.Output);
+ Individual process = entityForBean(parent, wfdesc.Process);
+ process.addProperty(wfdesc.hasOutput, output);
} else if (node instanceof DataLink) {
WorkflowBean parent = ((Child) node).getParent();
DataLink link = (DataLink) node;
- Individual dl = entityForBean(link, Wfdesc.DataLink);
+ Individual dl = entityForBean(link, wfdesc.DataLink);
- Individual source = entityForBean(link.getReceivesFrom(), Wfdesc.Output);
- dl.addProperty(Wfdesc.hasSource, source);
+ Individual source = entityForBean(link.getReceivesFrom(), wfdesc.Output);
+ dl.addProperty(wfdesc.hasSource, source);
- Individual sink = entityForBean(link.getSendsTo(), Wfdesc.Input);
- dl.addProperty(Wfdesc.hasSink, sink);
- Individual wf = entityForBean(parent, Wfdesc.Workflow);
- wf.addProperty(Wfdesc.hasDataLink, dl);
+ Individual sink = entityForBean(link.getSendsTo(), wfdesc.Input);
+ dl.addProperty(wfdesc.hasSink, sink);
+ Individual wf = entityForBean(parent, wfdesc.Workflow);
+ wf.addProperty(wfdesc.hasDataLink, dl);
} else if (node instanceof Profile) {
// So that we can get at the ProcessorBinding - buy only if
// it is the main Profile
@@ -144,7 +144,7 @@
ProcessorBinding b = (ProcessorBinding) node;
Activity a = b.getBoundActivity();
Processor boundProcessor = b.getBoundProcessor();
- Individual process = entityForBean(boundProcessor, Wfdesc.Process);
+ Individual process = entityForBean(boundProcessor, wfdesc.Process);
// Note: We don't describe the activity and processor
// binding in wfdesc. Instead we
@@ -167,7 +167,7 @@
Individual dep = model.createIndividual(OWL.Thing);
dep.addLabel(depStr, null);
dep.addComment("JAR dependency", "en");
- process.addProperty(Roterms.requiresSoftware, dep);
+ process.addProperty(roterms.requiresSoftware, dep);
// Somehow this gets the whole thing to fall
// out of the graph!
// QName depQ = new
@@ -225,7 +225,7 @@
// (because the nested workflow could exist as
// several processors)
specializationOf(boundProcessor, nestedWf);
- process.addRDFType(Wfdesc.Workflow);
+ process.addRDFType(wfdesc.Workflow);
// Just like the Processor specializes the nested
// workflow, the
@@ -283,9 +283,9 @@
}
private void specializationOf(WorkflowBean special, WorkflowBean general) {
- Individual specialEnt = entityForBean(special, Prov_o.Entity);
- Individual generalEnt = entityForBean(general, Prov_o.Entity);
- specialEnt.addProperty(Prov_o.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) {
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 0fe44ff..3a808a8 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.IOException;
import java.io.InputStream;
-import org.apache.taverna.ro.vocabs.Prov_o;
+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 @@
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_o.wasRevisionOf).getResource();
- Resource oldest = older.getProperty(Prov_o.wasRevisionOf).getResource();
- assertNull(oldest.getProperty(Prov_o.wasRevisionOf));
+ Resource older = mainWf.getProperty(Prov.wasRevisionOf).getResource();
+ Resource oldest = older.getProperty(Prov.wasRevisionOf).getResource();
+ assertNull(oldest.getProperty(Prov.wasRevisionOf));
}