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 2019/01/30 19:11:48 UTC
[incubator-taverna-language] branch master updated (7f32f6e ->
c5c5bfb)
This is an automated email from the ASF dual-hosted git repository.
stain pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-taverna-language.git.
from 7f32f6e Merge branch 'master' of github.com:apache/incubator-taverna-language
add 68ad29a add taverna-scufl2-ro-vocabs module
add b34dd57 Moved vocularies to taverna-ro-vocabs
add 58a7618 Add PROV-AQ terms
add d510013 Hand-coded vocabularies instead of including ontologies
add 4ebeadc Shrink LICENSE as ontologies are no longer included
add 329cef4 Updated xenc-schema.xsd now Software License header
add 936293f w3c licenses
add 0ba3ddf Avoid roevo CC-BY license
add 9bd8687 Updated w3c licenses and reference local copy
add 74718a7 Reference/include w3c licenses
add c6175ca Relative path for ./xmldsig-core-schema.xsd
add 1ad20c1 lowercase vocabulary prefix name
add 97739d6 Use new taverna-ro-vocabs constants
add 0d01d92 more Prov -> prov
add 93f45f0 also avoid XMLSchema.dtd
add cf54132 xml typo
add c7b1638 text/plain fun
add ac330a9 Merge branch 'master' into no-ontologies
add 1a3eaaf correct oa namespace
add 32564ac use jdom2 servicemix bundle
add c5c5bfb shrink test dependencies, use jdom2 if needed
No new revisions were added by this update.
Summary of changes:
LICENSE | 123 +-
NOTICE | 16 +
pom.xml | 30 +-
.../pom.xml | 29 +-
.../java/org/apache/taverna/ro/vocabs/bundle.java | 30 +-
.../java/org/apache/taverna/ro/vocabs/foaf.java | 101 +-
.../main/java/org/apache/taverna/ro/vocabs/oa.java | 123 ++
.../java/org/apache/taverna/ro/vocabs/ore.java | 62 +
.../org/apache/taverna/ro/vocabs/package-info.java | 23 +
.../java/org/apache/taverna/ro/vocabs/pav.java | 326 ++++
.../java/org/apache/taverna/ro/vocabs/prov.java | 129 +-
.../main/java/org/apache/taverna/ro/vocabs/ro.java | 19 +-
.../java/org/apache/taverna/ro/vocabs/roevo.java | 14 +-
.../java/org/apache/taverna/ro/vocabs/roterms.java | 15 +-
.../java/org/apache/taverna/ro/vocabs/wf4ever.java | 40 +-
.../java/org/apache/taverna/ro/vocabs/wfdesc.java | 35 +-
.../java/org/apache/taverna/ro/vocabs/wfprov.java | 31 +-
.../src/main/resources/ontologies/bundle.owl | 0
.../src/main/resources/ontologies/oa.rdf | 3 +-
.../src/main/resources/ontologies/ore-owl.owl | 0
taverna-robundle/pom.xml | 5 +
.../taverna/robundle/manifest/RDFToManifest.java | 331 +---
.../src/main/resources/META-INF/LICENSE | 138 +-
.../main/resources/META-INF/LICENSE.w3c.19980720 | 51 +
.../main/resources/META-INF/LICENSE.w3c.20021231 | 62 +
.../src/main/resources/ontologies/dcam.owl | 49 -
.../src/main/resources/ontologies/dcterms_od.owl | 607 -------
.../src/main/resources/ontologies/foaf.rdf | 620 -------
.../src/main/resources/ontologies/pav.rdf | 568 -------
.../src/main/resources/ontologies/prov-aq.rdf | 351 ----
.../src/main/resources/ontologies/prov-o.rdf | 1798 --------------------
.../src/main/resources/ontologies/ro.owl | 218 ---
taverna-robundle/src/main/xsd/xenc-schema.xsd | 71 +-
.../taverna/robundle/manifest/TestManifest.java | 2 +-
.../robundle/manifest/TestManifestJSON.java | 4 +-
.../robundle/manifest/TestRDFToManifest.java | 2 +-
taverna-robundle/src/test/resources/manifest.json | 2 +-
.../src/main/resources/META-INF/LICENSE | 18 +-
.../main/resources/META-INF/LICENSE.w3c.document | 86 +
.../org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd | 27 -
.../org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd | 6 +-
taverna-scufl2-scufl/pom.xml | 19 -
taverna-scufl2-t2flow/pom.xml | 19 -
taverna-scufl2-ucfpackage/pom.xml | 6 +-
.../taverna/scufl2/ucfpackage/TestUCFPackage.java | 15 +-
taverna-scufl2-wfbundle/pom.xml | 6 +-
.../scufl2/rdfxml/TestRDFXMLSerializer.java | 14 +-
taverna-scufl2-wfdesc/pom.xml | 6 +
.../taverna/scufl2/wfdesc/ROEvoSerializer.java | 10 +-
.../taverna/scufl2/wfdesc/WfdescSerialiser.java | 78 +-
.../taverna/scufl2/wfdesc/TestRoEvoSerializer.java | 8 +-
51 files changed, 1119 insertions(+), 5227 deletions(-)
copy {taverna-scufl2-annotation => taverna-ro-vocabs}/pom.xml (65%)
mode change 100644 => 100755
copy taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/bundle.java (56%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Foaf.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/foaf.java (92%)
create mode 100644 taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/oa.java
create mode 100644 taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ore.java
create mode 100644 taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/package-info.java
create mode 100644 taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/pav.java
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Prov_o.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/prov.java (86%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/RO.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/ro.java (82%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/ROEvo.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roevo.java (91%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Roterms.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/roterms.java (90%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Wf4ever.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wf4ever.java (91%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Wfdesc.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfdesc.java (91%)
rename taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ontologies/Wfprov.java => taverna-ro-vocabs/src/main/java/org/apache/taverna/ro/vocabs/wfprov.java (89%)
rename {taverna-robundle => taverna-ro-vocabs}/src/main/resources/ontologies/bundle.owl (100%)
rename {taverna-robundle => taverna-ro-vocabs}/src/main/resources/ontologies/oa.rdf (99%)
rename {taverna-robundle => taverna-ro-vocabs}/src/main/resources/ontologies/ore-owl.owl (100%)
create mode 100644 taverna-robundle/src/main/resources/META-INF/LICENSE.w3c.19980720
create mode 100644 taverna-robundle/src/main/resources/META-INF/LICENSE.w3c.20021231
delete mode 100644 taverna-robundle/src/main/resources/ontologies/dcam.owl
delete mode 100644 taverna-robundle/src/main/resources/ontologies/dcterms_od.owl
delete mode 100644 taverna-robundle/src/main/resources/ontologies/foaf.rdf
delete mode 100644 taverna-robundle/src/main/resources/ontologies/pav.rdf
delete mode 100644 taverna-robundle/src/main/resources/ontologies/prov-aq.rdf
delete mode 100644 taverna-robundle/src/main/resources/ontologies/prov-o.rdf
delete mode 100644 taverna-robundle/src/main/resources/ontologies/ro.owl
create mode 100644 taverna-scufl2-schemas/src/main/resources/META-INF/LICENSE.w3c.document