diff --git a/cli/src/main/java/pellet/PelletCmdApp.java b/cli/src/main/java/pellet/PelletCmdApp.java index 9ab72b5c2..06aacc94e 100644 --- a/cli/src/main/java/pellet/PelletCmdApp.java +++ b/cli/src/main/java/pellet/PelletCmdApp.java @@ -33,10 +33,10 @@ import org.mindswap.pellet.utils.Timers; import com.clarkparsia.pellet.owlapiv3.OWLAPILoader; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFReaderF; -import com.hp.hpl.jena.shared.NoReaderForLangException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFReaderF; +import org.apache.jena.shared.NoReaderForLangException; /** *

diff --git a/cli/src/main/java/pellet/PelletExtractInferences.java b/cli/src/main/java/pellet/PelletExtractInferences.java index 3538ddf91..bc02529e7 100644 --- a/cli/src/main/java/pellet/PelletExtractInferences.java +++ b/cli/src/main/java/pellet/PelletExtractInferences.java @@ -18,8 +18,8 @@ import org.mindswap.pellet.jena.ModelExtractor.StatementType; import org.mindswap.pellet.utils.SetUtils; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; /** *

diff --git a/cli/src/main/java/pellet/PelletQuery.java b/cli/src/main/java/pellet/PelletQuery.java index fa303fc94..3f0eaae2b 100644 --- a/cli/src/main/java/pellet/PelletQuery.java +++ b/cli/src/main/java/pellet/PelletQuery.java @@ -25,21 +25,21 @@ import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; import com.clarkparsia.sparqlowl.parser.arq.ARQTerpParser; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.shared.NotFoundException; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.shared.NotFoundException; +import org.apache.jena.util.FileManager; /** *

diff --git a/cli/src/main/java/pellet/Pellint.java b/cli/src/main/java/pellet/Pellint.java index 5a2348630..b7d95cb02 100644 --- a/cli/src/main/java/pellet/Pellint.java +++ b/cli/src/main/java/pellet/Pellint.java @@ -59,7 +59,7 @@ import com.clarkparsia.pellint.rdfxml.RDFModelWriter; import com.clarkparsia.pellint.util.CollectionUtil; import com.clarkparsia.pellint.util.IllegalPellintArgumentException; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** *

diff --git a/core/src/main/java/com/clarkparsia/pellet/el/JenaBasedELClassifier.java b/core/src/main/java/com/clarkparsia/pellet/el/JenaBasedELClassifier.java index b461dc4f2..3cd2a12c0 100644 --- a/core/src/main/java/com/clarkparsia/pellet/el/JenaBasedELClassifier.java +++ b/core/src/main/java/com/clarkparsia/pellet/el/JenaBasedELClassifier.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.Set; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.taxonomy.TaxonomyBuilder; import org.mindswap.pellet.utils.ATermUtils; import org.mindswap.pellet.utils.MultiValueMap; @@ -23,21 +24,21 @@ import aterm.ATermList; import com.clarkparsia.pellet.utils.CollectionUtils; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.reasoner.InfGraph; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.TriplePattern; -import com.hp.hpl.jena.reasoner.rulesys.Builtin; -import com.hp.hpl.jena.reasoner.rulesys.ClauseEntry; -import com.hp.hpl.jena.reasoner.rulesys.Functor; -import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner; -import com.hp.hpl.jena.reasoner.rulesys.Node_RuleVariable; -import com.hp.hpl.jena.reasoner.rulesys.Rule; -import com.hp.hpl.jena.reasoner.rulesys.builtins.NotEqual; -import com.hp.hpl.jena.sparql.graph.GraphFactory; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.reasoner.InfGraph; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.TriplePattern; +import org.apache.jena.reasoner.rulesys.Builtin; +import org.apache.jena.reasoner.rulesys.ClauseEntry; +import org.apache.jena.reasoner.rulesys.Functor; +import org.apache.jena.reasoner.rulesys.GenericRuleReasoner; +import org.apache.jena.reasoner.rulesys.Node_RuleVariable; +import org.apache.jena.reasoner.rulesys.Rule; +import org.apache.jena.reasoner.rulesys.builtins.NotEqual; +import org.apache.jena.sparql.graph.GraphFactory; +import org.apache.jena.util.iterator.ExtendedIterator; /** *

@@ -57,7 +58,7 @@ */ public class JenaBasedELClassifier extends RuleBasedELClassifier implements TaxonomyBuilder { private static final String PREDICATE_PREFIX = "tag:clarkparsia.com,2008:pellet:el:predicate:"; - private static final Node PRED_SUB = Node.createURI(PREDICATE_PREFIX + "subclassOf"); + private static final Node PRED_SUB = NodeFactory.createURI(PREDICATE_PREFIX + "subclassOf"); private static final Builtin NOT_EQUAL = new NotEqual(); private final Node TOP; @@ -353,9 +354,9 @@ public Node get(ATermAppl term) { Node c = m_Constants.get(term); if (c == null) { if (term == ATermUtils.BOTTOM) { - c = Node.createURI("_BOTTOM_"); + c = NodeFactory.createURI("_BOTTOM_"); } else { - c = Node.createURI(term.getName()); + c = NodeFactory.createURI(term.getName()); } m_Constants.put(term, c); } diff --git a/core/src/main/java/org/mindswap/pellet/utils/FileUtils.java b/core/src/main/java/org/mindswap/pellet/utils/FileUtils.java index 219b9b3fc..e07f197a9 100644 --- a/core/src/main/java/org/mindswap/pellet/utils/FileUtils.java +++ b/core/src/main/java/org/mindswap/pellet/utils/FileUtils.java @@ -76,7 +76,7 @@ public static String readAll(Reader reader) throws IOException { } public static String toURI(String fileName) { - if ( com.hp.hpl.jena.util.FileUtils.isURI( fileName ) ) + if ( org.apache.jena.util.FileUtils.isURI( fileName ) ) return fileName; File localFile = new File(fileName); diff --git a/examples/src/main/java/org/mindswap/pellet/examples/BnodeQueryExample.java b/examples/src/main/java/org/mindswap/pellet/examples/BnodeQueryExample.java index 634187284..1eb59f590 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/BnodeQueryExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/BnodeQueryExample.java @@ -10,15 +10,15 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; /** diff --git a/examples/src/main/java/org/mindswap/pellet/examples/ClassTree.java b/examples/src/main/java/org/mindswap/pellet/examples/ClassTree.java index 325e6e5a1..65774eb9d 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/ClassTree.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/ClassTree.java @@ -20,11 +20,11 @@ import org.mindswap.pellet.jena.PelletInfGraph; import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.OWL; /** * An example to show how to use OWLReasoner class. This example creates a JTree that displays the diff --git a/examples/src/main/java/org/mindswap/pellet/examples/IncrementalConsistencyExample.java b/examples/src/main/java/org/mindswap/pellet/examples/IncrementalConsistencyExample.java index dc3055113..3ed47ce3b 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/IncrementalConsistencyExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/IncrementalConsistencyExample.java @@ -24,12 +24,12 @@ import aterm.ATermAppl; import com.clarkparsia.pellet.owlapiv3.PelletReasoner; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; /** * An example program that incrementally checks consistency through additions to diff --git a/examples/src/main/java/org/mindswap/pellet/examples/IndividualsExample.java b/examples/src/main/java/org/mindswap/pellet/examples/IndividualsExample.java index 94d85604f..9ab3f153c 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/IndividualsExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/IndividualsExample.java @@ -25,13 +25,13 @@ import org.semanticweb.owlapi.reasoner.NodeSet; import com.clarkparsia.pellet.owlapiv3.PelletReasoner; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; /** * Example to demonstrate how to use the reasoner for queries related to individuals. Exact diff --git a/examples/src/main/java/org/mindswap/pellet/examples/InterruptReasoningExample.java b/examples/src/main/java/org/mindswap/pellet/examples/InterruptReasoningExample.java index fb4cea1ac..e2f3c27fd 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/InterruptReasoningExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/InterruptReasoningExample.java @@ -6,15 +6,15 @@ import org.mindswap.pellet.utils.Timers; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.util.iterator.ExtendedIterator; /** *

diff --git a/examples/src/main/java/org/mindswap/pellet/examples/JenaReasoner.java b/examples/src/main/java/org/mindswap/pellet/examples/JenaReasoner.java index 22a16fb57..10d26250e 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/JenaReasoner.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/JenaReasoner.java @@ -10,15 +10,15 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.InfModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.ValidityReport; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.InfModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.ValidityReport; +import org.apache.jena.vocabulary.RDFS; /** * An example to show how to use PelletReasoner as a Jena reasoner. The reasoner can diff --git a/examples/src/main/java/org/mindswap/pellet/examples/QuerySubsumptionExample.java b/examples/src/main/java/org/mindswap/pellet/examples/QuerySubsumptionExample.java index 37700de91..6009fd236 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/QuerySubsumptionExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/QuerySubsumptionExample.java @@ -20,8 +20,8 @@ import com.clarkparsia.pellet.sparqldl.model.QueryResult; import com.clarkparsia.pellet.sparqldl.model.ResultBinding; import com.clarkparsia.pellet.sparqldl.parser.QueryParser; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; /** * Example program to demonstrate the query subsumption (query containment) diff --git a/examples/src/main/java/org/mindswap/pellet/examples/RulesExample.java b/examples/src/main/java/org/mindswap/pellet/examples/RulesExample.java index b432bfce0..934e6c133 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/RulesExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/RulesExample.java @@ -8,14 +8,14 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; -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 com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +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; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.util.iterator.ExtendedIterator; /** * An example program that tests the DL-safe rules example from Table 3 in the diff --git a/examples/src/main/java/org/mindswap/pellet/examples/SPARQLDLExample.java b/examples/src/main/java/org/mindswap/pellet/examples/SPARQLDLExample.java index aa37061a2..f2f91bf3b 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/SPARQLDLExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/SPARQLDLExample.java @@ -11,13 +11,13 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.ModelFactory; /** *

diff --git a/examples/src/main/java/org/mindswap/pellet/examples/TerpExample.java b/examples/src/main/java/org/mindswap/pellet/examples/TerpExample.java index e06bd096e..e7be6cb82 100644 --- a/examples/src/main/java/org/mindswap/pellet/examples/TerpExample.java +++ b/examples/src/main/java/org/mindswap/pellet/examples/TerpExample.java @@ -13,13 +13,13 @@ import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.sparqlowl.parser.arq.ARQTerpParser; import com.clarkparsia.sparqlowl.parser.arq.TerpSyntax; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.ModelFactory; /** *

diff --git a/jena/pom.xml b/jena/pom.xml index a3621f73f..0305e51f3 100644 --- a/jena/pom.xml +++ b/jena/pom.xml @@ -52,4 +52,21 @@ test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + + \ No newline at end of file diff --git a/jena/src/main/java/org/mindswap/pellet/jena/BuiltinTerm.java b/jena/src/main/java/org/mindswap/pellet/jena/BuiltinTerm.java index 15e931267..3e47e24ae 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/BuiltinTerm.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/BuiltinTerm.java @@ -15,12 +15,12 @@ import org.mindswap.pellet.jena.vocabulary.OWL2; import org.mindswap.pellet.jena.vocabulary.SWRL; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.graph.Node; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/JenaLoader.java b/jena/src/main/java/org/mindswap/pellet/jena/JenaLoader.java index c53dcbd67..fa81fce61 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/JenaLoader.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/JenaLoader.java @@ -11,9 +11,9 @@ import org.mindswap.pellet.KBLoader; import org.mindswap.pellet.KnowledgeBase; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.FileManager; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/JenaUtils.java b/jena/src/main/java/org/mindswap/pellet/jena/JenaUtils.java index afa9f5d17..ba2622f89 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/JenaUtils.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/JenaUtils.java @@ -33,6 +33,8 @@ import java.util.Iterator; import java.util.Map; +import org.apache.jena.graph.BlankNodeId; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.exceptions.InternalReasonerException; import org.mindswap.pellet.jena.vocabulary.OWL2; import org.mindswap.pellet.utils.ATermUtils; @@ -41,19 +43,18 @@ import aterm.ATermAppl; import com.clarkparsia.pellet.datatypes.Datatypes; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.impl.LiteralLabel; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.impl.LiteralLabel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.vocabulary.OWL; /** * Utility functions related to Jena structures. The functions here may have @@ -134,16 +135,16 @@ static public Node makeGraphLiteral(ATermAppl literal) { if( datatype.equals( ATermUtils.PLAIN_LITERAL_DATATYPE ) ) { if( lang.equals( ATermUtils.EMPTY ) ) - node = Node.createLiteral( lexicalValue ); + node = NodeFactory.createLiteral( lexicalValue ); else - node = Node.createLiteral( lexicalValue, lang.getName(), false ); + node = NodeFactory.createLiteral( lexicalValue, lang.getName(), false ); } else if( datatype.equals( Datatypes.XML_LITERAL ) ) { - node = Node.createLiteral( lexicalValue, "", true ); + node = NodeFactory.createLiteral( lexicalValue, "", true ); } else { RDFDatatype type = TypeMapper.getInstance().getTypeByName( datatype.getName() ); - node = Node.createLiteral( lexicalValue, "", type ); + node = NodeFactory.createLiteral( lexicalValue, "", type ); } return node; @@ -151,7 +152,7 @@ else if( datatype.equals( Datatypes.XML_LITERAL ) ) { static public Node makeGraphResource(ATermAppl term) { if( ATermUtils.isBnode( term ) ) { - return Node.createAnon( new AnonId( ((ATermAppl) term.getArgument( 0 )).getName() ) ); + return NodeFactory.createBlankNode( new BlankNodeId( ((ATermAppl) term.getArgument( 0 )).getName() ) ); } else if( term.equals( ATermUtils.TOP ) ) { return OWL.Thing.asNode(); @@ -172,7 +173,7 @@ else if ( term.equals( ATermUtils.BOTTOM_OBJECT_PROPERTY ) ) { return OWL2.bottomObjectProperty.asNode(); } else if( term.getArity() == 0 ) { - return Node.createURI( term.getName() ); + return NodeFactory.createURI( term.getName() ); } else { throw new InternalReasonerException( "Invalid term found " + term ); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/ModelExtractor.java b/jena/src/main/java/org/mindswap/pellet/jena/ModelExtractor.java index 9be879705..fdf590b2b 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/ModelExtractor.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/ModelExtractor.java @@ -21,15 +21,15 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.iterator.Filter; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.iterator.Filter; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.ReasonerVocabulary; /** * Extract a Jena model that contains the information Pellet inferred. Models @@ -381,7 +381,9 @@ public Model extractClassModel(Model model) { } } } - model.getGraph().getBulkUpdateHandler().add( triples ); + for ( Triple t : triples ) { + model.getGraph().add( t ); + } } return model; @@ -502,8 +504,9 @@ else if( role.isObjectRole() ) { } } } - - model.getGraph().getBulkUpdateHandler().add( triples ); + for ( Triple t : triples ) { + model.getGraph().add( t ); + } } return model; @@ -642,7 +645,9 @@ else if( role.isObjectRole() ) // FIXME: Add range statements - model.getGraph().getBulkUpdateHandler().add( triples ); + for ( Triple t : triples ) { + model.getGraph().add( t ); + } } return model; diff --git a/jena/src/main/java/org/mindswap/pellet/jena/NodeFormatter.java b/jena/src/main/java/org/mindswap/pellet/jena/NodeFormatter.java index ff632bb83..bcdd78c7f 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/NodeFormatter.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/NodeFormatter.java @@ -19,15 +19,15 @@ import aterm.ATermAppl; import aterm.ATermList; -import com.hp.hpl.jena.rdf.model.InfModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.reasoner.InfGraph; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.InfModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.reasoner.InfGraph; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; /** * @author Evren Sirin @@ -105,8 +105,8 @@ else if (node.equals( OWL2.topObjectProperty )) return ATermUtils.TOP_OBJECT_PROPERTY; else if (node.equals( OWL2.bottomObjectProperty )) return ATermUtils.BOTTOM_OBJECT_PROPERTY; - else if(node instanceof com.hp.hpl.jena.rdf.model.Literal) { - com.hp.hpl.jena.rdf.model.Literal l = (com.hp.hpl.jena.rdf.model.Literal) node; + else if(node instanceof org.apache.jena.rdf.model.Literal) { + org.apache.jena.rdf.model.Literal l = (org.apache.jena.rdf.model.Literal) node; String datatypeURI = l.getDatatypeURI(); if(datatypeURI != null) aTerm = ATermUtils.makeTypedLiteral(l.getString(), datatypeURI); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/PelletGraphListener.java b/jena/src/main/java/org/mindswap/pellet/jena/PelletGraphListener.java index 96e4152b9..93987d2f1 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/PelletGraphListener.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/PelletGraphListener.java @@ -19,14 +19,14 @@ import aterm.ATermAppl; import com.clarkparsia.pellet.utils.CollectionUtils; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphListener; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.compose.Dyadic; -import com.hp.hpl.jena.graph.compose.Polyadic; -import com.hp.hpl.jena.reasoner.InfGraph; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphListener; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.compose.Dyadic; +import org.apache.jena.graph.compose.Polyadic; +import org.apache.jena.reasoner.InfGraph; +import org.apache.jena.vocabulary.RDF; /** * A graph listener that listens to graph change events and if possible processes the change event. The listener is diff --git a/jena/src/main/java/org/mindswap/pellet/jena/PelletInfGraph.java b/jena/src/main/java/org/mindswap/pellet/jena/PelletInfGraph.java index 614ed6a8d..526f069b6 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/PelletInfGraph.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/PelletInfGraph.java @@ -36,6 +36,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.jena.util.iterator.UniqueFilter; import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.PelletOptions; import org.mindswap.pellet.jena.ModelExtractor.StatementType; @@ -49,27 +50,26 @@ import aterm.ATermAppl; import com.clarkparsia.pellet.utils.OntBuilder; -import com.hp.hpl.jena.graph.Factory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.reasoner.BaseInfGraph; -import com.hp.hpl.jena.reasoner.Finder; -import com.hp.hpl.jena.reasoner.InfGraph; -import com.hp.hpl.jena.reasoner.StandardValidityReport; -import com.hp.hpl.jena.reasoner.TriplePattern; -import com.hp.hpl.jena.reasoner.ValidityReport; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.UniqueExtendedIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.graph.Factory; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.reasoner.BaseInfGraph; +import org.apache.jena.reasoner.Finder; +import org.apache.jena.reasoner.InfGraph; +import org.apache.jena.reasoner.StandardValidityReport; +import org.apache.jena.reasoner.TriplePattern; +import org.apache.jena.reasoner.ValidityReport; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** * Implementation of Jena InfGraph interface which is backed by Pellet reasoner. @@ -175,7 +175,7 @@ public ExtendedIterator findWithContinuation(TriplePattern pattern, Find } // make sure we don't have duplicates - return UniqueExtendedIterator.create( i ); + return i.filterKeep(new UniqueFilter()); } @Override diff --git a/jena/src/main/java/org/mindswap/pellet/jena/PelletReasoner.java b/jena/src/main/java/org/mindswap/pellet/jena/PelletReasoner.java index e57d94da1..4df24534b 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/PelletReasoner.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/PelletReasoner.java @@ -35,17 +35,17 @@ import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.jena.graph.loader.DefaultGraphLoader; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.rdf.model.InfModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.ReasonerException; -import com.hp.hpl.jena.reasoner.BaseInfGraph.InfFindSafeCapabilities; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.rdf.model.InfModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.ReasonerException; +import org.apache.jena.reasoner.BaseInfGraph.InfFindSafeCapabilities; +import org.apache.jena.vocabulary.ReasonerVocabulary; /** * @author Evren Sirin diff --git a/jena/src/main/java/org/mindswap/pellet/jena/PelletReasonerFactory.java b/jena/src/main/java/org/mindswap/pellet/jena/PelletReasonerFactory.java index be66fa7f7..2f988be97 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/PelletReasonerFactory.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/PelletReasonerFactory.java @@ -30,15 +30,15 @@ package org.mindswap.pellet.jena; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.ReasonerFactory; -import com.hp.hpl.jena.reasoner.ReasonerRegistry; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.ReasonerFactory; +import org.apache.jena.reasoner.ReasonerRegistry; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.ReasonerVocabulary; /** * @author Evren Sirin diff --git a/jena/src/main/java/org/mindswap/pellet/jena/SimpleUnion.java b/jena/src/main/java/org/mindswap/pellet/jena/SimpleUnion.java index ad17ebaff..cd7d752ab 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/SimpleUnion.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/SimpleUnion.java @@ -1,11 +1,10 @@ package org.mindswap.pellet.jena; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.graph.compose.Polyadic; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.NullIterator; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.compose.Polyadic; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.NullIterator; /** * A simple union graph implementation whose find function may contain duplicate @@ -21,18 +20,18 @@ public SimpleUnion(Iterable graphs) { super( graphs.iterator() ); } - /** - * {@inheritDoc} - */ - @Override - protected ExtendedIterator graphBaseFind(TripleMatch m) { - ExtendedIterator result = NullIterator.instance(); - for (final Graph g : m_subGraphs) { - result = result.andThen(g.find(m)); - } - - return result; - } +// /** +// * {@inheritDoc} +// */ +// @Override +// protected ExtendedIterator graphBaseFind(TripleMatch m) { +// ExtendedIterator result = NullIterator.instance(); +// for (final Graph g : m_subGraphs) { +// result = result.andThen(g.find(m)); +// } +// +// return result; +// } /** * {@inheritDoc} diff --git a/jena/src/main/java/org/mindswap/pellet/jena/TaxonomyExtractor.java b/jena/src/main/java/org/mindswap/pellet/jena/TaxonomyExtractor.java index ed4b4dac1..6d7990856 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/TaxonomyExtractor.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/TaxonomyExtractor.java @@ -14,13 +14,13 @@ import org.mindswap.pellet.taxonomy.TaxonomyNode; import org.mindswap.pellet.utils.TaxonomyUtils; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import aterm.ATermAppl; diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/AxiomConverter.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/AxiomConverter.java index 5e9b03cad..66043a234 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/AxiomConverter.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/AxiomConverter.java @@ -1,5 +1,7 @@ package org.mindswap.pellet.jena.graph.converter; +import org.apache.jena.graph.BlankNodeId; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.jena.JenaUtils; import org.mindswap.pellet.jena.vocabulary.OWL2; @@ -9,14 +11,14 @@ import aterm.ATermAppl; import aterm.ATermList; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

@@ -127,7 +129,7 @@ else if( axiom.getAFun().equals( ATermUtils.NOTFUN ) ) { Node s = converter.convert( axiom.getArgument( 1 ) ); Node o = converter.convert( axiom.getArgument( 2 ) ); - Node n = Node.createAnon(); + Node n = NodeFactory.createAnon(); TripleAdder.add( graph, n, RDF.type, OWL2.NegativePropertyAssertion ); TripleAdder.add( graph, n, RDF.subject, s ); TripleAdder.add( graph, n, RDF.predicate, p ); @@ -145,13 +147,13 @@ else if( axiom.getAFun().equals( ATermUtils.RULEFUN ) ) { ATermAppl name = (ATermAppl) axiom.getArgument( 0 ); if( name == ATermUtils.EMPTY ) { - node = Node.createAnon(); + node = NodeFactory.createAnon(); } else if( ATermUtils.isBnode( name ) ) { - node = Node.createAnon( new AnonId( ((ATermAppl) name.getArgument( 0 )).getName() ) ); + node = NodeFactory.createAnon( new BlankNodeId( ((ATermAppl) name.getArgument( 0 )).getName() ) ); } else { - node = Node.createURI( name.getName() ); + node = NodeFactory.createURI( name.getName() ); } TripleAdder.add( graph, node, RDF.type, SWRL.Imp ); @@ -164,7 +166,7 @@ else if( ATermUtils.isBnode( name ) ) { Node list = null; for( ; !head.isEmpty(); head = head.getNext() ) { Node atomNode = convertAtom( (ATermAppl) head.getFirst() ); - Node newList = Node.createAnon(); + Node newList = NodeFactory.createAnon(); TripleAdder.add( graph, newList, RDF.type, SWRL.AtomList ); TripleAdder.add( graph, newList, RDF.first, atomNode ); if( list != null ) @@ -184,7 +186,7 @@ else if( ATermUtils.isBnode( name ) ) { Node list = null; for( ; !body.isEmpty(); body = body.getNext() ) { Node atomNode = convertAtom( (ATermAppl) body.getFirst() ); - Node newList = Node.createAnon(); + Node newList = NodeFactory.createAnon(); TripleAdder.add( graph, newList, RDF.type, SWRL.AtomList ); TripleAdder.add( graph, newList, RDF.first, atomNode ); if( list != null ) @@ -199,7 +201,7 @@ else if( ATermUtils.isBnode( name ) ) { } private Node convertAtom(ATermAppl term) { - Node atom = Node.createAnon(); + Node atom = NodeFactory.createAnon(); if( term.getAFun().equals( ATermUtils.TYPEFUN ) ) { ATermAppl ind = (ATermAppl) term.getArgument( 0 ); @@ -264,7 +266,7 @@ else if( term.getAFun().equals( ATermUtils.BUILTINFUN ) ) { args = args.getNext(); TripleAdder.add( graph, atom, RDF.type, SWRL.BuiltinAtom ); - TripleAdder.add( graph, atom, SWRL.builtin, Node.createURI( builtin.toString() ) ); + TripleAdder.add( graph, atom, SWRL.builtin, NodeFactory.createURI( builtin.toString() ) ); if( args.isEmpty() ) { TripleAdder.add( graph, atom, SWRL.arguments, RDF.nil ); @@ -273,7 +275,7 @@ else if( term.getAFun().equals( ATermUtils.BUILTINFUN ) ) { Node list = null; for( ; !args.isEmpty(); args = args.getNext() ) { Node atomNode = convertAtomObject( (ATermAppl) args.getFirst() ); - Node newList = Node.createAnon(); + Node newList = NodeFactory.createAnon(); TripleAdder.add( graph, newList, RDF.first, atomNode ); if( list != null ) TripleAdder.add( graph, list, RDF.rest, newList ); @@ -305,7 +307,7 @@ private Node convertAtomObject(ATermAppl t) { } private void convertNary(ATermAppl axiom, Resource type, Property p) { - Node n = Node.createAnon(); + Node n = NodeFactory.createAnon(); TripleAdder.add( graph, n, RDF.type, type ); ATermList concepts = (ATermList) axiom.getArgument( 0 ); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/ConceptConverter.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/ConceptConverter.java index 66f92753f..67154f31a 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/ConceptConverter.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/ConceptConverter.java @@ -1,5 +1,6 @@ package org.mindswap.pellet.jena.graph.converter; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.jena.JenaUtils; import org.mindswap.pellet.jena.vocabulary.OWL2; import org.mindswap.pellet.output.ATermBaseVisitor; @@ -11,13 +12,13 @@ import aterm.ATermInt; import aterm.ATermList; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** @@ -58,7 +59,7 @@ public Node convert(ATerm term, Node s) { visit( (ATermAppl) term ); } else if( term instanceof ATermInt ) { - obj = Node.createLiteral( term.toString(), null, XSDDatatype.XSDnonNegativeInteger ); + obj = NodeFactory.createLiteral( term.toString(), null, XSDDatatype.XSDnonNegativeInteger ); } else if( term instanceof ATermList ) { visitList( (ATermList) term ); @@ -93,7 +94,7 @@ private void createExpression(Property p) { TripleAdder.add( graph, subj, p, obj ); } else { - Node c = Node.createAnon(); + Node c = NodeFactory.createAnon(); TripleAdder.add( graph, c, p, obj ); obj = c; } @@ -131,7 +132,7 @@ private Node createQualifiedRestriction(ATermAppl term, Property restrType) { } private Node createRestriction(ATermAppl term, Property restrType) { - Node restr = Node.createAnon(); + Node restr = NodeFactory.createAnon(); Node prop = convert( term.getArgument( 0 ) ); Node val = convert( term.getArgument( 1 ) ); @@ -174,7 +175,7 @@ public void visitValue(ATermAppl term) { } public void visitSelf(ATermAppl term) { - Node restr = Node.createAnon(); + Node restr = NodeFactory.createAnon(); Node prop = convert( term.getArgument( 0 ) ); @@ -204,7 +205,7 @@ public void visitList(ATermList list) { obj = RDF.nil.asNode(); } else { - Node rdfList = Node.createAnon(); + Node rdfList = NodeFactory.createAnon(); Node first = convert( list.getFirst() ); TripleAdder.add( graph, rdfList, RDF.first, first ); @@ -217,7 +218,7 @@ public void visitList(ATermList list) { } public void visitInverse(ATermAppl term) { - Node node = Node.createAnon(); + Node node = NodeFactory.createAnon(); Node prop = convert( term.getArgument( 0 ) ); @@ -227,7 +228,7 @@ public void visitInverse(ATermAppl term) { } public void visitRestrictedDatatype(ATermAppl dt) { - Node def = Node.createAnon(); + Node def = NodeFactory.createAnon(); TripleAdder.add( graph, def, RDF.type, RDFS.Datatype ); TripleAdder.add( graph, def, OWL2.onDatatype, JenaUtils.makeGraphNode( (ATermAppl) dt.getArgument( 0 ) ) ); @@ -237,11 +238,11 @@ public void visitRestrictedDatatype(ATermAppl dt) { for( ; !restrictions.isEmpty(); restrictions = restrictions.getNext() ) { ATermAppl facet = (ATermAppl) restrictions.getFirst(); - Node facetNode = Node.createAnon(); + Node facetNode = NodeFactory.createAnon(); TripleAdder.add( graph, facetNode, JenaUtils.makeGraphNode( (ATermAppl) facet.getArgument( 0 ) ), JenaUtils .makeGraphNode( (ATermAppl) facet.getArgument( 1 ) ) ); - Node newList = Node.createAnon(); + Node newList = NodeFactory.createAnon(); TripleAdder.add( graph, newList, RDF.first, facetNode ); if( list != null ) TripleAdder.add( graph, list, RDF.rest, newList ); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/TripleAdder.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/TripleAdder.java index 0c97cf7a0..d30772ffe 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/TripleAdder.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/converter/TripleAdder.java @@ -8,11 +8,11 @@ package org.mindswap.pellet.jena.graph.converter; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/DefaultGraphLoader.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/DefaultGraphLoader.java index 6220238f3..3aa7f4c14 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/DefaultGraphLoader.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/DefaultGraphLoader.java @@ -90,15 +90,15 @@ import com.clarkparsia.pellet.rules.model.RuleAtom; import com.clarkparsia.pellet.rules.model.SameIndividualAtom; import com.clarkparsia.pellet.vocabulary.BuiltinNamespace; -import com.hp.hpl.jena.graph.Factory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.graph.Factory; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/GraphLoader.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/GraphLoader.java index 3f6237707..1f0d83f27 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/GraphLoader.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/GraphLoader.java @@ -14,8 +14,8 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/RestrictionInfo.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/RestrictionInfo.java index 295180a6d..f5f1b90d3 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/RestrictionInfo.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/loader/RestrictionInfo.java @@ -8,7 +8,7 @@ import org.mindswap.pellet.utils.Bool; -import com.hp.hpl.jena.graph.Node; +import org.apache.jena.graph.Node; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BooleanQueryHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BooleanQueryHandler.java index a6d65380d..baf493cee 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BooleanQueryHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BooleanQueryHandler.java @@ -9,11 +9,11 @@ import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.jena.PelletInfGraph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.NullIterator; -import com.hp.hpl.jena.util.iterator.SingletonIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.NullIterator; +import org.apache.jena.util.iterator.SingletonIterator; abstract class BooleanQueryHandler extends TripleQueryHandler { @Override diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BuiltinTypeQueryHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BuiltinTypeQueryHandler.java index 2ccc56142..7dac5d89a 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BuiltinTypeQueryHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/BuiltinTypeQueryHandler.java @@ -14,9 +14,9 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; abstract class BuiltinTypeQueryHandler extends TripleQueryHandler { public abstract Collection getResults(KnowledgeBase kb); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/GraphQueryHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/GraphQueryHandler.java index c6fc2a482..e821feced 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/GraphQueryHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/GraphQueryHandler.java @@ -7,17 +7,12 @@ package org.mindswap.pellet.jena.graph.query; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; +import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.Role; import org.mindswap.pellet.jena.JenaUtils; @@ -33,25 +28,25 @@ import aterm.ATermAppl; import com.clarkparsia.pellet.utils.CollectionUtils; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.Map1; -import com.hp.hpl.jena.util.iterator.NullIterator; -import com.hp.hpl.jena.util.iterator.SingletonIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.Map1; +import org.apache.jena.util.iterator.NullIterator; +import org.apache.jena.util.iterator.SingletonIterator; +import org.apache.jena.util.iterator.WrappedIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.ReasonerVocabulary; public class GraphQueryHandler { public final static Logger log = Logger.getLogger( GraphQueryHandler.class.getName() ); protected static final Node VAR = Node.ANY; - protected static final Node CONST = Node.createURI( "CONST" ); + protected static final Node CONST = NodeFactory.createURI( "CONST" ); private static final Node[] EMPTY = new Node[0]; @@ -450,7 +445,12 @@ else if( kb.isAnnotationProperty( term ) ) { } Map1 map = new Map1() { - public Triple map1( Node o ) { + @Override + public Triple apply(Node node) { + return map1(node); + } + + public Triple map1(Node o ) { return Triple.create( s, p, o ); } }; diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/ObjectVarHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/ObjectVarHandler.java index b0dbf2715..a883367b1 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/ObjectVarHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/ObjectVarHandler.java @@ -14,9 +14,9 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; abstract class ObjectVarHandler extends TripleQueryHandler { public abstract Set getObjects(KnowledgeBase kb, ATermAppl subj); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SingleVarQueryHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SingleVarQueryHandler.java index abf776b5f..3f6862bac 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SingleVarQueryHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SingleVarQueryHandler.java @@ -14,9 +14,9 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; abstract class SingleVarQueryHandler extends TripleQueryHandler { public abstract Set getResults(KnowledgeBase kb, ATermAppl term); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectObjectVarHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectObjectVarHandler.java index 5f6a66d13..3243ff4f2 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectObjectVarHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectObjectVarHandler.java @@ -16,10 +16,10 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; abstract class SubjectObjectVarHandler extends TripleQueryHandler { public abstract Collection getSubjects(KnowledgeBase kb); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectVarHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectVarHandler.java index 42c6d25d8..a6b8c4cca 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectVarHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/SubjectVarHandler.java @@ -14,9 +14,9 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; abstract class SubjectVarHandler extends TripleQueryHandler { public abstract Set getSubjects(KnowledgeBase kb, ATermAppl obj); diff --git a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/TripleQueryHandler.java b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/TripleQueryHandler.java index c11f8fd4b..8f4d6c094 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/graph/query/TripleQueryHandler.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/graph/query/TripleQueryHandler.java @@ -19,11 +19,11 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.Map1; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.Map1; +import org.apache.jena.util.iterator.WrappedIterator; public abstract class TripleQueryHandler { public TripleQueryHandler() { @@ -39,7 +39,12 @@ protected ExtendedIterator objectFiller(Node s, Node p, Collection objectFiller(final Node s, final Node p, final Iterator objects) { Map1 map = new Map1() { - public Triple map1( ATermAppl o ) { + @Override + public Triple apply(ATermAppl aTermAppl) { + return map1(aTermAppl); + } + + public Triple map1(ATermAppl o ) { return Triple.create( s, p, JenaUtils.makeGraphNode( o ) ); } }; @@ -57,7 +62,12 @@ protected ExtendedIterator propertyFiller(Node s, Collection protected ExtendedIterator propertyFiller(final Node s, final Iterator properties, final Node o) { Map1 map = new Map1() { - public Triple map1( ATermAppl p ) { + @Override + public Triple apply(ATermAppl aTermAppl) { + return map1(aTermAppl); + } + + public Triple map1(ATermAppl p ) { return Triple.create( s, JenaUtils.makeGraphNode( p ), o ); } }; @@ -71,7 +81,12 @@ protected ExtendedIterator subjectFiller(Collection subjects, protected ExtendedIterator subjectFiller(final Iterator subjects, final Node p, final Node o) { Map1 map = new Map1() { - public Triple map1( ATermAppl s ) { + @Override + public Triple apply(ATermAppl aTermAppl) { + return map1(aTermAppl); + } + + public Triple map1(ATermAppl s ) { return Triple.create( JenaUtils.makeGraphNode( s ), p, o ); } }; diff --git a/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/OWL2.java b/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/OWL2.java index 382d4bf99..3b3e41c78 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/OWL2.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/OWL2.java @@ -8,11 +8,11 @@ package org.mindswap.pellet.jena.vocabulary; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.XSD; /** *

diff --git a/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/SWRL.java b/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/SWRL.java index 27df72c8f..fe34dc9e8 100644 --- a/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/SWRL.java +++ b/jena/src/main/java/org/mindswap/pellet/jena/vocabulary/SWRL.java @@ -30,9 +30,9 @@ package org.mindswap.pellet.jena.vocabulary; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; public class SWRL { private static final String URI = "http://www.w3.org/2003/11/swrl#"; diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLEntityDatabase.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLEntityDatabase.java index 538e47447..0ea89e929 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLEntityDatabase.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLEntityDatabase.java @@ -15,16 +15,16 @@ import org.mindswap.pellet.jena.vocabulary.SWRL; import com.clarkparsia.pellint.util.CollectionUtil; -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.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; - -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +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.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; + +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLSyntaxChecker.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLSyntaxChecker.java index db47e6bec..998696d70 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLSyntaxChecker.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/OWLSyntaxChecker.java @@ -22,15 +22,15 @@ import com.clarkparsia.pellet.datatypes.DatatypeReasonerImpl; import com.clarkparsia.pellet.datatypes.Facet; import com.clarkparsia.pellint.util.CollectionUtil; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFLints.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFLints.java index 0626c5d2d..3e6e4c4cc 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFLints.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFLints.java @@ -12,7 +12,7 @@ import java.util.Map.Entry; import com.clarkparsia.pellint.util.CollectionUtil; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** *

diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModel.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModel.java index ae90584c6..169cb180e 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModel.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModel.java @@ -14,11 +14,11 @@ import java.util.Set; import com.clarkparsia.pellint.util.CollectionUtil; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; /** *

diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelReader.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelReader.java index 487796efa..06564b1fa 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelReader.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelReader.java @@ -6,12 +6,12 @@ package com.clarkparsia.pellint.rdfxml; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.util.FileManager; /** *

diff --git a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelWriter.java b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelWriter.java index 5b075abd7..3f3b202c3 100644 --- a/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelWriter.java +++ b/pellint/src/main/java/com/clarkparsia/pellint/rdfxml/RDFModelWriter.java @@ -9,12 +9,12 @@ import java.io.OutputStream; import java.net.URI; -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.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; +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.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; /** *

diff --git a/pom.xml b/pom.xml index fcdbef2f2..8f548f18b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 4.11 1.7.5 [4.0.2,4.2) - 2.13.0 + 3.0.1 UTF-8 UTF-8 @@ -278,9 +278,9 @@ false - - dist - + + + findbugs diff --git a/profiler/src/main/java/profiler/ProfileQuery.java b/profiler/src/main/java/profiler/ProfileQuery.java index 5e3d07066..f3894960b 100644 --- a/profiler/src/main/java/profiler/ProfileQuery.java +++ b/profiler/src/main/java/profiler/ProfileQuery.java @@ -26,13 +26,13 @@ import org.mindswap.pellet.utils.VersionInfo; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.sparql.resultset.ResultSetMem; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.sparql.resultset.ResultSetMem; /** * @author Evren Sirin diff --git a/query/src/main/antlr3/com/clarkparsia/sparqlowl/parser/antlr/SparqlOwlTreeARQ.g b/query/src/main/antlr3/com/clarkparsia/sparqlowl/parser/antlr/SparqlOwlTreeARQ.g index 416ad4e64..aef3fb656 100644 --- a/query/src/main/antlr3/com/clarkparsia/sparqlowl/parser/antlr/SparqlOwlTreeARQ.g +++ b/query/src/main/antlr3/com/clarkparsia/sparqlowl/parser/antlr/SparqlOwlTreeARQ.g @@ -20,60 +20,61 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.sparql.core.Prologue; -import com.hp.hpl.jena.sparql.core.Var; -import com.hp.hpl.jena.sparql.expr.E_Add; -import com.hp.hpl.jena.sparql.expr.E_Bound; -import com.hp.hpl.jena.sparql.expr.E_Datatype; -import com.hp.hpl.jena.sparql.expr.E_Divide; -import com.hp.hpl.jena.sparql.expr.E_Equals; -import com.hp.hpl.jena.sparql.expr.E_Function; -import com.hp.hpl.jena.sparql.expr.E_GreaterThan; -import com.hp.hpl.jena.sparql.expr.E_GreaterThanOrEqual; -import com.hp.hpl.jena.sparql.expr.E_IsBlank; -import com.hp.hpl.jena.sparql.expr.E_IsIRI; -import com.hp.hpl.jena.sparql.expr.E_IsLiteral; -import com.hp.hpl.jena.sparql.expr.E_IsURI; -import com.hp.hpl.jena.sparql.expr.E_Lang; -import com.hp.hpl.jena.sparql.expr.E_LangMatches; -import com.hp.hpl.jena.sparql.expr.E_LessThan; -import com.hp.hpl.jena.sparql.expr.E_LessThanOrEqual; -import com.hp.hpl.jena.sparql.expr.E_LogicalAnd; -import com.hp.hpl.jena.sparql.expr.E_LogicalNot; -import com.hp.hpl.jena.sparql.expr.E_LogicalOr; -import com.hp.hpl.jena.sparql.expr.E_Multiply; -import com.hp.hpl.jena.sparql.expr.E_NotEquals; -import com.hp.hpl.jena.sparql.expr.E_Regex; -import com.hp.hpl.jena.sparql.expr.E_SameTerm; -import com.hp.hpl.jena.sparql.expr.E_Str; -import com.hp.hpl.jena.sparql.expr.E_Subtract; -import com.hp.hpl.jena.sparql.expr.E_UnaryMinus; -import com.hp.hpl.jena.sparql.expr.E_UnaryPlus; -import com.hp.hpl.jena.sparql.expr.Expr; -import com.hp.hpl.jena.sparql.expr.ExprList; -import com.hp.hpl.jena.sparql.syntax.Element; -import com.hp.hpl.jena.sparql.syntax.ElementFilter; -import com.hp.hpl.jena.sparql.syntax.ElementGroup; -import com.hp.hpl.jena.sparql.syntax.ElementNamedGraph; -import com.hp.hpl.jena.sparql.syntax.ElementOptional; -import com.hp.hpl.jena.sparql.syntax.ElementTriplesBlock; -import com.hp.hpl.jena.sparql.syntax.ElementUnion; -import com.hp.hpl.jena.sparql.syntax.Template; -import com.hp.hpl.jena.sparql.syntax.TripleCollector; -import com.hp.hpl.jena.sparql.syntax.TripleCollectorBGP; -import com.hp.hpl.jena.sparql.util.LabelToNodeMap; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.sparql.core.Prologue; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.expr.E_Add; +import org.apache.jena.sparql.expr.E_Bound; +import org.apache.jena.sparql.expr.E_Datatype; +import org.apache.jena.sparql.expr.E_Divide; +import org.apache.jena.sparql.expr.E_Equals; +import org.apache.jena.sparql.expr.E_Function; +import org.apache.jena.sparql.expr.E_GreaterThan; +import org.apache.jena.sparql.expr.E_GreaterThanOrEqual; +import org.apache.jena.sparql.expr.E_IsBlank; +import org.apache.jena.sparql.expr.E_IsIRI; +import org.apache.jena.sparql.expr.E_IsLiteral; +import org.apache.jena.sparql.expr.E_IsURI; +import org.apache.jena.sparql.expr.E_Lang; +import org.apache.jena.sparql.expr.E_LangMatches; +import org.apache.jena.sparql.expr.E_LessThan; +import org.apache.jena.sparql.expr.E_LessThanOrEqual; +import org.apache.jena.sparql.expr.E_LogicalAnd; +import org.apache.jena.sparql.expr.E_LogicalNot; +import org.apache.jena.sparql.expr.E_LogicalOr; +import org.apache.jena.sparql.expr.E_Multiply; +import org.apache.jena.sparql.expr.E_NotEquals; +import org.apache.jena.sparql.expr.E_Regex; +import org.apache.jena.sparql.expr.E_SameTerm; +import org.apache.jena.sparql.expr.E_Str; +import org.apache.jena.sparql.expr.E_Subtract; +import org.apache.jena.sparql.expr.E_UnaryMinus; +import org.apache.jena.sparql.expr.E_UnaryPlus; +import org.apache.jena.sparql.expr.Expr; +import org.apache.jena.sparql.expr.ExprList; +import org.apache.jena.sparql.syntax.Element; +import org.apache.jena.sparql.syntax.ElementFilter; +import org.apache.jena.sparql.syntax.ElementGroup; +import org.apache.jena.sparql.syntax.ElementNamedGraph; +import org.apache.jena.sparql.syntax.ElementOptional; +import org.apache.jena.sparql.syntax.ElementTriplesBlock; +import org.apache.jena.sparql.syntax.ElementUnion; +import org.apache.jena.sparql.syntax.Template; +import org.apache.jena.sparql.syntax.TripleCollector; +import org.apache.jena.sparql.syntax.TripleCollectorBGP; +import org.apache.jena.sparql.util.LabelToNodeMap; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; import org.mindswap.pellet.jena.vocabulary.OWL2; import static com.clarkparsia.sparqlowl.parser.ParserUtilities.dropFirstAndLast; @@ -84,7 +85,7 @@ import static com.clarkparsia.sparqlowl.parser.arq.ARQParserUtilities.isOWL2Data import static com.clarkparsia.sparqlowl.parser.arq.ARQParserUtilities.listToTriples; import static com.clarkparsia.sparqlowl.parser.arq.ARQParserUtilities.XSD_BOOLEAN_FALSE; import static com.clarkparsia.sparqlowl.parser.arq.ARQParserUtilities.XSD_BOOLEAN_TRUE; -import static com.hp.hpl.jena.sparql.util.ExprUtils.nodeToExpr; +import static org.apache.jena.sparql.util.ExprUtils.nodeToExpr; } @members{ @@ -1361,13 +1362,13 @@ iriRefOrFunction rdfLiteral returns [Node l] : ^(LITERAL_PLAIN string) - { $l = Node.createLiteral( $string.s ); } + { $l = NodeFactory.createLiteral( $string.s ); } | ^(LITERAL_LANG string lang=LANGTAG) - { $l = Node.createLiteral( $string.s, $lang.text, false ); } + { $l = NodeFactory.createLiteral( $string.s, $lang.text, false ); } | ^(LITERAL_TYPED string iriRef) { RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName( $iriRef.i.getURI() ); - $l = Node.createLiteral( $string.s, null, dType ); + $l = NodeFactory.createLiteral( $string.s, null, dType ); } ; @@ -1403,7 +1404,7 @@ numericLiteral ) { t = XSDDatatype.XSDdouble ; } ) - { $n = Node.createLiteral( s, null, t ); } + { $n = NodeFactory.createLiteral( s, null, t ); } ; /* @@ -1434,12 +1435,12 @@ string iriRef returns [Node i] : ^(IRI_REF ref=IRI_REF_TERM) - { $i = Node.createURI( $ref.text ); } + { $i = NodeFactory.createURI( $ref.text ); } | ^(PREFIXED_NAME ( p=PNAME_LN | p=PNAME_NS ) ) { String resolved = this.prologue.expandPrefixedName( $p.text ); // FIXME: Null case - $i = Node.createURI( resolved ); + $i = NodeFactory.createURI( resolved ); } ; diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/JenaIOUtils.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/JenaIOUtils.java index a72b9094e..9779ee0ad 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/JenaIOUtils.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/JenaIOUtils.java @@ -11,11 +11,12 @@ import java.io.IOException; import java.net.URI; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.sparql.resultset.XMLInput; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.sparql.resultset.ResultsFormat; +import org.apache.jena.sparql.resultset.XMLInput; +import org.apache.jena.util.FileManager; /** *

@@ -55,10 +56,10 @@ public static ResultSet parseResultSet(final String resultURI) throws IOExceptio return ResultSetFactory.fromXML( URI.create( resultURI ).toURL().openStream() ); } else if( resultURI.endsWith( "ttl" ) ) { - return ResultSetFactory.fromRDF( FileManager.get().loadModel( resultURI ) ); + return ResultSetFactory.load( resultURI, ResultsFormat.FMT_RDF_TTL); } else if( resultURI.endsWith( "rdf" ) ) { - return ResultSetFactory.fromRDF( FileManager.get().loadModel( resultURI ) ); + return ResultSetFactory.load( resultURI, ResultsFormat.FMT_RDF_XML ); } else { throw new RuntimeException( "Unknown format." ); diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SlicedResultSet.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SlicedResultSet.java index be7dd42e4..bedde65de 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SlicedResultSet.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SlicedResultSet.java @@ -8,10 +8,10 @@ import java.util.List; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sparql.engine.binding.Binding; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.engine.binding.Binding; /** *

Title:

diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SortedResultSet.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SortedResultSet.java index 1c6327333..26a9472e2 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SortedResultSet.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SortedResultSet.java @@ -11,13 +11,13 @@ import java.util.Iterator; import java.util.List; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.SortCondition; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sparql.core.ResultBinding; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.engine.binding.BindingComparator; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.SortCondition; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.core.ResultBinding; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.binding.BindingComparator; /** *

diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecution.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecution.java index dbc30f33c..f832e37d4 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecution.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecution.java @@ -18,6 +18,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.jena.atlas.lib.NotImplemented; +import org.apache.jena.sparql.core.Quad; import org.mindswap.pellet.KnowledgeBase; import org.mindswap.pellet.PelletOptions; import org.mindswap.pellet.exceptions.UnsupportedQueryException; @@ -25,26 +27,26 @@ import com.clarkparsia.pellet.sparqldl.model.QueryParameters; import com.clarkparsia.pellet.sparqldl.parser.ARQParser; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryException; -import com.hp.hpl.jena.query.QueryExecException; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.SortCondition; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.syntax.Template; -import com.hp.hpl.jena.sparql.util.Context; -import com.hp.hpl.jena.sparql.util.ModelUtils; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryException; +import org.apache.jena.query.QueryExecException; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.SortCondition; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.syntax.Template; +import org.apache.jena.sparql.util.Context; +import org.apache.jena.sparql.util.ModelUtils; /** *

@@ -324,6 +326,21 @@ public Iterator execConstructTriples() { return ModelUtils.statementsToTriples(execConstruct().listStatements()); } + @Override + public Iterator execConstructQuads() { + throw new NotImplemented(); + } + + @Override + public Dataset execConstructDataset() { + throw new NotImplemented(); + } + + @Override + public Dataset execConstructDataset(Dataset dataset) { + throw new NotImplemented(); + } + /** * {@inheritDoc} */ diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecutionFactory.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecutionFactory.java index e5b525291..2f4c6a104 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecutionFactory.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLExecutionFactory.java @@ -13,16 +13,16 @@ import org.mindswap.pellet.jena.PelletInfGraph; import com.clarkparsia.pellet.sparqldl.parser.ARQParser; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.query.ARQ; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryException; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.graph.Graph; +import org.apache.jena.query.ARQ; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryException; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.rdf.model.Model; /** *

diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLResultSet.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLResultSet.java index b7aacc32b..4324a0106 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLResultSet.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLResultSet.java @@ -19,14 +19,14 @@ import com.clarkparsia.pellet.sparqldl.model.QueryParameters; import com.clarkparsia.pellet.sparqldl.model.QueryResult; import com.clarkparsia.pellet.sparqldl.model.ResultBinding; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSetRewindable; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sparql.core.Var; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.engine.binding.BindingHashMap; -import com.hp.hpl.jena.sparql.engine.binding.BindingMap; +import org.apache.jena.graph.Node; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSetRewindable; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.binding.BindingHashMap; +import org.apache.jena.sparql.engine.binding.BindingMap; /** *

@@ -164,7 +164,7 @@ public Binding nextBinding() { * {@inheritDoc} */ public QuerySolution nextSolution() { - return new com.hp.hpl.jena.sparql.core.ResultBinding( model, nextBinding() ); + return new org.apache.jena.sparql.core.ResultBinding( model, nextBinding() ); } /** diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStage.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStage.java index b4dc439bc..e4b8035ef 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStage.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStage.java @@ -27,17 +27,17 @@ import com.clarkparsia.pellet.sparqldl.model.ResultBinding; import com.clarkparsia.pellet.sparqldl.model.ResultBindingImpl; import com.clarkparsia.pellet.sparqldl.parser.ARQParser; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.sparql.core.BasicPattern; -import com.hp.hpl.jena.sparql.core.Var; -import com.hp.hpl.jena.sparql.engine.ExecutionContext; -import com.hp.hpl.jena.sparql.engine.QueryIterator; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.engine.iterator.QueryIterRepeatApply; -import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorResultSet; -import com.hp.hpl.jena.sparql.engine.main.StageGeneratorGeneric; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.core.BasicPattern; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.engine.QueryIterator; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.iterator.QueryIterRepeatApply; +import org.apache.jena.sparql.engine.iterator.QueryIteratorResultSet; +import org.apache.jena.sparql.engine.main.StageGeneratorGeneric; /** *

diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStageGenerator.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStageGenerator.java index 4df55a048..204f1b2e9 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStageGenerator.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/jena/SparqlDLStageGenerator.java @@ -6,10 +6,10 @@ package com.clarkparsia.pellet.sparqldl.jena; -import com.hp.hpl.jena.sparql.core.BasicPattern; -import com.hp.hpl.jena.sparql.engine.ExecutionContext; -import com.hp.hpl.jena.sparql.engine.QueryIterator; -import com.hp.hpl.jena.sparql.engine.main.StageGenerator; +import org.apache.jena.sparql.core.BasicPattern; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.engine.QueryIterator; +import org.apache.jena.sparql.engine.main.StageGenerator; /** *

diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/model/QueryParameters.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/model/QueryParameters.java index cb765b8f0..997c01e06 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/model/QueryParameters.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/model/QueryParameters.java @@ -14,8 +14,8 @@ import org.mindswap.pellet.jena.JenaUtils; import org.mindswap.pellet.utils.ATermUtils; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; import aterm.ATermAppl; diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/ARQParser.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/ARQParser.java index d34a9439c..193de483e 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/ARQParser.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/ARQParser.java @@ -52,23 +52,23 @@ import com.clarkparsia.pellet.sparqldl.model.QueryAtomFactory; import com.clarkparsia.pellet.sparqldl.model.QueryImpl; import com.clarkparsia.pellet.utils.TermFactory; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.sparql.core.BasicPattern; -import com.hp.hpl.jena.sparql.core.TriplePath; -import com.hp.hpl.jena.sparql.core.Var; -import com.hp.hpl.jena.sparql.syntax.Element; -import com.hp.hpl.jena.sparql.syntax.ElementGroup; -import com.hp.hpl.jena.sparql.syntax.ElementPathBlock; -import com.hp.hpl.jena.sparql.syntax.ElementTriplesBlock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.sparql.core.BasicPattern; +import org.apache.jena.sparql.core.TriplePath; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.syntax.Element; +import org.apache.jena.sparql.syntax.ElementGroup; +import org.apache.jena.sparql.syntax.ElementPathBlock; +import org.apache.jena.sparql.syntax.ElementTriplesBlock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

@@ -128,7 +128,7 @@ public Query parse(InputStream stream, KnowledgeBase kb) { * {@inheritDoc} */ public Query parse(String queryStr, KnowledgeBase kb) { - com.hp.hpl.jena.query.Query sparql = QueryFactory.create( queryStr, Syntax.syntaxSPARQL ); + org.apache.jena.query.Query sparql = QueryFactory.create( queryStr, Syntax.syntaxSPARQL ); return parse( sparql, kb ); } @@ -146,7 +146,7 @@ private Query parse(Reader in, KnowledgeBase kb) throws IOException { return parse( queryString.toString(), kb ); } - public Query parse(com.hp.hpl.jena.query.Query sparql, KnowledgeBase kb) { + public Query parse(org.apache.jena.query.Query sparql, KnowledgeBase kb) { this.kb = kb; if( sparql.isDescribeType() ) diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/QueryParser.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/QueryParser.java index 9b1e26e9f..6868a0835 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/QueryParser.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/QueryParser.java @@ -34,5 +34,5 @@ public interface QueryParser { public Query parse(final InputStream stream, KnowledgeBase kb); - public Query parse(final com.hp.hpl.jena.query.Query stream, KnowledgeBase kb); + public Query parse(final org.apache.jena.query.Query stream, KnowledgeBase kb); } diff --git a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/SparqldlExtensionsVocabulary.java b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/SparqldlExtensionsVocabulary.java index 35597a316..6301ab7b3 100644 --- a/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/SparqldlExtensionsVocabulary.java +++ b/query/src/main/java/com/clarkparsia/pellet/sparqldl/parser/SparqldlExtensionsVocabulary.java @@ -6,8 +6,8 @@ package com.clarkparsia.pellet.sparqldl.parser; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResourceFactory; /** *

diff --git a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQParserUtilities.java b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQParserUtilities.java index 156af8a2e..36b51a401 100644 --- a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQParserUtilities.java +++ b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQParserUtilities.java @@ -14,13 +14,14 @@ import java.util.List; import java.util.Set; +import org.apache.jena.graph.NodeFactory; import org.mindswap.pellet.jena.vocabulary.OWL2; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.XSD; /** *

@@ -58,17 +59,17 @@ public class ARQParserUtilities { public static final Node XSD_BOOLEAN_TRUE; static { - XSD_BOOLEAN_FALSE = Node.createLiteral( Boolean.FALSE.toString(), null, + XSD_BOOLEAN_FALSE = NodeFactory.createLiteral( Boolean.FALSE.toString(), null, XSDDatatype.XSDboolean ); - XSD_BOOLEAN_TRUE = Node.createLiteral( Boolean.TRUE.toString(), null, + XSD_BOOLEAN_TRUE = NodeFactory.createLiteral( Boolean.TRUE.toString(), null, XSDDatatype.XSDboolean ); /* * After merging the newer datatype reasoner, the Collection below * should be pulled from that code. */ - OWL2_DATATYPES = Collections.unmodifiableSet( new HashSet( Arrays. asList( Node - .createURI( OWL2.getURI() + "real" ), Node.createURI( OWL2.getURI() + "rational" ), + OWL2_DATATYPES = Collections.unmodifiableSet( new HashSet( Arrays. asList( NodeFactory + .createURI( OWL2.getURI() + "real" ), NodeFactory.createURI( OWL2.getURI() + "rational" ), XSD.decimal.asNode(), XSD.integer.asNode(), XSD.nonNegativeInteger.asNode(), XSD.nonPositiveInteger.asNode(), XSD.negativeInteger.asNode(), XSD.positiveInteger .asNode(), XSD.xlong.asNode(), XSD.xint.asNode(), XSD.xshort.asNode(), @@ -77,8 +78,8 @@ public class ARQParserUtilities { XSD.xfloat.asNode(), XSD.xstring.asNode(), XSD.normalizedString.asNode(), XSD.token .asNode(), XSD.language.asNode(), XSD.Name.asNode(), XSD.NCName.asNode(), XSD.xboolean.asNode(), XSD.hexBinary.asNode(), XSD.base64Binary.asNode(), - XSD.anyURI.asNode(), XSD.dateTime.asNode(), Node.createURI( XSD.getURI() - + "dateTimeStamp" ), Node.createURI( RDF.getURI() + "XMLLiteral" ) ) ) ); + XSD.anyURI.asNode(), XSD.dateTime.asNode(), NodeFactory.createURI( XSD.getURI() + + "dateTimeStamp" ), NodeFactory.createURI( RDF.getURI() + "XMLLiteral" ) ) ) ); } /** @@ -90,7 +91,7 @@ public class ARQParserUtilities { * @return A literal Node */ public static Node createNonNegativeInteger(String s) { - return Node.createLiteral( s, null, XSDDatatype.XSDnonNegativeInteger ); + return NodeFactory.createLiteral( s, null, XSDDatatype.XSDnonNegativeInteger ); } /** @@ -121,7 +122,7 @@ public static Node listToTriples(List nodes, Collection triples) { for( int i = nodes.size() - 1; i >= 0; i-- ) { final Node oldList = list; final Node first = nodes.get( i ); - list = Node.createAnon(); + list = NodeFactory.createAnon(); triples.add( new Triple( list, RDF.Nodes.first, first ) ); triples.add( new Triple( list, RDF.Nodes.rest, oldList ) ); } diff --git a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQTerpParser.java b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQTerpParser.java index c8cfeb122..edc907626 100644 --- a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQTerpParser.java +++ b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/ARQTerpParser.java @@ -18,12 +18,12 @@ import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlLexer; import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlParser; import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlTreeARQ; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.sparql.lang.SPARQLParser; -import com.hp.hpl.jena.sparql.lang.SPARQLParserFactory; -import com.hp.hpl.jena.sparql.lang.SPARQLParserRegistry; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.query.Syntax; +import org.apache.jena.sparql.lang.SPARQLParser; +import org.apache.jena.sparql.lang.SPARQLParserFactory; +import org.apache.jena.sparql.lang.SPARQLParserRegistry; /** *

diff --git a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/TerpSyntax.java b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/TerpSyntax.java index 6e726eaa4..1bc3c28af 100644 --- a/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/TerpSyntax.java +++ b/query/src/main/java/com/clarkparsia/sparqlowl/parser/arq/TerpSyntax.java @@ -7,7 +7,7 @@ // Questions, comments, or requests for clarification: licensing@clarkparsia.com package com.clarkparsia.sparqlowl.parser.arq; -import com.hp.hpl.jena.query.Syntax; +import org.apache.jena.query.Syntax; /** *

diff --git a/test/src/test/java/com/clarkparsia/explanation/test/AbstractExplanationTest.java b/test/src/test/java/com/clarkparsia/explanation/test/AbstractExplanationTest.java index 23c5378b8..9ecaea435 100644 --- a/test/src/test/java/com/clarkparsia/explanation/test/AbstractExplanationTest.java +++ b/test/src/test/java/com/clarkparsia/explanation/test/AbstractExplanationTest.java @@ -93,7 +93,7 @@ public void createEntities() { b = OWL.Individual( ontologyURI + "b" ); c = OWL.Individual( ontologyURI + "c" ); d = OWL.Individual( ontologyURI + "d" ); - + dt = OWL.Datatype( ontologyURI + "dt" ); anon1 = OWL.AnonymousIndividual( "anon1" ); @@ -115,7 +115,7 @@ public void testInconsistencyExplanations(int max, OWLAxiom[]... explanations) t public void testExplanations(OWLAxiom axiom, int max, OWLAxiom... explanations) throws Exception { testExplanations( axiom, max, new OWLAxiom[][] { explanations } ); } - + public void testExplanations(OWLAxiom axiom, int max, OWLAxiom[]... explanations) throws Exception { Set> explanationSet = new HashSet>(); @@ -174,7 +174,7 @@ public void annotationOnlyDuringMUPSEntity() throws Exception { @Test public void anonymousIndividualPropertyAssertion() throws Exception { assumeTrue( !(this instanceof JenaExplanationTest) ); - + OWLAxiom[] axioms = { OWL.propertyAssertion( a, p, anon1 ), OWL.classAssertion( anon1, A ), OWL.subClassOf( OWL.some( p, A ), B ) }; @@ -256,8 +256,8 @@ public void disjointSupers() throws Exception { @Test public void koalaHardWorkingDomain() throws Exception { String ns = "http://protege.stanford.edu/plugins/owl/owl-library/koala.owl#"; - OWLOntology ontology = manager.loadOntology( IRI - .create( "file:test/data/modularity/koala.owl" ) ); + OWLOntology ontology = manager.loadOntologyFromOntologyDocument( + ClassLoader.getSystemResourceAsStream( "test/data/modularity/koala.owl" ) ); OWLClass animal = OWL.Class( ns + "Animal" ); OWLClass person = OWL.Class( ns + "Person" ); OWLDataProperty hardWorking = OWL.DataProperty( ns + "isHardWorking" ); diff --git a/test/src/test/java/com/clarkparsia/explanation/test/JenaExplanationTest.java b/test/src/test/java/com/clarkparsia/explanation/test/JenaExplanationTest.java index 292977858..d4b06c5ed 100644 --- a/test/src/test/java/com/clarkparsia/explanation/test/JenaExplanationTest.java +++ b/test/src/test/java/com/clarkparsia/explanation/test/JenaExplanationTest.java @@ -32,15 +32,15 @@ import org.semanticweb.owlapi.model.OWLAxiom; import org.semanticweb.owlapi.model.OWLOntology; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; /** *

diff --git a/test/src/test/java/com/clarkparsia/explanation/test/MiscExplanationTests.java b/test/src/test/java/com/clarkparsia/explanation/test/MiscExplanationTests.java index afa972d93..41fdeb80e 100644 --- a/test/src/test/java/com/clarkparsia/explanation/test/MiscExplanationTests.java +++ b/test/src/test/java/com/clarkparsia/explanation/test/MiscExplanationTests.java @@ -36,18 +36,18 @@ import com.clarkparsia.owlapiv3.OWL; import com.clarkparsia.pellet.owlapiv3.PelletReasoner; import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/test/src/test/java/com/clarkparsia/jena/test/AbstractJenaTests.java b/test/src/test/java/com/clarkparsia/jena/test/AbstractJenaTests.java index 3ebdf6754..99240bf1c 100644 --- a/test/src/test/java/com/clarkparsia/jena/test/AbstractJenaTests.java +++ b/test/src/test/java/com/clarkparsia/jena/test/AbstractJenaTests.java @@ -16,13 +16,13 @@ import org.mindswap.pellet.jena.PelletInfGraph; import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; /** * @author Evren Sirin diff --git a/test/src/test/java/com/clarkparsia/jena/test/ResourceImportLoader.java b/test/src/test/java/com/clarkparsia/jena/test/ResourceImportLoader.java index c95c9af0d..bddfef242 100644 --- a/test/src/test/java/com/clarkparsia/jena/test/ResourceImportLoader.java +++ b/test/src/test/java/com/clarkparsia/jena/test/ResourceImportLoader.java @@ -7,8 +7,8 @@ import java.io.InputStream; import com.clarkparsia.pellet.test.query.MiscSPARQLDLTest; -import com.hp.hpl.jena.ontology.OntDocumentManager.ReadFailureHandler; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.ontology.OntDocumentManager.ReadFailureHandler; +import org.apache.jena.rdf.model.Model; /** * @author Pavel Klinov @@ -17,7 +17,7 @@ public class ResourceImportLoader implements ReadFailureHandler { /* (non-Javadoc) - * @see com.hp.hpl.jena.ontology.OntDocumentManager.ReadFailureHandler#handleFailedRead(java.lang.String, com.hp.hpl.jena.rdf.model.Model, java.lang.Exception) + * @see org.apache.jena.ontology.OntDocumentManager.ReadFailureHandler#handleFailedRead(java.lang.String, org.apache.jena.rdf.model.Model, java.lang.Exception) */ @Override public void handleFailedRead(String url, Model m, Exception e) { diff --git a/test/src/test/java/com/clarkparsia/pellet/test/annotations/TestReasoningWithAnnotationAxioms.java b/test/src/test/java/com/clarkparsia/pellet/test/annotations/TestReasoningWithAnnotationAxioms.java index f83122c34..cd806de78 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/annotations/TestReasoningWithAnnotationAxioms.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/annotations/TestReasoningWithAnnotationAxioms.java @@ -29,15 +29,15 @@ import com.clarkparsia.pellet.owlapiv3.PelletReasoner; import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; public class TestReasoningWithAnnotationAxioms { diff --git a/test/src/test/java/com/clarkparsia/pellet/test/classification/JenaClassificationTest.java b/test/src/test/java/com/clarkparsia/pellet/test/classification/JenaClassificationTest.java index de9257259..f8291731d 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/classification/JenaClassificationTest.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/classification/JenaClassificationTest.java @@ -16,14 +16,14 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.ReasonerVocabulary; public class JenaClassificationTest extends AbstractClassificationTest { public void testClassification(String inputOnt, String classifiedOnt) { diff --git a/test/src/test/java/com/clarkparsia/pellet/test/jena/ConcurrencyTest.java b/test/src/test/java/com/clarkparsia/pellet/test/jena/ConcurrencyTest.java index dfdd00282..039184735 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/jena/ConcurrencyTest.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/jena/ConcurrencyTest.java @@ -19,11 +19,11 @@ import org.mindswap.pellet.jena.PelletInfGraph; import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.ConversionException; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; +import org.apache.jena.ontology.ConversionException; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; /** * Verifies that Pellet doesn't throw any exceptions when doing concurrent ABox diff --git a/test/src/test/java/com/clarkparsia/pellet/test/jena/MiscTests.java b/test/src/test/java/com/clarkparsia/pellet/test/jena/MiscTests.java index 993378789..b43f3bbc6 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/jena/MiscTests.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/jena/MiscTests.java @@ -13,13 +13,13 @@ import org.mindswap.pellet.exceptions.InconsistentOntologyException; import org.mindswap.pellet.jena.PelletReasonerFactory; -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.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.OWL2; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.OWL2; /** * @author Pavel Klinov diff --git a/test/src/test/java/com/clarkparsia/pellet/test/jena/RealizationTest.java b/test/src/test/java/com/clarkparsia/pellet/test/jena/RealizationTest.java index fd5c78d82..42fa1babc 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/jena/RealizationTest.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/jena/RealizationTest.java @@ -11,9 +11,9 @@ import org.mindswap.pellet.jena.PelletInfGraph; import org.mindswap.pellet.jena.PelletReasonerFactory; -import com.hp.hpl.jena.ontology.Individual; -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.OntModel; +import org.apache.jena.rdf.model.ModelFactory; /** * A simple check to see when classification and realization are triggered by diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/ARQSparqlDawgTester.java b/test/src/test/java/com/clarkparsia/pellet/test/query/ARQSparqlDawgTester.java index 116262600..f4a8089c2 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/ARQSparqlDawgTester.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/ARQSparqlDawgTester.java @@ -21,18 +21,18 @@ import org.mindswap.pellet.utils.URIUtils; import com.clarkparsia.pellet.sparqldl.jena.JenaIOUtils; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.query.ResultSetRewindable; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.query.ResultSetRewindable; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.util.FileManager; /** *

@@ -105,11 +105,10 @@ protected void beforeExecution() { protected Dataset createDataset() { if( query.getGraphURIs().isEmpty() && query.getNamedGraphURIs().isEmpty() ) { return DatasetFactory.create( new ArrayList( graphURIs ), - new ArrayList( namedGraphURIs ), FileManager.get(), "" ); + new ArrayList( namedGraphURIs ) ); } else { - return DatasetFactory.create( query.getGraphURIs(), query.getNamedGraphURIs(), - FileManager.get(), "" ); + return DatasetFactory.create( query.getGraphURIs(), query.getNamedGraphURIs() ); } } diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/EarlResultVocabulary.java b/test/src/test/java/com/clarkparsia/pellet/test/query/EarlResultVocabulary.java index 4e19fb760..960440c59 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/EarlResultVocabulary.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/EarlResultVocabulary.java @@ -6,9 +6,9 @@ package com.clarkparsia.pellet.test.query; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngine.java b/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngine.java index a376aff4c..6f73eedcd 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngine.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngine.java @@ -21,17 +21,17 @@ import org.mindswap.pellet.exceptions.UnsupportedFeatureException; import org.mindswap.pellet.utils.VersionInfo; -import com.hp.hpl.jena.query.ARQ; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.sparql.vocabulary.EARL; -import com.hp.hpl.jena.sparql.vocabulary.FOAF; -import com.hp.hpl.jena.util.FileManager; -import com.hp.hpl.jena.util.LocatorFile; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.query.ARQ; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.sparql.vocabulary.EARL; +import org.apache.jena.sparql.vocabulary.FOAF; +import org.apache.jena.util.FileManager; +import org.apache.jena.util.LocatorFile; +import org.apache.jena.vocabulary.RDF; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngineProcessor.java b/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngineProcessor.java index 99df3d61f..71d3c937c 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngineProcessor.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/ManifestEngineProcessor.java @@ -6,7 +6,7 @@ package com.clarkparsia.pellet.test.query; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/MiscSPARQLDLTest.java b/test/src/test/java/com/clarkparsia/pellet/test/query/MiscSPARQLDLTest.java index 7dfc06524..916f4e756 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/MiscSPARQLDLTest.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/MiscSPARQLDLTest.java @@ -11,14 +11,14 @@ import com.clarkparsia.jena.test.ResourceImportLoader; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.ModelFactory; /** * diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/PelletSparqlDawgTester.java b/test/src/test/java/com/clarkparsia/pellet/test/query/PelletSparqlDawgTester.java index 4a763d917..b85dfad2d 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/PelletSparqlDawgTester.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/PelletSparqlDawgTester.java @@ -19,14 +19,14 @@ import com.clarkparsia.jena.test.ResourceImportLoader; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.FileManager; -import com.hp.hpl.jena.util.FileUtils; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.FileManager; +import org.apache.jena.util.FileUtils; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/ResultSetUtils.java b/test/src/test/java/com/clarkparsia/pellet/test/query/ResultSetUtils.java index bb342c100..63ddee3ee 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/ResultSetUtils.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/ResultSetUtils.java @@ -18,14 +18,14 @@ import org.junit.Assert; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.query.ResultSetRewindable; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.sparql.resultset.ResultsFormat; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.query.ResultSetRewindable; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.sparql.resultset.ResultsFormat; /** * @author Evren Sirin diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDLDawgTester.java b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDLDawgTester.java index 0eb9bde74..3824aed60 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDLDawgTester.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDLDawgTester.java @@ -34,18 +34,18 @@ import com.clarkparsia.pellet.sparqldl.model.Query; import com.clarkparsia.pellet.sparqldl.model.QueryResult; import com.clarkparsia.pellet.sparqldl.model.ResultBinding; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.query.ResultSetRewindable; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.engine.binding.BindingBase; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.query.ResultSetRewindable; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.binding.BindingBase; /** *

@@ -122,7 +122,7 @@ public void setQueryURI(String queryURI) { } this.queryURI = queryURI; - final com.hp.hpl.jena.query.Query query = QueryFactory.read( queryURI ); + final org.apache.jena.query.Query query = QueryFactory.read( queryURI ); this.query = QueryEngine.getParser().parse( query.toString( Syntax.syntaxSPARQL ), ((PelletInfGraph) model.getGraph()).getKB() ); diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestCase.java b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestCase.java index 24aa84f8a..8169507d0 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestCase.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestCase.java @@ -14,7 +14,7 @@ import org.mindswap.pellet.PelletOptions; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestSuite.java b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestSuite.java index 15c193546..05da46d28 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestSuite.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestSuite.java @@ -23,7 +23,7 @@ import org.mindswap.pellet.test.PelletTestSuite; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestVocabulary.java b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestVocabulary.java index a8c4db042..f2e79a4fd 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestVocabulary.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/SparqlDawgTestVocabulary.java @@ -6,9 +6,9 @@ package com.clarkparsia.pellet.test.query; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TableResult2XML.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TableResult2XML.java index a136b2f78..7ada2b9df 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TableResult2XML.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TableResult2XML.java @@ -21,14 +21,14 @@ import org.mindswap.pellet.jena.JenaUtils; import org.mindswap.pellet.utils.ATermUtils; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.sparql.engine.binding.Binding; -import com.hp.hpl.jena.sparql.engine.binding.BindingUtils; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.binding.BindingUtils; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TestGroundBooleanQueryComponents.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TestGroundBooleanQueryComponents.java index 7c462a7c3..92ef9cb8e 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TestGroundBooleanQueryComponents.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TestGroundBooleanQueryComponents.java @@ -22,13 +22,13 @@ import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.ModelFactory; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TestMiscSPARQL.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TestMiscSPARQL.java index 20a48f09d..f8a68c142 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TestMiscSPARQL.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TestMiscSPARQL.java @@ -14,16 +14,16 @@ import org.mindswap.pellet.test.PelletTestSuite; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; -import com.hp.hpl.jena.query.ARQ; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.InfModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.sparql.core.Var; -import com.hp.hpl.jena.sparql.engine.binding.Binding; +import org.apache.jena.query.ARQ; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.InfModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.binding.Binding; /** * Title:
diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TestParameterizedQuery.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TestParameterizedQuery.java index f684cd276..e32a4481a 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TestParameterizedQuery.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TestParameterizedQuery.java @@ -24,20 +24,20 @@ import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TestQuerySubsumption.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TestQuerySubsumption.java index db49762ec..7ead396af 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TestQuerySubsumption.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TestQuerySubsumption.java @@ -13,8 +13,8 @@ import com.clarkparsia.pellet.sparqldl.engine.QuerySubsumption; import com.clarkparsia.pellet.sparqldl.model.Query; import com.clarkparsia.pellet.sparqldl.parser.QueryParser; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; /** * Test cases for the class QuerySubsumption diff --git a/test/src/test/java/com/clarkparsia/pellet/test/query/TestSingleSPARQLDLQueries.java b/test/src/test/java/com/clarkparsia/pellet/test/query/TestSingleSPARQLDLQueries.java index fcaebe62d..f5d9229c1 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/query/TestSingleSPARQLDLQueries.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/query/TestSingleSPARQLDLQueries.java @@ -16,24 +16,24 @@ import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory.QueryEngineType; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -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.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +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.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellet/test/rbox/PropertyChainTests.java b/test/src/test/java/com/clarkparsia/pellet/test/rbox/PropertyChainTests.java index a9a23bd5d..cd2024361 100644 --- a/test/src/test/java/com/clarkparsia/pellet/test/rbox/PropertyChainTests.java +++ b/test/src/test/java/com/clarkparsia/pellet/test/rbox/PropertyChainTests.java @@ -36,12 +36,12 @@ import aterm.ATermAppl; -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.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/OWLSyntaxCheckerTest.java b/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/OWLSyntaxCheckerTest.java index aa8428986..ef8efe082 100644 --- a/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/OWLSyntaxCheckerTest.java +++ b/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/OWLSyntaxCheckerTest.java @@ -15,14 +15,14 @@ import com.clarkparsia.pellint.rdfxml.OWLSyntaxChecker; import com.clarkparsia.pellint.rdfxml.RDFLints; import com.clarkparsia.pellint.rdfxml.RDFModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; /** *

diff --git a/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/RDFModelTest.java b/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/RDFModelTest.java index a9fd85c41..7d42cc0bf 100644 --- a/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/RDFModelTest.java +++ b/test/src/test/java/com/clarkparsia/pellint/test/rdfxml/RDFModelTest.java @@ -16,15 +16,15 @@ import com.clarkparsia.pellint.rdfxml.RDFModel; import com.clarkparsia.pellint.util.CollectionUtil; -import com.hp.hpl.jena.rdf.model.AnonId; -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.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.AnonId; +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.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; /** *

diff --git a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTest.java b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTest.java index d3c6017f1..f512b0dda 100644 --- a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTest.java +++ b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTest.java @@ -31,9 +31,9 @@ import com.clarkparsia.pellet.sparqldl.parser.ARQParser; import com.clarkparsia.sparqlowl.parser.arq.ARQTerpParser; import com.clarkparsia.sparqlowl.parser.arq.TerpSyntax; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; /** *

diff --git a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTestParentQueries.java b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTestParentQueries.java index ddd643a66..b9d5b25c5 100644 --- a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTestParentQueries.java +++ b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/ParserTestParentQueries.java @@ -29,9 +29,9 @@ import com.clarkparsia.pellet.sparqldl.parser.ARQParser; import com.clarkparsia.sparqlowl.parser.arq.ARQTerpParser; import com.clarkparsia.sparqlowl.parser.arq.TerpSyntax; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; /** *

diff --git a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/TreeARQDriver.java b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/TreeARQDriver.java index 7295afb41..3c3ea29ee 100644 --- a/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/TreeARQDriver.java +++ b/test/src/test/java/com/clarkparsia/sparqlowl/parser/test/TreeARQDriver.java @@ -22,12 +22,12 @@ import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlLexer; import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlParser; import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlTreeARQ; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; /** *

diff --git a/test/src/test/java/org/mindswap/pellet/test/JenaTests.java b/test/src/test/java/org/mindswap/pellet/test/JenaTests.java index c9349d186..302349d5d 100644 --- a/test/src/test/java/org/mindswap/pellet/test/JenaTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/JenaTests.java @@ -44,39 +44,39 @@ import com.clarkparsia.pellet.datatypes.DatatypeReasoner; import com.clarkparsia.pellet.datatypes.DatatypeReasonerImpl; import com.clarkparsia.pellet.utils.PropertiesBuilder; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.graph.compose.Union; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.IntersectionClass; -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.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.UnionClass; -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.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFList; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.graph.compose.Union; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.ontology.UnionClass; +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.rdf.model.Property; +import org.apache.jena.rdf.model.RDFList; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.vocabulary.XSD; public class JenaTests { - public static String base = "file:" + PelletTestSuite.base + "misc/"; + public static String base = PelletTestSuite.base + "misc/"; public static void main(String args[]) { junit.textui.TestRunner.run( JenaTests.suite() ); diff --git a/test/src/test/java/org/mindswap/pellet/test/JenaWebOntTester.java b/test/src/test/java/org/mindswap/pellet/test/JenaWebOntTester.java index 04fb69368..374b16eda 100644 --- a/test/src/test/java/org/mindswap/pellet/test/JenaWebOntTester.java +++ b/test/src/test/java/org/mindswap/pellet/test/JenaWebOntTester.java @@ -13,17 +13,17 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; import org.mindswap.pellet.jena.graph.loader.GraphLoader; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Triple; -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.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.FileManager; -import com.hp.hpl.jena.util.LocationMapper; -import com.hp.hpl.jena.util.LocatorFile; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Triple; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +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; +import org.apache.jena.util.LocatorFile; +import org.apache.jena.util.iterator.ExtendedIterator; public class JenaWebOntTester implements WebOntTester { private OntModel model; diff --git a/test/src/test/java/org/mindswap/pellet/test/OWLTestVocabulary.java b/test/src/test/java/org/mindswap/pellet/test/OWLTestVocabulary.java index f3bcf6c86..3b5f231f6 100644 --- a/test/src/test/java/org/mindswap/pellet/test/OWLTestVocabulary.java +++ b/test/src/test/java/org/mindswap/pellet/test/OWLTestVocabulary.java @@ -23,13 +23,13 @@ package org.mindswap.pellet.test; -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.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; +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.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; public class OWLTestVocabulary { private static Model model = ModelFactory.createDefaultModel(); diff --git a/test/src/test/java/org/mindswap/pellet/test/PelletTestCase.java b/test/src/test/java/org/mindswap/pellet/test/PelletTestCase.java index 73d41b529..72defe354 100644 --- a/test/src/test/java/org/mindswap/pellet/test/PelletTestCase.java +++ b/test/src/test/java/org/mindswap/pellet/test/PelletTestCase.java @@ -26,17 +26,17 @@ import aterm.ATermAppl; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.util.iterator.Filter; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.util.iterator.Filter; public final class PelletTestCase { public static Set set(T... elements) { diff --git a/test/src/test/java/org/mindswap/pellet/test/TestAnnotations.java b/test/src/test/java/org/mindswap/pellet/test/TestAnnotations.java index 09f7c3795..898de230d 100644 --- a/test/src/test/java/org/mindswap/pellet/test/TestAnnotations.java +++ b/test/src/test/java/org/mindswap/pellet/test/TestAnnotations.java @@ -27,18 +27,18 @@ import com.clarkparsia.pellet.owlapiv3.OWLAPILoader; import com.clarkparsia.pellet.sparqldl.jena.SparqlDLExecutionFactory; import com.clarkparsia.pellet.utils.PropertiesBuilder; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDFS; /** *

@@ -58,9 +58,9 @@ */ public class TestAnnotations { - private static final String DATA1_RDF = "file:test/data/annotations/data1.rdf"; - private static final String DATA1_TTL = "file:test/data/annotations/data1.ttl"; - private static final String QUERY1_RQ = "file:test/data/annotations/query1.rq"; + private static final String DATA1_RDF = "test/data/annotations/data1.rdf"; + private static final String DATA1_TTL = "test/data/annotations/data1.ttl"; + private static final String QUERY1_RQ = "test/data/annotations/query1.rq"; public static junit.framework.Test suite() { return new JUnit4TestAdapter( TestAnnotations.class ); diff --git a/test/src/test/java/org/mindswap/pellet/test/TracingTests.java b/test/src/test/java/org/mindswap/pellet/test/TracingTests.java index 58460e972..95e2b9be5 100644 --- a/test/src/test/java/org/mindswap/pellet/test/TracingTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/TracingTests.java @@ -56,7 +56,7 @@ import com.clarkparsia.pellet.rules.model.IndividualPropertyAtom; import com.clarkparsia.pellet.rules.model.Rule; import com.clarkparsia.pellet.rules.model.RuleAtom; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.vocabulary.XSD; public class TracingTests extends AbstractKBTests { diff --git a/test/src/test/java/org/mindswap/pellet/test/WebOntTest.java b/test/src/test/java/org/mindswap/pellet/test/WebOntTest.java index fe9590c88..4660ec6c7 100644 --- a/test/src/test/java/org/mindswap/pellet/test/WebOntTest.java +++ b/test/src/test/java/org/mindswap/pellet/test/WebOntTest.java @@ -56,17 +56,17 @@ import org.mindswap.pellet.exceptions.TimeoutException; import org.mindswap.pellet.exceptions.UnsupportedFeatureException; -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.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +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.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; public class WebOntTest { public static Logger log = Logger.getLogger( WebOntTest.class.getName() ); diff --git a/test/src/test/java/org/mindswap/pellet/test/inctest/IncJenaConsistencyTests.java b/test/src/test/java/org/mindswap/pellet/test/inctest/IncJenaConsistencyTests.java index ea45325db..83e2a110a 100644 --- a/test/src/test/java/org/mindswap/pellet/test/inctest/IncJenaConsistencyTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/inctest/IncJenaConsistencyTests.java @@ -34,23 +34,23 @@ import com.clarkparsia.jena.test.AbstractJenaTests; import com.clarkparsia.pellet.utils.PropertiesBuilder; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.IntersectionClass; -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.ontology.UnionClass; -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.rdf.model.RDFList; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.UnionClass; +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.rdf.model.RDFList; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.XSD; /** * Unit tests for incremental consistency checking using Jena API. diff --git a/test/src/test/java/org/mindswap/pellet/test/rules/BuiltInTests.java b/test/src/test/java/org/mindswap/pellet/test/rules/BuiltInTests.java index 4ca5a2b34..75f76d00e 100644 --- a/test/src/test/java/org/mindswap/pellet/test/rules/BuiltInTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/rules/BuiltInTests.java @@ -57,12 +57,12 @@ import com.clarkparsia.pellet.rules.model.AtomVariable; import com.clarkparsia.pellet.rules.model.BuiltInAtom; import com.clarkparsia.pellet.utils.TermFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; /** *

diff --git a/test/src/test/java/org/mindswap/pellet/test/rules/MiscRuleTests.java b/test/src/test/java/org/mindswap/pellet/test/rules/MiscRuleTests.java index 0001ee7dd..288f07806 100644 --- a/test/src/test/java/org/mindswap/pellet/test/rules/MiscRuleTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/rules/MiscRuleTests.java @@ -75,10 +75,10 @@ import com.clarkparsia.pellet.rules.model.RuleAtom; import com.clarkparsia.pellet.rules.model.SameIndividualAtom; import com.clarkparsia.pellet.utils.TermFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; public class MiscRuleTests extends AbstractKBTests { diff --git a/test/src/test/java/org/mindswap/pellet/test/rules/SWRLAbstract.java b/test/src/test/java/org/mindswap/pellet/test/rules/SWRLAbstract.java index 5fcdb2142..bebcbe201 100644 --- a/test/src/test/java/org/mindswap/pellet/test/rules/SWRLAbstract.java +++ b/test/src/test/java/org/mindswap/pellet/test/rules/SWRLAbstract.java @@ -14,11 +14,11 @@ import com.clarkparsia.owlapiv3.OntologyUtils; import com.clarkparsia.pellet.owlapiv3.PelletReasoner; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; /** *

diff --git a/test/src/test/java/org/mindswap/pellet/test/rules/SWRLPerformanceTests.java b/test/src/test/java/org/mindswap/pellet/test/rules/SWRLPerformanceTests.java index 1e4e50d74..0fcf31fe5 100644 --- a/test/src/test/java/org/mindswap/pellet/test/rules/SWRLPerformanceTests.java +++ b/test/src/test/java/org/mindswap/pellet/test/rules/SWRLPerformanceTests.java @@ -11,14 +11,14 @@ import org.mindswap.pellet.jena.PelletReasonerFactory; import org.mindswap.pellet.test.PelletTestSuite; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; public class SWRLPerformanceTests {