diff --git a/csparql-common/pom.xml b/csparql-common/pom.xml index 21b415d..bb064a3 100644 --- a/csparql-common/pom.xml +++ b/csparql-common/pom.xml @@ -66,8 +66,8 @@ org.apache.jena - jena-arq-Percentile - 2.11.1 + jena-arq + 3.0.1 diff --git a/csparql-common/src/main/java/eu/larkc/csparql/common/utils/CsparqlUtils.java b/csparql-common/src/main/java/eu/larkc/csparql/common/utils/CsparqlUtils.java index 3922257..a1089b7 100644 --- a/csparql-common/src/main/java/eu/larkc/csparql/common/utils/CsparqlUtils.java +++ b/csparql-common/src/main/java/eu/larkc/csparql/common/utils/CsparqlUtils.java @@ -39,9 +39,9 @@ import java.io.FileReader; import java.io.StringWriter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.util.FileManager; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.FileManager; public class CsparqlUtils { diff --git a/csparql-core/src/main/java/eu/larkc/csparql/core/engine/CsparqlEngineImpl.java b/csparql-core/src/main/java/eu/larkc/csparql/core/engine/CsparqlEngineImpl.java index d9d9cc8..53685a6 100644 --- a/csparql-core/src/main/java/eu/larkc/csparql/core/engine/CsparqlEngineImpl.java +++ b/csparql-core/src/main/java/eu/larkc/csparql/core/engine/CsparqlEngineImpl.java @@ -48,12 +48,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner; -import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory; -import com.hp.hpl.jena.reasoner.rulesys.Rule; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.reasoner.rulesys.GenericRuleReasoner; +import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; +import org.apache.jena.reasoner.rulesys.Rule; +import org.apache.jena.vocabulary.ReasonerVocabulary; import eu.larkc.csparql.cep.api.CepEngine; import eu.larkc.csparql.cep.api.RdfQuadruple; @@ -338,7 +338,7 @@ public CsparqlQueryResultProxy registerQuery(String command, boolean activateInf if (activateInference) { logger.debug("RDFS reasoner"); Resource config = ModelFactory.createDefaultModel().createResource().addProperty(ReasonerVocabulary.PROPsetRDFSLevel, "simple"); - com.hp.hpl.jena.reasoner.Reasoner reasoner = RDFSRuleReasonerFactory.theInstance().create(config); + org.apache.jena.reasoner.Reasoner reasoner = RDFSRuleReasonerFactory.theInstance().create(config); sparqlEngine.addReasonerToReasonerMap(query.getSparqlQuery().getId(), reasoner); } @@ -381,7 +381,7 @@ public CsparqlQueryResultProxy registerQuery(String command, boolean activateInf if (activateInference) { logger.debug("Generic Rule Engine"); - com.hp.hpl.jena.reasoner.Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(Rule.rulesParserFromReader(new BufferedReader(new StringReader(rulesFileSerialization))))); + org.apache.jena.reasoner.Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(Rule.rulesParserFromReader(new BufferedReader(new StringReader(rulesFileSerialization))))); switch (chainingType) { case BACKWARD: reasoner.setParameter(ReasonerVocabulary.PROPruleMode, "backward"); @@ -439,7 +439,7 @@ public CsparqlQueryResultProxy registerQuery(String command, boolean activateInf if (activateInference) { logger.debug("Generic Rule Engine"); - com.hp.hpl.jena.reasoner.Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(Rule.rulesParserFromReader(new BufferedReader(new StringReader(rulesFileSerialization))))); + org.apache.jena.reasoner.Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(Rule.rulesParserFromReader(new BufferedReader(new StringReader(rulesFileSerialization))))); switch (chainingType) { case BACKWARD: reasoner.setParameter(ReasonerVocabulary.PROPruleMode, "backward"); diff --git a/csparql-core/src/main/java/eu/larkc/csparql/core/engine/RDFStreamFormatter.java b/csparql-core/src/main/java/eu/larkc/csparql/core/engine/RDFStreamFormatter.java index 58701c4..c0cd5bc 100644 --- a/csparql-core/src/main/java/eu/larkc/csparql/core/engine/RDFStreamFormatter.java +++ b/csparql-core/src/main/java/eu/larkc/csparql/core/engine/RDFStreamFormatter.java @@ -43,15 +43,15 @@ import eu.larkc.csparql.common.RDFTable; import eu.larkc.csparql.common.RDFTuple; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -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.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +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.Statement; +import org.apache.jena.rdf.model.StmtIterator; public class RDFStreamFormatter extends RdfStream implements Observer { diff --git a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/ConsoleFormatter.java b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/ConsoleFormatter.java index 738879a..a7cdb4a 100644 --- a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/ConsoleFormatter.java +++ b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/ConsoleFormatter.java @@ -36,7 +36,7 @@ import java.util.Observable; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDF; import eu.larkc.csparql.common.RDFTable; import eu.larkc.csparql.common.RDFTuple; diff --git a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/CsparqlTest.java b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/CsparqlTest.java index 1beafab..e45253e 100644 --- a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/CsparqlTest.java +++ b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/CsparqlTest.java @@ -59,11 +59,11 @@ // //import java.text.ParseException; // -//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.util.FileManager; +//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.util.FileManager; // //import eu.larkc.csparql.cep.api.RdfQuadruple; //import eu.larkc.csparql.cep.api.RdfStream; diff --git a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Inference.java b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Inference.java index 7cfab30..b3dc69b 100644 --- a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Inference.java +++ b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Inference.java @@ -34,16 +34,16 @@ */ package eu.larkc.csparql.core.general_test; -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.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.util.FileManager; -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.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.util.FileManager; +import org.apache.jena.vocabulary.RDF; public class Inference { diff --git a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Static_data_management.java b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Static_data_management.java index 3a6cb29..e6e7d55 100644 --- a/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Static_data_management.java +++ b/csparql-core/src/test/java/eu/larkc/csparql/core/general_test/Static_data_management.java @@ -59,13 +59,13 @@ // //import java.text.ParseException; // -//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.query.Syntax; +//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.query.Syntax; // //import eu.larkc.csparql.cep.api.RdfStream; //import eu.larkc.csparql.core.engine.CsparqlEngine; diff --git a/csparql-sparql-jena/pom.xml b/csparql-sparql-jena/pom.xml index e36ab06..47f1967 100644 --- a/csparql-sparql-jena/pom.xml +++ b/csparql-sparql-jena/pom.xml @@ -74,8 +74,8 @@ org.apache.jena - jena-arq-Percentile - 2.11.1 + jena-arq + 3.0.1 diff --git a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/JenaEngine.java b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/JenaEngine.java index a2da683..beef2fd 100644 --- a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/JenaEngine.java +++ b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/JenaEngine.java @@ -47,36 +47,37 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -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.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.InfModel; -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.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.PropertyImpl; -import com.hp.hpl.jena.rdf.model.impl.ResourceImpl; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner; -import com.hp.hpl.jena.reasoner.rulesys.RDFSRuleReasonerFactory; -import com.hp.hpl.jena.reasoner.rulesys.Rule; -import com.hp.hpl.jena.sparql.function.FunctionRegistry; -import com.hp.hpl.jena.vocabulary.ReasonerVocabulary; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.query.ARQ; +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.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.InfModel; +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.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.PropertyImpl; +import org.apache.jena.rdf.model.impl.ResourceImpl; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.rulesys.GenericRuleReasoner; +import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; +import org.apache.jena.reasoner.rulesys.Rule; +import org.apache.jena.sparql.function.FunctionRegistry; +import org.apache.jena.vocabulary.ReasonerVocabulary; import eu.larkc.csparql.common.RDFTable; import eu.larkc.csparql.common.RDFTuple; @@ -121,6 +122,7 @@ public String getEngineType(){ public JenaEngine() { super(); + ARQ.init(); // otherwise Context may not be present for FunctionRegistry FunctionRegistry.get().put("http://larkc.eu/csparql/sparql/jena/ext#timestamp", timestamp.class) ; timestamp.timestamps = timestamps; } diff --git a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/common/JenaReasonerWrapper.java b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/common/JenaReasonerWrapper.java index 91536c6..da0fa43 100644 --- a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/common/JenaReasonerWrapper.java +++ b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/common/JenaReasonerWrapper.java @@ -34,7 +34,7 @@ */ package eu.larkc.csparql.sparql.jena.common; -import com.hp.hpl.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.Reasoner; import eu.larkc.csparql.sparql.api.ReasonerWrapper; diff --git a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/data_source/JenaDatasource.java b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/data_source/JenaDatasource.java index d16ec14..589863b 100644 --- a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/data_source/JenaDatasource.java +++ b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/data_source/JenaDatasource.java @@ -39,23 +39,23 @@ import java.util.ArrayList; import java.util.List; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.query.*; -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.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.PropertyImpl; -import com.hp.hpl.jena.rdf.model.impl.ResourceImpl; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.update.UpdateAction; -import com.hp.hpl.jena.update.UpdateFactory; -import com.hp.hpl.jena.update.UpdateRequest; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.query.*; +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.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.PropertyImpl; +import org.apache.jena.rdf.model.impl.ResourceImpl; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.update.UpdateAction; +import org.apache.jena.update.UpdateFactory; +import org.apache.jena.update.UpdateRequest; import eu.larkc.csparql.common.RDFTable; import eu.larkc.csparql.common.RDFTuple; diff --git a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/ext/timestamp.java b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/ext/timestamp.java index 8dd5e75..cc409d7 100644 --- a/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/ext/timestamp.java +++ b/csparql-sparql-jena/src/main/java/eu/larkc/csparql/sparql/jena/ext/timestamp.java @@ -36,18 +36,18 @@ 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.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.Statement; -import com.hp.hpl.jena.rdf.model.impl.PropertyImpl; -import com.hp.hpl.jena.rdf.model.impl.ResourceImpl; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.sparql.expr.NodeValue; -import com.hp.hpl.jena.sparql.function.FunctionBase3; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.datatypes.xsd.XSDDatatype; +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.Statement; +import org.apache.jena.rdf.model.impl.PropertyImpl; +import org.apache.jena.rdf.model.impl.ResourceImpl; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.sparql.expr.NodeValue; +import org.apache.jena.sparql.function.FunctionBase3; public class timestamp extends FunctionBase3 { diff --git a/csparql-ui/src/main/java/eu/larkc/csparql/ui/Application.java b/csparql-ui/src/main/java/eu/larkc/csparql/ui/Application.java index fcceeb7..f20b476 100644 --- a/csparql-ui/src/main/java/eu/larkc/csparql/ui/Application.java +++ b/csparql-ui/src/main/java/eu/larkc/csparql/ui/Application.java @@ -115,4 +115,4 @@ private Application() { // hidden constructor } -} \ No newline at end of file +} diff --git a/csparql-ui/src/main/java/eu/larkc/csparql/ui/ApplicationExternalTimeStamp.java b/csparql-ui/src/main/java/eu/larkc/csparql/ui/ApplicationExternalTimeStamp.java index 0da31db..11ccb7f 100644 --- a/csparql-ui/src/main/java/eu/larkc/csparql/ui/ApplicationExternalTimeStamp.java +++ b/csparql-ui/src/main/java/eu/larkc/csparql/ui/ApplicationExternalTimeStamp.java @@ -106,4 +106,4 @@ private ApplicationExternalTimeStamp() { // hidden constructor } -} \ No newline at end of file +}