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/06 23:19:51 UTC

[3/3] incubator-taverna-language git commit: Moved vocularies to taverna-ro-vocabs

Moved vocularies to taverna-ro-vocabs


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/b34dd573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/b34dd573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/b34dd573

Branch: refs/heads/no-ontologies
Commit: b34dd573598a24bd7243351873fb688ce50caaba
Parents: 68ad29a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Nov 27 12:26:44 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Nov 27 23:03:59 2018 +0000

----------------------------------------------------------------------
 pom.xml                                         |  20 +-
 taverna-ro-vocabs/pom.xml                       |  26 ++-
 .../java/org/apache/taverna/ro/vocabs/Foaf.java | 193 +++++++++++++++
 .../org/apache/taverna/ro/vocabs/Prov_o.java    | 234 +++++++++++++++++++
 .../java/org/apache/taverna/ro/vocabs/RO.java   |  56 +++++
 .../org/apache/taverna/ro/vocabs/ROEvo.java     |  74 ++++++
 .../org/apache/taverna/ro/vocabs/Roterms.java   |  71 ++++++
 .../org/apache/taverna/ro/vocabs/Wf4ever.java   |  90 +++++++
 .../org/apache/taverna/ro/vocabs/Wfdesc.java    |  88 +++++++
 .../org/apache/taverna/ro/vocabs/Wfprov.java    |  71 ++++++
 .../apache/taverna/ro/vocabs/package-info.java  |  23 ++
 .../taverna/scufl2/wfdesc/ROEvoSerializer.java  |   2 +-
 .../taverna/scufl2/wfdesc/WfdescSerialiser.java |   8 +-
 .../taverna/scufl2/wfdesc/ontologies/Foaf.java  | 193 ---------------
 .../scufl2/wfdesc/ontologies/Prov_o.java        | 234 -------------------
 .../taverna/scufl2/wfdesc/ontologies/RO.java    |  56 -----
 .../taverna/scufl2/wfdesc/ontologies/ROEvo.java |  74 ------
 .../scufl2/wfdesc/ontologies/Roterms.java       |  71 ------
 .../scufl2/wfdesc/ontologies/Wf4ever.java       |  90 -------
 .../scufl2/wfdesc/ontologies/Wfdesc.java        |  88 -------
 .../scufl2/wfdesc/ontologies/Wfprov.java        |  71 ------
 .../scufl2/wfdesc/TestRoEvoSerializer.java      |   2 +-
 22 files changed, 924 insertions(+), 911 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 123ea22..88cbd70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,22 +79,6 @@
             <exclude>**/xml.xsd</exclude>
             <exclude>**/xenc-schema.xsd</exclude>
             <exclude>**/xmldsig-core-schema.xsd</exclude>
-            <exclude>**/prov-o.rdf</exclude>
-            <exclude>**/prov-o.ttl</exclude>
-            <exclude>**/prov-aq.rdf</exclude>
-            <!-- W3C Community license -->
-            <!-- FOAF, Creative Commons Attribution 1.0 -->
-            <exclude>**/oa.rdf</exclude>
-            <exclude>**/foaf.rdf</exclude>
-            <!-- Research Object Model, Creative Commons Attribution 3.0 -->
-            <exclude>**/roterms.ttl</exclude>
-            <exclude>**/wf4ever.ttl</exclude>
-            <exclude>**/wfdesc.ttl</exclude>
-            <exclude>**/wfprov.ttl</exclude>
-
-            <!-- Dublin Core, Creative Commons Attribution 3.0 -->
-            <exclude>**/dcam.owl</exclude>
-            <exclude>**/dcterms_od.owl</exclude>
 
           </excludes>
         </configuration>
@@ -297,12 +281,12 @@ additional dependencies to be a happy OSGi bundle -->
     <modules>
       <module>taverna-baclava-language</module>
       <module>taverna-databundle</module>
+      <module>taverna-ro-vocabs</module>
       <module>taverna-robundle</module>
       <module>taverna-scufl2-annotation</module>
       <module>taverna-scufl2-api</module>
       <module>taverna-scufl2-examples</module>
       <module>taverna-scufl2-integration-tests</module>
-      <module>taverna-scufl2-ro-vocabs</module>
       <module>taverna-scufl2-schemas</module>
       <module>taverna-scufl2-scufl</module>
       <module>taverna-scufl2-t2flow</module>
@@ -327,12 +311,12 @@ additional dependencies to be a happy OSGi bundle -->
       <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
     <modules>
+      <module>taverna-ro-vocabs</module>
       <module>taverna-baclava-language</module>
       <module>taverna-scufl2-annotation</module>
       <module>taverna-scufl2-api</module>
       <module>taverna-scufl2-examples</module>
       <module>taverna-scufl2-integration-tests</module>
-      <module>taverna-scufl2-ro-vocabs</module>
       <module>taverna-scufl2-schemas</module>
       <module>taverna-scufl2-scufl</module>
       <module>taverna-scufl2-t2flow</module>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-ro-vocabs/pom.xml b/taverna-ro-vocabs/pom.xml
index 9d7bd9d..0b7bc46 100755
--- a/taverna-ro-vocabs/pom.xml
+++ b/taverna-ro-vocabs/pom.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to
-  You under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License. -->
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Foaf.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..58bf391
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Foaf.java
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants from the Friend of a Friend (FOAF) namespace
+ * 
+ * @see http://xmlns.com/foaf/0.1/
+ *
+ */
+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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://xmlns.com/foaf/0.1/";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final ObjectProperty account = M_MODEL.createObjectProperty(NS + "account");
+    
+    public static final ObjectProperty accountServiceHomepage = M_MODEL.createObjectProperty(NS + "accountServiceHomepage");
+    
+    public static final ObjectProperty based_near = M_MODEL.createObjectProperty(NS + "based_near");
+    
+    public static final ObjectProperty currentProject = M_MODEL.createObjectProperty(NS + "currentProject");
+    
+    public static final ObjectProperty depiction = M_MODEL.createObjectProperty(NS + "depiction");
+    
+    public static final ObjectProperty depicts = M_MODEL.createObjectProperty(NS + "depicts");
+    
+    public static final ObjectProperty fundedBy = M_MODEL.createObjectProperty(NS + "fundedBy");
+    
+    public static final ObjectProperty holdsAccount = M_MODEL.createObjectProperty(NS + "holdsAccount");
+    
+    public static final ObjectProperty homepage = M_MODEL.createObjectProperty(NS + "homepage");
+    
+    public static final ObjectProperty img = M_MODEL.createObjectProperty(NS + "img");
+    
+    public static final ObjectProperty interest = M_MODEL.createObjectProperty(NS + "interest");
+    
+    public static final ObjectProperty knows = M_MODEL.createObjectProperty(NS + "knows");
+    
+    public static final ObjectProperty logo = M_MODEL.createObjectProperty(NS + "logo");
+    
+    public static final ObjectProperty made = M_MODEL.createObjectProperty(NS + "made");
+    
+    public static final ObjectProperty maker = M_MODEL.createObjectProperty(NS + "maker");
+    
+    public static final ObjectProperty mbox = M_MODEL.createObjectProperty(NS + "mbox");
+    
+    public static final ObjectProperty member = M_MODEL.createObjectProperty(NS + "member");
+    
+    public static final ObjectProperty openid = M_MODEL.createObjectProperty(NS + "openid");
+    
+    public static final ObjectProperty page = M_MODEL.createObjectProperty(NS + "page");
+    
+    public static final ObjectProperty pastProject = M_MODEL.createObjectProperty(NS + "pastProject");
+    
+    public static final ObjectProperty phone = M_MODEL.createObjectProperty(NS + "phone");
+    
+    public static final ObjectProperty primaryTopic = M_MODEL.createObjectProperty(NS + "primaryTopic");
+    
+    public static final ObjectProperty publications = M_MODEL.createObjectProperty(NS + "publications");
+    
+    public static final ObjectProperty schoolHomepage = M_MODEL.createObjectProperty(NS + "schoolHomepage");
+    
+    public static final ObjectProperty theme = M_MODEL.createObjectProperty(NS + "theme");
+    
+    public static final ObjectProperty thumbnail = M_MODEL.createObjectProperty(NS + "thumbnail");
+    
+    public static final ObjectProperty tipjar = M_MODEL.createObjectProperty(NS + "tipjar");
+    
+    public static final ObjectProperty topic = M_MODEL.createObjectProperty(NS + "topic");
+    
+    public static final ObjectProperty topic_interest = M_MODEL.createObjectProperty(NS + "topic_interest");
+    
+    public static final ObjectProperty weblog = M_MODEL.createObjectProperty(NS + "weblog");
+    
+    public static final ObjectProperty workInfoHomepage = M_MODEL.createObjectProperty(NS + "workInfoHomepage");
+    
+    public static final ObjectProperty workplaceHomepage = M_MODEL.createObjectProperty(NS + "workplaceHomepage");
+    
+    public static final DatatypeProperty accountName = M_MODEL.createDatatypeProperty(NS + "accountName");
+    
+    public static final DatatypeProperty age = M_MODEL.createDatatypeProperty(NS + "age");
+    
+    public static final DatatypeProperty aimChatID = M_MODEL.createDatatypeProperty(NS + "aimChatID");
+    
+    public static final DatatypeProperty birthday = M_MODEL.createDatatypeProperty(NS + "birthday");
+    
+    public static final DatatypeProperty dnaChecksum = M_MODEL.createDatatypeProperty(NS + "dnaChecksum");
+    
+    public static final DatatypeProperty familyName = M_MODEL.createDatatypeProperty(NS + "familyName");
+    
+    public static final DatatypeProperty family_name = M_MODEL.createDatatypeProperty(NS + "family_name");
+    
+    public static final DatatypeProperty firstName = M_MODEL.createDatatypeProperty(NS + "firstName");
+    
+    public static final DatatypeProperty geekcode = M_MODEL.createDatatypeProperty(NS + "geekcode");
+    
+    public static final DatatypeProperty gender = M_MODEL.createDatatypeProperty(NS + "gender");
+    
+    public static final DatatypeProperty givenName = M_MODEL.createDatatypeProperty(NS + "givenName");
+    
+    public static final DatatypeProperty givenname = M_MODEL.createDatatypeProperty(NS + "givenname");
+    
+    public static final DatatypeProperty icqChatID = M_MODEL.createDatatypeProperty(NS + "icqChatID");
+    
+    public static final DatatypeProperty jabberID = M_MODEL.createDatatypeProperty(NS + "jabberID");
+    
+    public static final DatatypeProperty lastName = M_MODEL.createDatatypeProperty(NS + "lastName");
+    
+    public static final DatatypeProperty mbox_sha1sum = M_MODEL.createDatatypeProperty(NS + "mbox_sha1sum");
+    
+    public static final DatatypeProperty msnChatID = M_MODEL.createDatatypeProperty(NS + "msnChatID");
+    
+    public static final DatatypeProperty myersBriggs = M_MODEL.createDatatypeProperty(NS + "myersBriggs");
+    
+    public static final DatatypeProperty name = M_MODEL.createDatatypeProperty(NS + "name");
+    
+    public static final DatatypeProperty nick = M_MODEL.createDatatypeProperty(NS + "nick");
+    
+    public static final DatatypeProperty plan = M_MODEL.createDatatypeProperty(NS + "plan");
+    
+    public static final DatatypeProperty sha1 = M_MODEL.createDatatypeProperty(NS + "sha1");
+    
+    public static final DatatypeProperty skypeID = M_MODEL.createDatatypeProperty(NS + "skypeID");
+    
+    public static final DatatypeProperty status = M_MODEL.createDatatypeProperty(NS + "status");
+    
+    public static final DatatypeProperty surname = M_MODEL.createDatatypeProperty(NS + "surname");
+    
+    public static final DatatypeProperty title = M_MODEL.createDatatypeProperty(NS + "title");
+    
+    public static final DatatypeProperty yahooChatID = M_MODEL.createDatatypeProperty(NS + "yahooChatID");
+    
+    public static final AnnotationProperty membershipClass = M_MODEL.createAnnotationProperty(NS + "membershipClass");
+    
+    public static final OntProperty isPrimaryTopicOf = M_MODEL.createOntProperty(NS + "isPrimaryTopicOf");
+    
+    public static final OntClass Agent = M_MODEL.createClass(NS + "Agent");
+    
+    public static final OntClass Document = M_MODEL.createClass(NS + "Document");
+    
+    public static final OntClass Group = M_MODEL.createClass(NS + "Group");
+    
+    public static final OntClass Image = M_MODEL.createClass(NS + "Image");
+    
+    public static final OntClass LabelProperty = M_MODEL.createClass(NS + "LabelProperty");
+    
+    public static final OntClass OnlineAccount = M_MODEL.createClass(NS + "OnlineAccount");
+    
+    public static final OntClass OnlineChatAccount = M_MODEL.createClass(NS + "OnlineChatAccount");
+    
+    public static final OntClass OnlineEcommerceAccount = M_MODEL.createClass(NS + "OnlineEcommerceAccount");
+    
+    public static final OntClass OnlineGamingAccount = M_MODEL.createClass(NS + "OnlineGamingAccount");
+    
+    public static final OntClass Organization = M_MODEL.createClass(NS + "Organization");
+    
+    public static final OntClass Person = M_MODEL.createClass(NS + "Person");
+    
+    public static final OntClass PersonalProfileDocument = M_MODEL.createClass(NS + "PersonalProfileDocument");
+    
+    public static final OntClass Project = M_MODEL.createClass(NS + "Project");
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Prov_o.java
----------------------------------------------------------------------
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_o.java
new file mode 100644
index 0000000..c9089cb
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Prov_o.java
@@ -0,0 +1,234 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants from the W3C PROV-O vocabulary
+ * 
+ * @see https://www.w3.org/TR/prov-o/
+ */
+public class Prov_o {
+    /** <p>The ontology model that holds the vocabulary terms</p> */
+    private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://www.w3.org/ns/prov#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final ObjectProperty actedOnBehalfOf = M_MODEL.createObjectProperty(NS + "actedOnBehalfOf");
+    
+    public static final ObjectProperty activity = M_MODEL.createObjectProperty(NS + "activity");
+    
+    public static final ObjectProperty agent = M_MODEL.createObjectProperty(NS + "agent");
+    
+    public static final ObjectProperty alternateOf = M_MODEL.createObjectProperty(NS + "alternateOf");
+    
+    public static final ObjectProperty atLocation = M_MODEL.createObjectProperty(NS + "atLocation");
+    
+    public static final ObjectProperty entity = M_MODEL.createObjectProperty(NS + "entity");
+    
+    public static final ObjectProperty generated = M_MODEL.createObjectProperty(NS + "generated");
+    
+    public static final ObjectProperty hadActivity = M_MODEL.createObjectProperty(NS + "hadActivity");
+    
+    public static final ObjectProperty hadGeneration = M_MODEL.createObjectProperty(NS + "hadGeneration");
+    
+    public static final ObjectProperty hadMember = M_MODEL.createObjectProperty(NS + "hadMember");
+    
+    public static final ObjectProperty hadPlan = M_MODEL.createObjectProperty(NS + "hadPlan");
+    
+    public static final ObjectProperty hadPrimarySource = M_MODEL.createObjectProperty(NS + "hadPrimarySource");
+    
+    public static final ObjectProperty hadRole = M_MODEL.createObjectProperty(NS + "hadRole");
+    
+    public static final ObjectProperty hadUsage = M_MODEL.createObjectProperty(NS + "hadUsage");
+    
+    public static final ObjectProperty influenced = M_MODEL.createObjectProperty(NS + "influenced");
+    
+    public static final ObjectProperty influencer = M_MODEL.createObjectProperty(NS + "influencer");
+    
+    public static final ObjectProperty invalidated = M_MODEL.createObjectProperty(NS + "invalidated");
+    
+    public static final ObjectProperty qualifiedAssociation = M_MODEL.createObjectProperty(NS + "qualifiedAssociation");
+    
+    public static final ObjectProperty qualifiedAttribution = M_MODEL.createObjectProperty(NS + "qualifiedAttribution");
+    
+    public static final ObjectProperty qualifiedCommunication = M_MODEL.createObjectProperty(NS + "qualifiedCommunication");
+    
+    public static final ObjectProperty qualifiedDelegation = M_MODEL.createObjectProperty(NS + "qualifiedDelegation");
+    
+    public static final ObjectProperty qualifiedDerivation = M_MODEL.createObjectProperty(NS + "qualifiedDerivation");
+    
+    public static final ObjectProperty qualifiedEnd = M_MODEL.createObjectProperty(NS + "qualifiedEnd");
+    
+    public static final ObjectProperty qualifiedGeneration = M_MODEL.createObjectProperty(NS + "qualifiedGeneration");
+    
+    public static final ObjectProperty qualifiedInfluence = M_MODEL.createObjectProperty(NS + "qualifiedInfluence");
+    
+    public static final ObjectProperty qualifiedInvalidation = M_MODEL.createObjectProperty(NS + "qualifiedInvalidation");
+    
+    public static final ObjectProperty qualifiedPrimarySource = M_MODEL.createObjectProperty(NS + "qualifiedPrimarySource");
+    
+    public static final ObjectProperty qualifiedQuotation = M_MODEL.createObjectProperty(NS + "qualifiedQuotation");
+    
+    public static final ObjectProperty qualifiedRevision = M_MODEL.createObjectProperty(NS + "qualifiedRevision");
+    
+    public static final ObjectProperty qualifiedStart = M_MODEL.createObjectProperty(NS + "qualifiedStart");
+    
+    public static final ObjectProperty qualifiedUsage = M_MODEL.createObjectProperty(NS + "qualifiedUsage");
+    
+    public static final ObjectProperty specializationOf = M_MODEL.createObjectProperty(NS + "specializationOf");
+    
+    public static final ObjectProperty used = M_MODEL.createObjectProperty(NS + "used");
+    
+    public static final ObjectProperty wasAssociatedWith = M_MODEL.createObjectProperty(NS + "wasAssociatedWith");
+    
+    public static final ObjectProperty wasAttributedTo = M_MODEL.createObjectProperty(NS + "wasAttributedTo");
+    
+    public static final ObjectProperty wasDerivedFrom = M_MODEL.createObjectProperty(NS + "wasDerivedFrom");
+    
+    public static final ObjectProperty wasEndedBy = M_MODEL.createObjectProperty(NS + "wasEndedBy");
+    
+    public static final ObjectProperty wasGeneratedBy = M_MODEL.createObjectProperty(NS + "wasGeneratedBy");
+    
+    public static final ObjectProperty wasInfluencedBy = M_MODEL.createObjectProperty(NS + "wasInfluencedBy");
+    
+    public static final ObjectProperty wasInformedBy = M_MODEL.createObjectProperty(NS + "wasInformedBy");
+    
+    public static final ObjectProperty wasInvalidatedBy = M_MODEL.createObjectProperty(NS + "wasInvalidatedBy");
+    
+    public static final ObjectProperty wasQuotedFrom = M_MODEL.createObjectProperty(NS + "wasQuotedFrom");
+    
+    public static final ObjectProperty wasRevisionOf = M_MODEL.createObjectProperty(NS + "wasRevisionOf");
+    
+    public static final ObjectProperty wasStartedBy = M_MODEL.createObjectProperty(NS + "wasStartedBy");
+    
+    public static final DatatypeProperty atTime = M_MODEL.createDatatypeProperty(NS + "atTime");
+    
+    public static final DatatypeProperty endedAtTime = M_MODEL.createDatatypeProperty(NS + "endedAtTime");
+    
+    public static final DatatypeProperty generatedAtTime = M_MODEL.createDatatypeProperty(NS + "generatedAtTime");
+    
+    public static final DatatypeProperty invalidatedAtTime = M_MODEL.createDatatypeProperty(NS + "invalidatedAtTime");
+    
+    public static final DatatypeProperty startedAtTime = M_MODEL.createDatatypeProperty(NS + "startedAtTime");
+    
+    public static final DatatypeProperty value = M_MODEL.createDatatypeProperty(NS + "value");
+    
+    public static final AnnotationProperty aq = M_MODEL.createAnnotationProperty(NS + "aq");
+    
+    public static final AnnotationProperty category = M_MODEL.createAnnotationProperty(NS + "category");
+    
+    public static final AnnotationProperty component = M_MODEL.createAnnotationProperty(NS + "component");
+    
+    public static final AnnotationProperty constraints = M_MODEL.createAnnotationProperty(NS + "constraints");
+    
+    public static final AnnotationProperty definition = M_MODEL.createAnnotationProperty(NS + "definition");
+    
+    public static final AnnotationProperty dm = M_MODEL.createAnnotationProperty(NS + "dm");
+    
+    public static final AnnotationProperty editorialNote = M_MODEL.createAnnotationProperty(NS + "editorialNote");
+    
+    public static final AnnotationProperty editorsDefinition = M_MODEL.createAnnotationProperty(NS + "editorsDefinition");
+    
+    public static final AnnotationProperty inverse = M_MODEL.createAnnotationProperty(NS + "inverse");
+    
+    public static final AnnotationProperty n = M_MODEL.createAnnotationProperty(NS + "n");
+    
+    public static final AnnotationProperty order = M_MODEL.createAnnotationProperty(NS + "order");
+    
+    public static final AnnotationProperty qualifiedForm = M_MODEL.createAnnotationProperty(NS + "qualifiedForm");
+    
+    public static final AnnotationProperty sharesDefinitionWith = M_MODEL.createAnnotationProperty(NS + "sharesDefinitionWith");
+    
+    public static final AnnotationProperty todo = M_MODEL.createAnnotationProperty(NS + "todo");
+    
+    public static final AnnotationProperty unqualifiedForm = M_MODEL.createAnnotationProperty(NS + "unqualifiedForm");
+    
+    public static final OntClass Activity = M_MODEL.createClass(NS + "Activity");
+    
+    public static final OntClass ActivityInfluence = M_MODEL.createClass(NS + "ActivityInfluence");
+    
+    public static final OntClass Agent = M_MODEL.createClass(NS + "Agent");
+    
+    public static final OntClass AgentInfluence = M_MODEL.createClass(NS + "AgentInfluence");
+    
+    public static final OntClass Association = M_MODEL.createClass(NS + "Association");
+    
+    public static final OntClass Attribution = M_MODEL.createClass(NS + "Attribution");
+    
+    public static final OntClass Bundle = M_MODEL.createClass(NS + "Bundle");
+    
+    public static final OntClass Collection = M_MODEL.createClass(NS + "Collection");
+    
+    public static final OntClass Communication = M_MODEL.createClass(NS + "Communication");
+    
+    public static final OntClass Delegation = M_MODEL.createClass(NS + "Delegation");
+    
+    public static final OntClass Derivation = M_MODEL.createClass(NS + "Derivation");
+    
+    public static final OntClass EmptyCollection = M_MODEL.createClass(NS + "EmptyCollection");
+    
+    public static final OntClass End = M_MODEL.createClass(NS + "End");
+    
+    public static final OntClass Entity = M_MODEL.createClass(NS + "Entity");
+    
+    public static final OntClass EntityInfluence = M_MODEL.createClass(NS + "EntityInfluence");
+    
+    public static final OntClass Generation = M_MODEL.createClass(NS + "Generation");
+    
+    public static final OntClass Influence = M_MODEL.createClass(NS + "Influence");
+    
+    public static final OntClass InstantaneousEvent = M_MODEL.createClass(NS + "InstantaneousEvent");
+    
+    public static final OntClass Invalidation = M_MODEL.createClass(NS + "Invalidation");
+    
+    public static final OntClass Location = M_MODEL.createClass(NS + "Location");
+    
+    public static final OntClass Organization = M_MODEL.createClass(NS + "Organization");
+    
+    public static final OntClass Person = M_MODEL.createClass(NS + "Person");
+    
+    public static final OntClass Plan = M_MODEL.createClass(NS + "Plan");
+    
+    public static final OntClass PrimarySource = M_MODEL.createClass(NS + "PrimarySource");
+    
+    public static final OntClass Quotation = M_MODEL.createClass(NS + "Quotation");
+    
+    public static final OntClass Revision = M_MODEL.createClass(NS + "Revision");
+    
+    public static final OntClass Role = M_MODEL.createClass(NS + "Role");
+    
+    public static final OntClass SoftwareAgent = M_MODEL.createClass(NS + "SoftwareAgent");
+    
+    public static final OntClass Start = M_MODEL.createClass(NS + "Start");
+    
+    public static final OntClass Usage = M_MODEL.createClass(NS + "Usage");
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/RO.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..8719364
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/RO.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants for the Research Object ro vocabulary
+ * 
+ * @see https://w3id.org/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/ro#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final OntClass AggregatedAnnotation = M_MODEL.createClass( NS + "AggregatedAnnotation" );
+    public static final OntClass Folder = M_MODEL.createClass( NS + "Folder" );
+    public static final OntClass FolderEntry = M_MODEL.createClass( NS + "FolderEntry" );
+    public static final OntClass Manifest = M_MODEL.createClass( NS + "Manifest" );
+    public static final OntClass ResearchObject = M_MODEL.createClass( NS + "ResearchObject" );
+    public static final OntClass Resource = M_MODEL.createClass( NS + "Resource" );
+
+    public static final ObjectProperty annotatesAggregatedResource = M_MODEL.createObjectProperty( NS + "annotatesAggregatedResource" );
+    public static final ObjectProperty rootFolder = M_MODEL.createObjectProperty( NS + "rootFolder" );
+    
+    public static final DatatypeProperty entryName = M_MODEL.createDatatypeProperty( NS + "entryName" );
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ROEvo.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..586474d
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ROEvo.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants for the Research Object roevo vocabulary
+ * 
+ * @see https://w3id.org/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/roevo#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final OntClass Addition = M_MODEL.createClass( NS + "Addition" );
+    
+    public static final OntClass AggregatedAnnotation = M_MODEL.createClass( NS + "AggregatedAnnotation" );
+    public static final OntClass ArchivedRO = M_MODEL.createClass( NS + "ArchivedRO" );
+    public static final OntClass Change = M_MODEL.createClass( NS + "Change" );
+    public static final OntClass ChangeSpecification = M_MODEL.createClass( NS + "ChangeSpecification" );
+    public static final OntClass LiveRO = M_MODEL.createClass( NS + "LiveRO" );
+    public static final OntClass Modification = M_MODEL.createClass( NS + "Modification" );
+    public static final OntClass Removal = M_MODEL.createClass( NS + "Removal" );
+    public static final OntClass SnapshotRO = M_MODEL.createClass( NS + "SnapshotRO" );
+    public static final OntClass VersionableResource = M_MODEL.createClass( NS + "VersionableResource" );
+    
+
+    public static final ObjectProperty fromVersion = M_MODEL.createObjectProperty( NS + "fromVersion" );
+    public static final ObjectProperty hasArchive = M_MODEL.createObjectProperty( NS + "hasArchive" );
+    public static final ObjectProperty hasChange = M_MODEL.createObjectProperty( NS + "hasChange" );
+    public static final ObjectProperty hasPreviousChange = M_MODEL.createObjectProperty( NS + "hasPreviousChange" );
+    public static final ObjectProperty hasRevision = M_MODEL.createObjectProperty( NS + "hasRevision" );
+    public static final ObjectProperty hasSnapshot = M_MODEL.createObjectProperty( NS + "hasSnapshot" );
+    public static final ObjectProperty isArchiveOf = M_MODEL.createObjectProperty( NS + "isArchiveOf" );
+    public static final ObjectProperty relatedResource = M_MODEL.createObjectProperty( NS + "relatedResource" );
+    public static final ObjectProperty toVersion = M_MODEL.createObjectProperty( NS + "toVersion" );
+    public static final ObjectProperty wasArchivedBy = M_MODEL.createObjectProperty( NS + "wasArchivedBy" );
+    public static final ObjectProperty wasChangedBy = M_MODEL.createObjectProperty( NS + "wasChangedBy" );
+    public static final ObjectProperty wasSnapshotedBy = M_MODEL.createObjectProperty( NS + "wasSnapshotedBy" );
+       
+    public static final DatatypeProperty archivedAtTime = M_MODEL.createDatatypeProperty( NS + "archivedAtTime" );
+    // Note: Typo "snapshoted" in upstream vocabulary
+    public static final DatatypeProperty snapshottedAtTime = M_MODEL.createDatatypeProperty( NS + "snapshotedAtTime" );
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Roterms.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..ae833c9
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Roterms.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants from the Research Object Terms (roterms) vocabulary
+ * 
+ * @see http://wf4ever.github.io/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/roterms";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    
+    public static final OntClass Conclusion = M_MODEL.createClass(NS + "Conclusion");
+    public static final OntClass ExampleRun = M_MODEL.createClass(NS + "ExampleRun");
+    public static final OntClass Hypothesis = M_MODEL.createClass(NS + "Hypothesis");
+    public static final OntClass OptionalInput = M_MODEL.createClass(NS + "OptionalInput");
+    public static final OntClass ProspectiveRun = M_MODEL.createClass(NS + "ProspectiveRun");
+    public static final OntClass ResearchQuestion = M_MODEL.createClass(NS + "ResearchQuestion");
+    public static final OntClass Result = M_MODEL.createClass(NS + "Result");
+    public static final OntClass ResultGenerationRun = M_MODEL.createClass(NS + "ResultGenerationRun");
+    public static final OntClass Sketch = M_MODEL.createClass(NS + "Sketch");
+    public static final OntClass WorkflowValue = M_MODEL.createClass(NS + "WorkflowValue");
+    
+    public static final ObjectProperty defaultValue = M_MODEL.createObjectProperty(NS + "defaultValue");
+    public static final ObjectProperty exampleValue = M_MODEL.createObjectProperty(NS + "exampleValue");
+    public static final ObjectProperty ofSemanticType = M_MODEL.createObjectProperty(NS + "ofSemanticType");
+    public static final ObjectProperty ofStructuralType = M_MODEL.createObjectProperty(NS + "ofStructuralType");
+    public static final ObjectProperty performsTask = M_MODEL.createObjectProperty(NS + "performsTask");
+    public static final ObjectProperty previousWorkflow = M_MODEL.createObjectProperty(NS + "previousWorkflow");
+    public static final ObjectProperty requiresDataset = M_MODEL.createObjectProperty(NS + "requiresDataset");
+    public static final ObjectProperty requiresHardware = M_MODEL.createObjectProperty(NS + "requiresHardware");
+    public static final ObjectProperty requiresSoftware = M_MODEL.createObjectProperty(NS + "requiresSoftware");
+    public static final ObjectProperty subsequentWorkflow = M_MODEL.createObjectProperty(NS + "subsequentWorkflow");
+    public static final ObjectProperty technicalContact = M_MODEL.createObjectProperty(NS + "technicalContact");
+
+    public static final DatatypeProperty sampleSize = M_MODEL.createDatatypeProperty(NS + "sampleSize");
+        
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wf4ever.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..f49c5dd
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wf4ever.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants for the Research Object wf4ever vocabulary
+ * 
+ * @see https://w3id.org/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/wf4ever#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final DatatypeProperty command = M_MODEL.createDatatypeProperty(NS + "command");
+
+    public static final DatatypeProperty filePath = M_MODEL.createDatatypeProperty(NS + "filePath");
+
+    public static final DatatypeProperty parameterFilePath = M_MODEL.createDatatypeProperty(NS + "parameterFilePath");
+    
+    public static final DatatypeProperty rootURI = M_MODEL.createDatatypeProperty(NS + "rootURI");
+    
+    public static final DatatypeProperty script = M_MODEL.createDatatypeProperty(NS + "script");
+    
+    public static final DatatypeProperty serviceURI = M_MODEL.createDatatypeProperty(NS + "serviceURI");
+    
+    public static final DatatypeProperty wsdlOperationName = M_MODEL.createDatatypeProperty(NS + "wsdlOperationName");
+    
+    public static final DatatypeProperty wsdlPortName = M_MODEL.createDatatypeProperty(NS + "wsdlPortName");
+    
+    public static final DatatypeProperty wsdlURI = M_MODEL.createDatatypeProperty(NS + "wsdlURI");
+    
+    public static final OntClass BeanshellScript = M_MODEL.createClass(NS + "BeanshellScript");
+    
+    public static final OntClass CommandLineTool = M_MODEL.createClass(NS + "CommandLineTool");
+    
+    public static final OntClass Dataset = M_MODEL.createClass(NS + "Dataset");
+    
+    public static final OntClass Document = M_MODEL.createClass(NS + "Document");
+    
+    public static final OntClass File = M_MODEL.createClass(NS + "File");
+
+    public static final OntClass FileParameter = M_MODEL.createClass(NS + "FileParameter");
+    
+    public static final OntClass Image = M_MODEL.createClass(NS + "Image");
+
+    public static final OntClass PythonScript = M_MODEL.createClass(NS + "PythonScript");
+
+    public static final OntClass RScript = M_MODEL.createClass(NS + "RScript");
+
+    public static final OntClass RESTService = M_MODEL.createClass(NS + "RESTService");
+         
+    public static final OntClass Script = M_MODEL.createClass(NS + "Script");
+
+    public static final OntClass SOAPService = M_MODEL.createClass(NS + "SOAPService");
+
+    public static final OntClass WebService = M_MODEL.createClass(NS + "WebService");
+    
+    public static final OntClass WorkflowResearchObject = M_MODEL.createClass(NS + "WorkflowResearchObject");
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfdesc.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..8332c02
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfdesc.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *  
+ */
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants for the Research Object wfdesc vocabulary
+ * 
+ * @see https://w3id.org/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/wfdesc#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final ObjectProperty hasArtifact = M_MODEL.createObjectProperty(NS + "hasArtifact");
+
+    public static final ObjectProperty hasConfiguration = M_MODEL.createObjectProperty(NS + "hasConfiguration");    
+    
+    public static final ObjectProperty hasDataLink = M_MODEL.createObjectProperty(NS + "hasDataLink");
+ 
+    public static final ObjectProperty hasImplementation = M_MODEL.createObjectProperty(NS + "hasImplementation");    
+    
+    public static final ObjectProperty hasInput = M_MODEL.createObjectProperty(NS + "hasInput");
+    
+    public static final ObjectProperty hasOutput = M_MODEL.createObjectProperty(NS + "hasOutput");
+    
+    public static final ObjectProperty hasSink = M_MODEL.createObjectProperty(NS + "hasSink");
+    
+    public static final ObjectProperty hasSource = M_MODEL.createObjectProperty(NS + "hasSource");
+    
+    public static final ObjectProperty hasSubProcess = M_MODEL.createObjectProperty(NS + "hasSubProcess");
+    
+    public static final ObjectProperty hasSubWorkflow = M_MODEL.createObjectProperty(NS + "hasSubWorkflow");
+
+    public static final ObjectProperty hasWorkflowDefinition = M_MODEL.createObjectProperty(NS + "hasWorkflowDefinition");    
+    
+    public static final OntClass Artifact = M_MODEL.createClass(NS + "Artifact");
+
+    public static final OntClass Configuration = M_MODEL.createClass(NS + "Configuration");
+
+    public static final OntClass DataLink = M_MODEL.createClass(NS + "DataLink");
+    
+    public static final OntClass Input = M_MODEL.createClass(NS + "Input");
+    
+    public static final OntClass Output = M_MODEL.createClass(NS + "Output");
+    
+    public static final OntClass Parameter = M_MODEL.createClass(NS + "Parameter");
+    
+    public static final OntClass Process = M_MODEL.createClass(NS + "Process");
+
+    public static final OntClass ProcessImplementation = M_MODEL.createClass(NS + "ProcessImplementation");
+    
+    public static final OntClass Workflow = M_MODEL.createClass(NS + "Workflow");
+
+    public static final OntClass WorkflowDefinition = M_MODEL.createClass(NS + "WorkflowDefinition");
+    
+    public static final OntClass WorkflowInstance = M_MODEL.createClass(NS + "WorkflowInstance");
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfprov.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..080d228
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/Wfprov.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+package org.apache.taverna.ro.vocabs; 
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.ontology.*;
+ 
+/**
+ * Constants for the Research Object wfprov vocabulary
+ * 
+ * @see https://w3id.org/ro/2016-01-28/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 );
+    
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://purl.org/wf4ever/wfprov#";
+    
+    /** <p>The namespace of the vocabulary as a string</p>
+     * @return namespace as String
+     * @see #NS */
+    public static String getURI() {return NS;}
+    
+    /** <p>The namespace of the vocabulary as a resource</p> */
+    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
+    
+    public static final ObjectProperty describedByParameter = M_MODEL.createObjectProperty(NS + "describedByParameter");
+    
+    public static final ObjectProperty describedByProcess = M_MODEL.createObjectProperty(NS + "describedByProcess");
+    
+    public static final ObjectProperty describedByWorkflow = M_MODEL.createObjectProperty(NS + "describedByWorkflow");
+    
+    public static final ObjectProperty interactedWith = M_MODEL.createObjectProperty(NS + "interactedWith");
+        
+    public static final ObjectProperty usedInput = M_MODEL.createObjectProperty(NS + "usedInput");
+    
+    public static final ObjectProperty wasEnactedBy = M_MODEL.createObjectProperty(NS + "wasEnactedBy");
+    
+    public static final ObjectProperty wasInitiatedBy = M_MODEL.createObjectProperty(NS + "wasInitiatedBy");    
+    
+    public static final ObjectProperty wasOutputFrom = M_MODEL.createObjectProperty(NS + "wasOutputFrom");
+    
+    public static final ObjectProperty wasPartOfWorkflowRun = M_MODEL.createObjectProperty(NS + "wasPartOfWorkflowRun");
+    
+    
+    public static final OntClass Artifact = M_MODEL.createClass(NS + "Artifact");
+    
+    public static final OntClass ProcessRun = M_MODEL.createClass(NS + "ProcessRun");
+    
+    public static final OntClass WorkflowEngine = M_MODEL.createClass(NS + "WorkflowEngine");
+    
+    public static final OntClass WorkflowRun = M_MODEL.createClass(NS + "WorkflowRun");
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/package-info.java
----------------------------------------------------------------------
diff --git a/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/package-info.java b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/package-info.java
new file mode 100644
index 0000000..3cba91d
--- /dev/null
+++ b/taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Constants for vocabularies used by Research Object model
+ * 
+ * @see https://w3id.org/ro/2016-01-28/
+ *
+ */
+package org.apache.taverna.ro.vocabs;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/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 7599599..0a8d684 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,10 +25,10 @@ package org.apache.taverna.scufl2.wfdesc;
 
 import java.io.OutputStream;
 
+import org.apache.taverna.ro.vocabs.Prov_o;
 import org.apache.taverna.scufl2.api.annotation.Revision;
 import org.apache.taverna.scufl2.api.core.Workflow;
 import org.apache.taverna.scufl2.api.io.WriterException;
-import org.apache.taverna.scufl2.wfdesc.ontologies.Prov_o;
 import org.apache.jena.ontology.Individual;
 import org.apache.jena.ontology.OntClass;
 import org.apache.jena.ontology.OntModel;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/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 7ba000e..8459618 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,6 +39,10 @@ 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_o;
+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.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.annotation.Annotation;
 import org.apache.taverna.scufl2.api.common.Child;
@@ -59,10 +63,6 @@ import org.apache.taverna.scufl2.api.port.WorkflowPort;
 import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
 import org.apache.taverna.scufl2.api.profiles.ProcessorPortBinding;
 import org.apache.taverna.scufl2.api.profiles.Profile;
-import org.apache.taverna.scufl2.wfdesc.ontologies.Prov_o;
-import org.apache.taverna.scufl2.wfdesc.ontologies.Roterms;
-import org.apache.taverna.scufl2.wfdesc.ontologies.Wf4ever;
-import org.apache.taverna.scufl2.wfdesc.ontologies.Wfdesc;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Foaf.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Foaf.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Foaf.java
deleted file mode 100644
index 299e955..0000000
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Foaf.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.taverna.scufl2.wfdesc.ontologies; 
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
- 
-/**
- * Constants from the Friend of a Friend (FOAF) namespace
- * 
- * @see http://xmlns.com/foaf/0.1/
- *
- */
-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 );
-    
-    /** <p>The namespace of the vocabulary as a string</p> */
-    public static final String NS = "http://xmlns.com/foaf/0.1/";
-    
-    /** <p>The namespace of the vocabulary as a string</p>
-     * @return namespace as String
-     * @see #NS */
-    public static String getURI() {return NS;}
-
-    /** <p>The namespace of the vocabulary as a resource</p> */
-    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
-    
-    public static final ObjectProperty account = M_MODEL.createObjectProperty(NS + "account");
-    
-    public static final ObjectProperty accountServiceHomepage = M_MODEL.createObjectProperty(NS + "accountServiceHomepage");
-    
-    public static final ObjectProperty based_near = M_MODEL.createObjectProperty(NS + "based_near");
-    
-    public static final ObjectProperty currentProject = M_MODEL.createObjectProperty(NS + "currentProject");
-    
-    public static final ObjectProperty depiction = M_MODEL.createObjectProperty(NS + "depiction");
-    
-    public static final ObjectProperty depicts = M_MODEL.createObjectProperty(NS + "depicts");
-    
-    public static final ObjectProperty fundedBy = M_MODEL.createObjectProperty(NS + "fundedBy");
-    
-    public static final ObjectProperty holdsAccount = M_MODEL.createObjectProperty(NS + "holdsAccount");
-    
-    public static final ObjectProperty homepage = M_MODEL.createObjectProperty(NS + "homepage");
-    
-    public static final ObjectProperty img = M_MODEL.createObjectProperty(NS + "img");
-    
-    public static final ObjectProperty interest = M_MODEL.createObjectProperty(NS + "interest");
-    
-    public static final ObjectProperty knows = M_MODEL.createObjectProperty(NS + "knows");
-    
-    public static final ObjectProperty logo = M_MODEL.createObjectProperty(NS + "logo");
-    
-    public static final ObjectProperty made = M_MODEL.createObjectProperty(NS + "made");
-    
-    public static final ObjectProperty maker = M_MODEL.createObjectProperty(NS + "maker");
-    
-    public static final ObjectProperty mbox = M_MODEL.createObjectProperty(NS + "mbox");
-    
-    public static final ObjectProperty member = M_MODEL.createObjectProperty(NS + "member");
-    
-    public static final ObjectProperty openid = M_MODEL.createObjectProperty(NS + "openid");
-    
-    public static final ObjectProperty page = M_MODEL.createObjectProperty(NS + "page");
-    
-    public static final ObjectProperty pastProject = M_MODEL.createObjectProperty(NS + "pastProject");
-    
-    public static final ObjectProperty phone = M_MODEL.createObjectProperty(NS + "phone");
-    
-    public static final ObjectProperty primaryTopic = M_MODEL.createObjectProperty(NS + "primaryTopic");
-    
-    public static final ObjectProperty publications = M_MODEL.createObjectProperty(NS + "publications");
-    
-    public static final ObjectProperty schoolHomepage = M_MODEL.createObjectProperty(NS + "schoolHomepage");
-    
-    public static final ObjectProperty theme = M_MODEL.createObjectProperty(NS + "theme");
-    
-    public static final ObjectProperty thumbnail = M_MODEL.createObjectProperty(NS + "thumbnail");
-    
-    public static final ObjectProperty tipjar = M_MODEL.createObjectProperty(NS + "tipjar");
-    
-    public static final ObjectProperty topic = M_MODEL.createObjectProperty(NS + "topic");
-    
-    public static final ObjectProperty topic_interest = M_MODEL.createObjectProperty(NS + "topic_interest");
-    
-    public static final ObjectProperty weblog = M_MODEL.createObjectProperty(NS + "weblog");
-    
-    public static final ObjectProperty workInfoHomepage = M_MODEL.createObjectProperty(NS + "workInfoHomepage");
-    
-    public static final ObjectProperty workplaceHomepage = M_MODEL.createObjectProperty(NS + "workplaceHomepage");
-    
-    public static final DatatypeProperty accountName = M_MODEL.createDatatypeProperty(NS + "accountName");
-    
-    public static final DatatypeProperty age = M_MODEL.createDatatypeProperty(NS + "age");
-    
-    public static final DatatypeProperty aimChatID = M_MODEL.createDatatypeProperty(NS + "aimChatID");
-    
-    public static final DatatypeProperty birthday = M_MODEL.createDatatypeProperty(NS + "birthday");
-    
-    public static final DatatypeProperty dnaChecksum = M_MODEL.createDatatypeProperty(NS + "dnaChecksum");
-    
-    public static final DatatypeProperty familyName = M_MODEL.createDatatypeProperty(NS + "familyName");
-    
-    public static final DatatypeProperty family_name = M_MODEL.createDatatypeProperty(NS + "family_name");
-    
-    public static final DatatypeProperty firstName = M_MODEL.createDatatypeProperty(NS + "firstName");
-    
-    public static final DatatypeProperty geekcode = M_MODEL.createDatatypeProperty(NS + "geekcode");
-    
-    public static final DatatypeProperty gender = M_MODEL.createDatatypeProperty(NS + "gender");
-    
-    public static final DatatypeProperty givenName = M_MODEL.createDatatypeProperty(NS + "givenName");
-    
-    public static final DatatypeProperty givenname = M_MODEL.createDatatypeProperty(NS + "givenname");
-    
-    public static final DatatypeProperty icqChatID = M_MODEL.createDatatypeProperty(NS + "icqChatID");
-    
-    public static final DatatypeProperty jabberID = M_MODEL.createDatatypeProperty(NS + "jabberID");
-    
-    public static final DatatypeProperty lastName = M_MODEL.createDatatypeProperty(NS + "lastName");
-    
-    public static final DatatypeProperty mbox_sha1sum = M_MODEL.createDatatypeProperty(NS + "mbox_sha1sum");
-    
-    public static final DatatypeProperty msnChatID = M_MODEL.createDatatypeProperty(NS + "msnChatID");
-    
-    public static final DatatypeProperty myersBriggs = M_MODEL.createDatatypeProperty(NS + "myersBriggs");
-    
-    public static final DatatypeProperty name = M_MODEL.createDatatypeProperty(NS + "name");
-    
-    public static final DatatypeProperty nick = M_MODEL.createDatatypeProperty(NS + "nick");
-    
-    public static final DatatypeProperty plan = M_MODEL.createDatatypeProperty(NS + "plan");
-    
-    public static final DatatypeProperty sha1 = M_MODEL.createDatatypeProperty(NS + "sha1");
-    
-    public static final DatatypeProperty skypeID = M_MODEL.createDatatypeProperty(NS + "skypeID");
-    
-    public static final DatatypeProperty status = M_MODEL.createDatatypeProperty(NS + "status");
-    
-    public static final DatatypeProperty surname = M_MODEL.createDatatypeProperty(NS + "surname");
-    
-    public static final DatatypeProperty title = M_MODEL.createDatatypeProperty(NS + "title");
-    
-    public static final DatatypeProperty yahooChatID = M_MODEL.createDatatypeProperty(NS + "yahooChatID");
-    
-    public static final AnnotationProperty membershipClass = M_MODEL.createAnnotationProperty(NS + "membershipClass");
-    
-    public static final OntProperty isPrimaryTopicOf = M_MODEL.createOntProperty(NS + "isPrimaryTopicOf");
-    
-    public static final OntClass Agent = M_MODEL.createClass(NS + "Agent");
-    
-    public static final OntClass Document = M_MODEL.createClass(NS + "Document");
-    
-    public static final OntClass Group = M_MODEL.createClass(NS + "Group");
-    
-    public static final OntClass Image = M_MODEL.createClass(NS + "Image");
-    
-    public static final OntClass LabelProperty = M_MODEL.createClass(NS + "LabelProperty");
-    
-    public static final OntClass OnlineAccount = M_MODEL.createClass(NS + "OnlineAccount");
-    
-    public static final OntClass OnlineChatAccount = M_MODEL.createClass(NS + "OnlineChatAccount");
-    
-    public static final OntClass OnlineEcommerceAccount = M_MODEL.createClass(NS + "OnlineEcommerceAccount");
-    
-    public static final OntClass OnlineGamingAccount = M_MODEL.createClass(NS + "OnlineGamingAccount");
-    
-    public static final OntClass Organization = M_MODEL.createClass(NS + "Organization");
-    
-    public static final OntClass Person = M_MODEL.createClass(NS + "Person");
-    
-    public static final OntClass PersonalProfileDocument = M_MODEL.createClass(NS + "PersonalProfileDocument");
-    
-    public static final OntClass Project = M_MODEL.createClass(NS + "Project");
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Prov_o.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Prov_o.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Prov_o.java
deleted file mode 100644
index ce15d87..0000000
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Prov_o.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.taverna.scufl2.wfdesc.ontologies; 
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
- 
-/**
- * Constants from the W3C PROV-O vocabulary
- * 
- * @see https://www.w3.org/TR/prov-o/
- */
-public class Prov_o {
-    /** <p>The ontology model that holds the vocabulary terms</p> */
-    private static final OntModel M_MODEL = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
-    
-    /** <p>The namespace of the vocabulary as a string</p> */
-    public static final String NS = "http://www.w3.org/ns/prov#";
-    
-    /** <p>The namespace of the vocabulary as a string</p>
-     * @return namespace as String
-     * @see #NS */
-    public static String getURI() {return NS;}
-    
-    /** <p>The namespace of the vocabulary as a resource</p> */
-    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
-    
-    public static final ObjectProperty actedOnBehalfOf = M_MODEL.createObjectProperty(NS + "actedOnBehalfOf");
-    
-    public static final ObjectProperty activity = M_MODEL.createObjectProperty(NS + "activity");
-    
-    public static final ObjectProperty agent = M_MODEL.createObjectProperty(NS + "agent");
-    
-    public static final ObjectProperty alternateOf = M_MODEL.createObjectProperty(NS + "alternateOf");
-    
-    public static final ObjectProperty atLocation = M_MODEL.createObjectProperty(NS + "atLocation");
-    
-    public static final ObjectProperty entity = M_MODEL.createObjectProperty(NS + "entity");
-    
-    public static final ObjectProperty generated = M_MODEL.createObjectProperty(NS + "generated");
-    
-    public static final ObjectProperty hadActivity = M_MODEL.createObjectProperty(NS + "hadActivity");
-    
-    public static final ObjectProperty hadGeneration = M_MODEL.createObjectProperty(NS + "hadGeneration");
-    
-    public static final ObjectProperty hadMember = M_MODEL.createObjectProperty(NS + "hadMember");
-    
-    public static final ObjectProperty hadPlan = M_MODEL.createObjectProperty(NS + "hadPlan");
-    
-    public static final ObjectProperty hadPrimarySource = M_MODEL.createObjectProperty(NS + "hadPrimarySource");
-    
-    public static final ObjectProperty hadRole = M_MODEL.createObjectProperty(NS + "hadRole");
-    
-    public static final ObjectProperty hadUsage = M_MODEL.createObjectProperty(NS + "hadUsage");
-    
-    public static final ObjectProperty influenced = M_MODEL.createObjectProperty(NS + "influenced");
-    
-    public static final ObjectProperty influencer = M_MODEL.createObjectProperty(NS + "influencer");
-    
-    public static final ObjectProperty invalidated = M_MODEL.createObjectProperty(NS + "invalidated");
-    
-    public static final ObjectProperty qualifiedAssociation = M_MODEL.createObjectProperty(NS + "qualifiedAssociation");
-    
-    public static final ObjectProperty qualifiedAttribution = M_MODEL.createObjectProperty(NS + "qualifiedAttribution");
-    
-    public static final ObjectProperty qualifiedCommunication = M_MODEL.createObjectProperty(NS + "qualifiedCommunication");
-    
-    public static final ObjectProperty qualifiedDelegation = M_MODEL.createObjectProperty(NS + "qualifiedDelegation");
-    
-    public static final ObjectProperty qualifiedDerivation = M_MODEL.createObjectProperty(NS + "qualifiedDerivation");
-    
-    public static final ObjectProperty qualifiedEnd = M_MODEL.createObjectProperty(NS + "qualifiedEnd");
-    
-    public static final ObjectProperty qualifiedGeneration = M_MODEL.createObjectProperty(NS + "qualifiedGeneration");
-    
-    public static final ObjectProperty qualifiedInfluence = M_MODEL.createObjectProperty(NS + "qualifiedInfluence");
-    
-    public static final ObjectProperty qualifiedInvalidation = M_MODEL.createObjectProperty(NS + "qualifiedInvalidation");
-    
-    public static final ObjectProperty qualifiedPrimarySource = M_MODEL.createObjectProperty(NS + "qualifiedPrimarySource");
-    
-    public static final ObjectProperty qualifiedQuotation = M_MODEL.createObjectProperty(NS + "qualifiedQuotation");
-    
-    public static final ObjectProperty qualifiedRevision = M_MODEL.createObjectProperty(NS + "qualifiedRevision");
-    
-    public static final ObjectProperty qualifiedStart = M_MODEL.createObjectProperty(NS + "qualifiedStart");
-    
-    public static final ObjectProperty qualifiedUsage = M_MODEL.createObjectProperty(NS + "qualifiedUsage");
-    
-    public static final ObjectProperty specializationOf = M_MODEL.createObjectProperty(NS + "specializationOf");
-    
-    public static final ObjectProperty used = M_MODEL.createObjectProperty(NS + "used");
-    
-    public static final ObjectProperty wasAssociatedWith = M_MODEL.createObjectProperty(NS + "wasAssociatedWith");
-    
-    public static final ObjectProperty wasAttributedTo = M_MODEL.createObjectProperty(NS + "wasAttributedTo");
-    
-    public static final ObjectProperty wasDerivedFrom = M_MODEL.createObjectProperty(NS + "wasDerivedFrom");
-    
-    public static final ObjectProperty wasEndedBy = M_MODEL.createObjectProperty(NS + "wasEndedBy");
-    
-    public static final ObjectProperty wasGeneratedBy = M_MODEL.createObjectProperty(NS + "wasGeneratedBy");
-    
-    public static final ObjectProperty wasInfluencedBy = M_MODEL.createObjectProperty(NS + "wasInfluencedBy");
-    
-    public static final ObjectProperty wasInformedBy = M_MODEL.createObjectProperty(NS + "wasInformedBy");
-    
-    public static final ObjectProperty wasInvalidatedBy = M_MODEL.createObjectProperty(NS + "wasInvalidatedBy");
-    
-    public static final ObjectProperty wasQuotedFrom = M_MODEL.createObjectProperty(NS + "wasQuotedFrom");
-    
-    public static final ObjectProperty wasRevisionOf = M_MODEL.createObjectProperty(NS + "wasRevisionOf");
-    
-    public static final ObjectProperty wasStartedBy = M_MODEL.createObjectProperty(NS + "wasStartedBy");
-    
-    public static final DatatypeProperty atTime = M_MODEL.createDatatypeProperty(NS + "atTime");
-    
-    public static final DatatypeProperty endedAtTime = M_MODEL.createDatatypeProperty(NS + "endedAtTime");
-    
-    public static final DatatypeProperty generatedAtTime = M_MODEL.createDatatypeProperty(NS + "generatedAtTime");
-    
-    public static final DatatypeProperty invalidatedAtTime = M_MODEL.createDatatypeProperty(NS + "invalidatedAtTime");
-    
-    public static final DatatypeProperty startedAtTime = M_MODEL.createDatatypeProperty(NS + "startedAtTime");
-    
-    public static final DatatypeProperty value = M_MODEL.createDatatypeProperty(NS + "value");
-    
-    public static final AnnotationProperty aq = M_MODEL.createAnnotationProperty(NS + "aq");
-    
-    public static final AnnotationProperty category = M_MODEL.createAnnotationProperty(NS + "category");
-    
-    public static final AnnotationProperty component = M_MODEL.createAnnotationProperty(NS + "component");
-    
-    public static final AnnotationProperty constraints = M_MODEL.createAnnotationProperty(NS + "constraints");
-    
-    public static final AnnotationProperty definition = M_MODEL.createAnnotationProperty(NS + "definition");
-    
-    public static final AnnotationProperty dm = M_MODEL.createAnnotationProperty(NS + "dm");
-    
-    public static final AnnotationProperty editorialNote = M_MODEL.createAnnotationProperty(NS + "editorialNote");
-    
-    public static final AnnotationProperty editorsDefinition = M_MODEL.createAnnotationProperty(NS + "editorsDefinition");
-    
-    public static final AnnotationProperty inverse = M_MODEL.createAnnotationProperty(NS + "inverse");
-    
-    public static final AnnotationProperty n = M_MODEL.createAnnotationProperty(NS + "n");
-    
-    public static final AnnotationProperty order = M_MODEL.createAnnotationProperty(NS + "order");
-    
-    public static final AnnotationProperty qualifiedForm = M_MODEL.createAnnotationProperty(NS + "qualifiedForm");
-    
-    public static final AnnotationProperty sharesDefinitionWith = M_MODEL.createAnnotationProperty(NS + "sharesDefinitionWith");
-    
-    public static final AnnotationProperty todo = M_MODEL.createAnnotationProperty(NS + "todo");
-    
-    public static final AnnotationProperty unqualifiedForm = M_MODEL.createAnnotationProperty(NS + "unqualifiedForm");
-    
-    public static final OntClass Activity = M_MODEL.createClass(NS + "Activity");
-    
-    public static final OntClass ActivityInfluence = M_MODEL.createClass(NS + "ActivityInfluence");
-    
-    public static final OntClass Agent = M_MODEL.createClass(NS + "Agent");
-    
-    public static final OntClass AgentInfluence = M_MODEL.createClass(NS + "AgentInfluence");
-    
-    public static final OntClass Association = M_MODEL.createClass(NS + "Association");
-    
-    public static final OntClass Attribution = M_MODEL.createClass(NS + "Attribution");
-    
-    public static final OntClass Bundle = M_MODEL.createClass(NS + "Bundle");
-    
-    public static final OntClass Collection = M_MODEL.createClass(NS + "Collection");
-    
-    public static final OntClass Communication = M_MODEL.createClass(NS + "Communication");
-    
-    public static final OntClass Delegation = M_MODEL.createClass(NS + "Delegation");
-    
-    public static final OntClass Derivation = M_MODEL.createClass(NS + "Derivation");
-    
-    public static final OntClass EmptyCollection = M_MODEL.createClass(NS + "EmptyCollection");
-    
-    public static final OntClass End = M_MODEL.createClass(NS + "End");
-    
-    public static final OntClass Entity = M_MODEL.createClass(NS + "Entity");
-    
-    public static final OntClass EntityInfluence = M_MODEL.createClass(NS + "EntityInfluence");
-    
-    public static final OntClass Generation = M_MODEL.createClass(NS + "Generation");
-    
-    public static final OntClass Influence = M_MODEL.createClass(NS + "Influence");
-    
-    public static final OntClass InstantaneousEvent = M_MODEL.createClass(NS + "InstantaneousEvent");
-    
-    public static final OntClass Invalidation = M_MODEL.createClass(NS + "Invalidation");
-    
-    public static final OntClass Location = M_MODEL.createClass(NS + "Location");
-    
-    public static final OntClass Organization = M_MODEL.createClass(NS + "Organization");
-    
-    public static final OntClass Person = M_MODEL.createClass(NS + "Person");
-    
-    public static final OntClass Plan = M_MODEL.createClass(NS + "Plan");
-    
-    public static final OntClass PrimarySource = M_MODEL.createClass(NS + "PrimarySource");
-    
-    public static final OntClass Quotation = M_MODEL.createClass(NS + "Quotation");
-    
-    public static final OntClass Revision = M_MODEL.createClass(NS + "Revision");
-    
-    public static final OntClass Role = M_MODEL.createClass(NS + "Role");
-    
-    public static final OntClass SoftwareAgent = M_MODEL.createClass(NS + "SoftwareAgent");
-    
-    public static final OntClass Start = M_MODEL.createClass(NS + "Start");
-    
-    public static final OntClass Usage = M_MODEL.createClass(NS + "Usage");
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b34dd573/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java
deleted file mode 100644
index 9a1feab..0000000
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-package org.apache.taverna.scufl2.wfdesc.ontologies; 
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.ontology.*;
- 
-/**
- * Constants for the Research Object ro vocabulary
- * 
- * @see https://w3id.org/ro/2016-01-28/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 );
-    
-    /** <p>The namespace of the vocabulary as a string</p> */
-    public static final String NS = "http://purl.org/wf4ever/ro#";
-    
-    /** <p>The namespace of the vocabulary as a string</p>
-     * @return namespace as String
-     * @see #NS */
-    public static String getURI() {return NS;}
-    
-    /** <p>The namespace of the vocabulary as a resource</p> */
-    public static final Resource NAMESPACE = M_MODEL.createResource( NS );
-    
-    public static final OntClass AggregatedAnnotation = M_MODEL.createClass( NS + "AggregatedAnnotation" );
-    public static final OntClass Folder = M_MODEL.createClass( NS + "Folder" );
-    public static final OntClass FolderEntry = M_MODEL.createClass( NS + "FolderEntry" );
-    public static final OntClass Manifest = M_MODEL.createClass( NS + "Manifest" );
-    public static final OntClass ResearchObject = M_MODEL.createClass( NS + "ResearchObject" );
-    public static final OntClass Resource = M_MODEL.createClass( NS + "Resource" );
-
-    public static final ObjectProperty annotatesAggregatedResource = M_MODEL.createObjectProperty( NS + "annotatesAggregatedResource" );
-    public static final ObjectProperty rootFolder = M_MODEL.createObjectProperty( NS + "rootFolder" );
-    
-    public static final DatatypeProperty entryName = M_MODEL.createDatatypeProperty( NS + "entryName" );
-    
-}