TAVERNA-892 Use Jena 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/d5fa214e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/d5fa214e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/d5fa214e Branch: refs/heads/master Commit: d5fa214e2c3c83f9c805ea555e234bfda0b9a8ca Parents: e3df771 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Feb 22 13:25:05 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Feb 22 13:25:05 2016 +0000 ---------------------------------------------------------------------- .../purl/wf4ever/provtaverna/owl/ProvModel.java | 24 ++++++++++---------- .../provtaverna/owl/TavernaProvModel.java | 10 ++++---- .../wf4ever/provtaverna/owl/WfprovModel.java | 10 ++++---- .../wf4ever/provtaverna/owl/TestProvModel.java | 2 +- .../provtaverna/owl/TestTavernaProvModel.java | 6 ++--- .../provtaverna/owl/TestWfprovModel.java | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/ProvModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/ProvModel.java b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/ProvModel.java index e1bfab7..9b3a4f6 100644 --- a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/ProvModel.java +++ b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/ProvModel.java @@ -8,18 +8,18 @@ import org.apache.jena.riot.IO_Jena; import org.apache.jena.riot.system.IO_JenaWriters; import org.apache.log4j.Logger; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.FileManager; -import com.hp.hpl.jena.util.LocationMapper; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.FileManager; +import org.apache.jena.util.LocationMapper; public class ProvModel { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/TavernaProvModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/TavernaProvModel.java b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/TavernaProvModel.java index b0f0766..e743294 100644 --- a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/TavernaProvModel.java +++ b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/TavernaProvModel.java @@ -2,11 +2,11 @@ package org.purl.wf4ever.provtaverna.owl; import java.net.URI; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; public class TavernaProvModel extends WfprovModel { protected static final String CNT = "http://www.w3.org/2011/content#";; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/WfprovModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/WfprovModel.java b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/WfprovModel.java index f20542b..a9c6e64 100644 --- a/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/WfprovModel.java +++ b/taverna-prov-owl-bindings/src/main/java/org/purl/wf4ever/provtaverna/owl/WfprovModel.java @@ -2,11 +2,11 @@ package org.purl.wf4ever.provtaverna.owl; import java.net.URI; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; public class WfprovModel extends ProvModel { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestProvModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestProvModel.java b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestProvModel.java index 167b577..44a79ef 100644 --- a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestProvModel.java +++ b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestProvModel.java @@ -7,7 +7,7 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.Individual; +import org.apache.jena.ontology.Individual; public class TestProvModel { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestTavernaProvModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestTavernaProvModel.java b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestTavernaProvModel.java index cfa5457..6d3fd7c 100644 --- a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestTavernaProvModel.java +++ b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestTavernaProvModel.java @@ -14,9 +14,9 @@ import org.apache.jena.riot.system.RiotLib; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.sparql.util.Context; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.sparql.util.Context; public class TestTavernaProvModel { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/d5fa214e/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestWfprovModel.java ---------------------------------------------------------------------- diff --git a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestWfprovModel.java b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestWfprovModel.java index e7c8ae3..36fddfc 100644 --- a/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestWfprovModel.java +++ b/taverna-prov-owl-bindings/src/test/java/org/purl/wf4ever/provtaverna/owl/TestWfprovModel.java @@ -6,7 +6,7 @@ import java.util.UUID; import org.junit.Test; -import com.hp.hpl.jena.ontology.Individual; +import org.apache.jena.ontology.Individual; public class TestWfprovModel {
