From 620399880e5a334ebd9a52e42ed35c4f07cce837 Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Tue, 2 Sep 2025 02:03:30 +0100 Subject: [PATCH 1/2] Bumped version number. --- bigdata-blueprints/pom.xml | 10 ++++----- bigdata-cache/pom.xml | 4 ++-- bigdata-client/pom.xml | 10 ++++----- bigdata-common-util/pom.xml | 10 ++++----- bigdata-core-test/pom.xml | 40 ++++++++++++++++++------------------ bigdata-core/pom.xml | 22 ++++++++++---------- bigdata-ganglia/pom.xml | 4 ++-- bigdata-gas/pom.xml | 10 ++++----- bigdata-jar/pom.xml | 14 ++++++------- bigdata-rdf-test/pom.xml | 40 ++++++++++++++++++------------------ bigdata-runtime/pom.xml | 18 ++++++++-------- bigdata-sails-test/pom.xml | 40 ++++++++++++++++++------------------ bigdata-statics/pom.xml | 4 ++-- bigdata-util/pom.xml | 10 ++++----- bigdata-war-html/pom.xml | 4 ++-- bigdata-war/pom.xml | 22 ++++++++++---------- blazegraph-artifacts/pom.xml | 4 ++-- blazegraph-colt/pom.xml | 4 ++-- blazegraph-war/pom.xml | 26 +++++++++++------------ ctc-striterators/pom.xml | 4 ++-- dsi-utils/pom.xml | 4 ++-- junit-ext/pom.xml | 4 ++-- lgpl-utils/pom.xml | 4 ++-- pom.xml | 2 +- rdf-properties/pom.xml | 26 +++++++++++------------ sparql-grammar/pom.xml | 10 ++++----- system-utils/pom.xml | 4 ++-- vocabularies/pom.xml | 4 ++-- 28 files changed, 179 insertions(+), 179 deletions(-) diff --git a/bigdata-blueprints/pom.xml b/bigdata-blueprints/pom.xml index b2f9411e34..f07be65813 100644 --- a/bigdata-blueprints/pom.xml +++ b/bigdata-blueprints/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-blueprints - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Blueprints API Blazegraph support for Tinkerpop 2.5 jar @@ -257,9 +257,9 @@ ga('send', 'pageview'); ${servlet.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} diff --git a/bigdata-cache/pom.xml b/bigdata-cache/pom.xml index 6fbff9eec2..1799c902a0 100644 --- a/bigdata-cache/pom.xml +++ b/bigdata-cache/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-cache - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Cache Blazegraph Cache utilities jar diff --git a/bigdata-client/pom.xml b/bigdata-client/pom.xml index 0df071c181..6b01d9b2e4 100644 --- a/bigdata-client/pom.xml +++ b/bigdata-client/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-client - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Client API Blazegraph Client API tools @@ -109,9 +109,9 @@ ga('send', 'pageview'); ${project.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} org.eclipse.jetty diff --git a/bigdata-common-util/pom.xml b/bigdata-common-util/pom.xml index 9c1bcfcb4c..0adf1cacaa 100644 --- a/bigdata-common-util/pom.xml +++ b/bigdata-common-util/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-common-util - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Common Utilities Blazegraph utilities common across artifacts @@ -129,9 +129,9 @@ ga('send', 'pageview'); ${colt.version} - org.openrdf.sesame - sesame-util - ${sesame.version} + org.eclipse.rdf4j + rdf4j-util + ${rdf4j.version} com.blazegraph diff --git a/bigdata-core-test/pom.xml b/bigdata-core-test/pom.xml index b1a0d17d13..e512550f98 100644 --- a/bigdata-core-test/pom.xml +++ b/bigdata-core-test/pom.xml @@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph bigdata-core-test - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT jar Blazegraph Core Tests Blazegraph Core Platform Test Suites @@ -383,34 +383,34 @@ See https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.h ${jettison.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-testsuite + ${rdf4j.version} - org.openrdf.sesame - sesame-sparql-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-sparql-testsuite + ${rdf4j.version} - org.openrdf.sesame - sesame-store-testsuite - ${sesame.version} + org.eclipse.rdf4j + rdf4j-store-testsuite + ${rdf4j.version} org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/blazegraph-artifacts/pom.xml b/blazegraph-artifacts/pom.xml index 980b9bc7ac..768b65eb35 100644 --- a/blazegraph-artifacts/pom.xml +++ b/blazegraph-artifacts/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph blazegraph-artifacts - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Deployment Artifacts Parent POM for Blazegraph Deployment (war, jar, deb, rpm, tgz) artifacts pom diff --git a/blazegraph-colt/pom.xml b/blazegraph-colt/pom.xml index 2cd0852ab2..0fa6d4fa4c 100644 --- a/blazegraph-colt/pom.xml +++ b/blazegraph-colt/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph blazegraph-colt - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Colt Blazegraph Modifications to the Colt libraries to remove hep.aida. Forked under LGPL 2.1 from the original license: Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. jar diff --git a/blazegraph-war/pom.xml b/blazegraph-war/pom.xml index 9edc315b97..02100867c7 100644 --- a/blazegraph-war/pom.xml +++ b/blazegraph-war/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-artifacts - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../blazegraph-artifacts/pom.xml com.blazegraph blazegraph-war - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph WAR Blazegraph Web Application Archive war @@ -345,19 +345,19 @@ ga('send', 'pageview'); ${jackson.version} - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} com.tinkerpop.blueprints @@ -397,7 +397,7 @@ ga('send', 'pageview'); ${jsonld.version} - org.openrdf.sesame + org.eclipse.rdf4j * @@ -409,7 +409,7 @@ ga('send', 'pageview'); org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/ctc-striterators/pom.xml b/ctc-striterators/pom.xml index 60b0ea08ad..389693971c 100644 --- a/ctc-striterators/pom.xml +++ b/ctc-striterators/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph ctc-striterators - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT CTC Striterators CTC Streaming Iterator utilities jar diff --git a/dsi-utils/pom.xml b/dsi-utils/pom.xml index dc6f7d7552..208c35ed89 100644 --- a/dsi-utils/pom.xml +++ b/dsi-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph dsi-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph DSI Utils Blazegraph Modifications to the DSI utils. This are forked from version 1.10.0 under LGPLv2.1. jar diff --git a/junit-ext/pom.xml b/junit-ext/pom.xml index cdfad9ce1d..e88c277657 100644 --- a/junit-ext/pom.xml +++ b/junit-ext/pom.xml @@ -22,12 +22,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph junit-ext - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Junit Extensions Blazegraph JUnit Extensions jar diff --git a/lgpl-utils/pom.xml b/lgpl-utils/pom.xml index 048f8263ef..d3596453ac 100644 --- a/lgpl-utils/pom.xml +++ b/lgpl-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph lgpl-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph LGPL Utils Blazegraph Modifications to the LGPL utils. This are forked from a version under LGPLv2.1. jar diff --git a/pom.xml b/pom.xml index 7d68cefd9e..bbe16a21bc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) 4.0.0 com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT pom Blazegraph Database Platform Blazegraph™ DB is our ultra high-performance graph database supporting Blueprints and RDF/SPARQL APIs. It supports up to 50 Billion edges on a single machine and has a High Availability and Scale-out architecture. It is in production use for customers such as EMC, Syapse, Wikidata Query Service, the British Museum, and many others. GPU acceleration and High Availability (HA) are available in the Enterprise edition. It contains war, jar, deb, rpm, and tar.gz deployment artifacts. diff --git a/rdf-properties/pom.xml b/rdf-properties/pom.xml index aaf3b19b49..935de057f3 100644 --- a/rdf-properties/pom.xml +++ b/rdf-properties/pom.xml @@ -30,12 +30,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph rdf-properties - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph RDF Properties RDF Property configurations @@ -78,19 +78,19 @@ ga('send', 'pageview'); ${apache.commons_io.version} - org.openrdf.sesame - sesame-util - ${sesame.version} + org.eclipse.rdf4j + rdf4j-util + ${rdf4j.version} - org.openrdf.sesame - sesame-rio-rdfxml - ${sesame.version} + org.eclipse.rdf4j + rdf4j-rio-rdfxml + ${rdf4j.version} - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${sesame.version} + org.eclipse.rdf4j + rdf4j-queryresultio-sparqljson + ${rdf4j.version} @@ -99,7 +99,7 @@ ga('send', 'pageview'); ${jsonld.version} - org.openrdf.sesame + org.eclipse.rdf4j * @@ -111,7 +111,7 @@ ga('send', 'pageview'); org.semarglproject - semargl-sesame + semargl-rdf4j ${semargl.version} diff --git a/sparql-grammar/pom.xml b/sparql-grammar/pom.xml index a1d121257e..c48a23e7ce 100644 --- a/sparql-grammar/pom.xml +++ b/sparql-grammar/pom.xml @@ -29,12 +29,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph sparql-grammar - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT jar Blazegraph Sparql Grammar Blazegraph(TM) SPARQL Grammar @@ -81,9 +81,9 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) - org.openrdf.sesame - sesame-runtime - ${sesame.version} + org.eclipse.rdf4j + rdf4j-runtime + ${rdf4j.version} diff --git a/system-utils/pom.xml b/system-utils/pom.xml index c40dc58871..0deaa70fe0 100644 --- a/system-utils/pom.xml +++ b/system-utils/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph system-utils - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph System Utilities System Utilities for Blazegraph DB diff --git a/vocabularies/pom.xml b/vocabularies/pom.xml index 087c44ad09..eab08e1107 100644 --- a/vocabularies/pom.xml +++ b/vocabularies/pom.xml @@ -28,12 +28,12 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands) com.blazegraph blazegraph-parent - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT ../pom.xml com.blazegraph vocabularies - 2.5.0 + 2.6.0-rdf4j-SNAPSHOT Blazegraph Vocabularies Blazegraph Custom Vocabularies and Inline URI Handlers for commonly used data sets. From 0206bc2f665a1a248a4c29e1414933dac9e45874 Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Fri, 28 Nov 2025 03:45:39 +0000 Subject: [PATCH 2/2] First tranch of RDF4J update modifications. --- bigdata-blueprints/pom.xml | 1 + .../com/bigdata/blueprints/BigdataEdge.java | 4 +- .../bigdata/blueprints/BigdataElement.java | 2 +- .../com/bigdata/blueprints/BigdataGraph.java | 196 +++++++++--------- .../blueprints/BigdataGraphBulkLoad.java | 10 +- .../blueprints/BigdataGraphEmbedded.java | 2 +- .../bigdata/blueprints/BigdataGraphQuery.java | 4 +- .../bigdata/blueprints/BigdataRDFFactory.java | 21 +- .../com/bigdata/blueprints/BigdataVertex.java | 2 +- .../blueprints/BlueprintsValueFactory.java | 62 +++--- .../DefaultBlueprintsValueFactory.java | 10 +- .../SimpleBlueprintsValueFactory.java | 4 +- .../TestBigdataGraphEmbeddedRepository.java | 4 +- .../blueprints/TestPathConstraints.java | 2 +- bigdata-client/pom.xml | 1 + .../remote/AbstractBigdataRemoteQuery.java | 8 +- .../remote/BigdataRemoteBooleanQuery.java | 4 +- .../sail/remote/BigdataRemoteGraphQuery.java | 10 +- .../sail/remote/BigdataRemoteTupleQuery.java | 10 +- .../rdf/sail/remote/BigdataSailFactory.java | 4 +- .../remote/BigdataSailRemoteRepository.java | 10 +- ...BigdataSailRemoteRepositoryConnection.java | 87 ++++---- .../sail/webapp/client/AST2SPARQLUtil.java | 12 +- .../webapp/client/AbstractConnectOptions.java | 6 +- .../webapp/client/AcceptHeaderFactory.java | 16 +- .../webapp/client/BackgroundGraphResult.java | 16 +- .../webapp/client/BackgroundTupleResult.java | 20 +- .../sail/webapp/client/ContextsResult.java | 6 +- .../sail/webapp/client/EncodeDecodeValue.java | 50 ++--- .../webapp/client/IPreparedGraphQuery.java | 6 +- .../webapp/client/IPreparedTupleQuery.java | 6 +- .../sail/webapp/client/IRemoteRepository.java | 8 +- .../sail/webapp/client/RemoteRepository.java | 16 +- .../webapp/client/RemoteRepositoryBase.java | 20 +- .../webapp/client/RemoteRepositoryDecls.java | 4 +- .../client/RemoteRepositoryManager.java | 38 ++-- ...ataSailRemoteRepositoryConnectionTest.java | 42 ++-- .../webapp/client/MockRemoteRepository.java | 11 +- .../webapp/client/TestEncodeDecodeValue.java | 16 +- .../main/java/com/bigdata/util/Depends.java | 16 +- .../src/test/com/bigdata/gom/Example1.java | 4 +- .../src/test/com/bigdata/gom/IGOMProxy.java | 8 +- .../com/bigdata/gom/LocalGOMTestCase.java | 8 +- .../test/com/bigdata/gom/ProxyGOMTest.java | 12 +- .../com/bigdata/gom/RemoteGOMTestCase.java | 8 +- .../src/test/com/bigdata/gom/TestGOM.java | 12 +- .../src/test/com/bigdata/gom/TestGPO.java | 12 +- .../com/bigdata/gom/TestNumericBNodes.java | 4 +- .../src/test/com/bigdata/gom/TestOWLSkin.java | 6 +- .../src/test/com/bigdata/gom/TestOwlGOM.java | 14 +- .../test/com/bigdata/gom/TestRemoteGOM.java | 12 +- .../engine/AbstractQueryEngineTestCase.java | 18 +- .../bop/join/AbstractHashJoinOpTestCase.java | 20 +- .../join/AbstractHashJoinUtilityTestCase.java | 12 +- .../AbstractAggregationTestCase.java | 2 +- .../AbstractDistinctSolutionsTestCase.java | 6 +- .../bop/solutions/TestGroupByRewriter.java | 4 +- .../bop/solutions/TestGroupByState.java | 4 +- .../bop/solutions/TestIVComparator.java | 12 +- bigdata-core-test/pom.xml | 1 + .../bigdata/gom/alchemy/owl/OWLClassSkin.java | 2 +- .../gom/alchemy/owl/OWLOntologySkin.java | 4 +- .../gom/alchemy/owl/OWLPropertySkin.java | 6 +- .../java/com/bigdata/gom/gpo/BasicSkin.java | 10 +- .../src/java/com/bigdata/gom/gpo/GPO.java | 22 +- .../src/java/com/bigdata/gom/gpo/IGPO.java | 10 +- .../java/com/bigdata/gom/gpo/ILinkSet.java | 4 +- .../src/java/com/bigdata/gom/gpo/LinkSet.java | 8 +- .../java/com/bigdata/gom/om/IDGenerator.java | 4 +- .../java/com/bigdata/gom/om/IIDGenerator.java | 2 +- .../com/bigdata/gom/om/IObjectManager.java | 12 +- .../gom/om/NanoSparqlObjectManager.java | 10 +- .../com/bigdata/gom/om/ObjectManager.java | 20 +- .../com/bigdata/gom/om/ObjectMgrModel.java | 22 +- .../java/com/bigdata/gom/web/GOMWebUtil.java | 2 +- .../bigdata/bop/rdf/aggregate/AVERAGE.java | 6 +- .../com/bigdata/bop/rdf/aggregate/SUM.java | 6 +- .../bop/rdf/update/ChunkedResolutionOp.java | 2 +- .../com/bigdata/bop/rdf/update/ParseOp.java | 24 +-- .../com/bigdata/rdf/axioms/BaseAxioms.java | 2 +- .../com/bigdata/rdf/axioms/OwlAxioms.java | 6 +- .../com/bigdata/rdf/axioms/RdfsAxioms.java | 4 +- .../InferenceChangeLogReporter.java | 2 +- .../error/SparqlDynamicErrorException.java | 4 +- .../rdf/graph/impl/bd/BigdataGASEngine.java | 8 +- .../rdf/graph/impl/bd/BigdataGASRunner.java | 2 +- .../rdf/graph/impl/bd/BigdataGASState.java | 10 +- .../graph/impl/bd/BigdataGraphFixture.java | 6 +- .../bigdata/rdf/graph/impl/bd/GASService.java | 10 +- .../rdf/graph/impl/bd/MergeSortIterator.java | 2 +- .../com/bigdata/rdf/graph/impl/bd/PATHS.java | 8 +- .../rdf/graph/impl/bd/TLScheduler.java | 2 +- .../rdf/graph/impl/bd/TLScheduler2.java | 2 +- .../bigdata/rdf/inf/AbstractSPOBuffer.java | 2 +- .../rdf/inf/RdfTypeRdfsResourceFilter.java | 4 +- .../java/com/bigdata/rdf/internal/DTE.java | 8 +- .../bigdata/rdf/internal/DTEExtension.java | 2 +- .../rdf/internal/IDatatypeURIResolver.java | 8 +- .../com/bigdata/rdf/internal/IExtension.java | 12 +- .../rdf/internal/IExtensionFactory.java | 6 +- .../rdf/internal/IInlineURIFactory.java | 2 +- .../rdf/internal/ILexiconConfiguration.java | 6 +- .../src/java/com/bigdata/rdf/internal/IV.java | 10 +- .../com/bigdata/rdf/internal/IVCache.java | 4 +- .../com/bigdata/rdf/internal/IVUtility.java | 16 +- .../rdf/internal/InlineURIFactory.java | 2 +- .../rdf/internal/InlineURIHandler.java | 4 +- .../rdf/internal/LexiconConfiguration.java | 24 +-- .../rdf/internal/NoInlineURIFactory.java | 2 +- .../rdf/internal/NoSuchVocabularyItem.java | 4 +- .../java/com/bigdata/rdf/internal/VTE.java | 30 +-- .../java/com/bigdata/rdf/internal/XSD.java | 6 +- .../rdf/internal/constraints/BNodeBOp.java | 4 +- .../rdf/internal/constraints/CompareBOp.java | 8 +- .../rdf/internal/constraints/ComputedIN.java | 4 +- .../rdf/internal/constraints/ConcatBOp.java | 6 +- .../rdf/internal/constraints/DatatypeBOp.java | 10 +- .../rdf/internal/constraints/DateBOp.java | 10 +- .../internal/constraints/DateTimeUtility.java | 8 +- .../rdf/internal/constraints/DigestBOp.java | 4 +- .../rdf/internal/constraints/EBVBOp.java | 6 +- .../internal/constraints/EncodeForURIBOp.java | 4 +- .../rdf/internal/constraints/FuncBOp.java | 8 +- .../internal/constraints/IMathOpHandler.java | 2 +- .../constraints/IVValueExpression.java | 4 +- .../rdf/internal/constraints/IriBOp.java | 12 +- .../rdf/internal/constraints/LangBOp.java | 2 +- .../internal/constraints/LangMatchesBOp.java | 4 +- .../rdf/internal/constraints/LcaseBOp.java | 4 +- .../rdf/internal/constraints/MathBOp.java | 4 +- .../rdf/internal/constraints/MathUtility.java | 8 +- .../rdf/internal/constraints/NumericBOp.java | 6 +- .../rdf/internal/constraints/RegexBOp.java | 6 +- .../rdf/internal/constraints/ReplaceBOp.java | 10 +- .../rdf/internal/constraints/SameTermBOp.java | 10 +- .../rdf/internal/constraints/StrAfterBOp.java | 6 +- .../rdf/internal/constraints/StrBOp.java | 6 +- .../internal/constraints/StrBeforeBOp.java | 6 +- .../rdf/internal/constraints/StrdtBOp.java | 12 +- .../rdf/internal/constraints/StrlangBOp.java | 6 +- .../rdf/internal/constraints/StrlenBOp.java | 4 +- .../rdf/internal/constraints/SubstrBOp.java | 6 +- .../rdf/internal/constraints/UUIDBOp.java | 4 +- .../rdf/internal/constraints/UcaseBOp.java | 4 +- .../rdf/internal/constraints/XsdLongBOp.java | 4 +- .../rdf/internal/constraints/XsdStrBOp.java | 6 +- .../constraints/XsdUnsignedLongBOp.java | 4 +- .../internal/encoder/IVBindingSetEncoder.java | 6 +- .../IVBindingSetEncoderWithIVCache.java | 4 +- .../encoder/IVSolutionSetEncoder.java | 2 +- .../bigdata/rdf/internal/impl/AbstractIV.java | 10 +- .../internal/impl/AbstractNonInlineIV.java | 10 +- .../com/bigdata/rdf/internal/impl/BlobIV.java | 10 +- .../com/bigdata/rdf/internal/impl/TermId.java | 10 +- .../internal/impl/bnode/AbstractBNodeIV.java | 8 +- .../impl/bnode/FullyInlineUnicodeBNodeIV.java | 6 +- .../internal/impl/bnode/NumericBNodeIV.java | 6 +- .../rdf/internal/impl/bnode/SidIV.java | 8 +- .../rdf/internal/impl/bnode/UUIDBNodeIV.java | 6 +- .../CompressedTimestampExtension.java | 14 +- .../impl/extensions/DateTimeExtension.java | 26 +-- .../extensions/DerivedNumericsExtension.java | 26 +-- .../GeoSpatialLiteralExtension.java | 14 +- .../impl/extensions/USDFloatExtension.java | 12 +- .../impl/extensions/XSDStringExtension.java | 14 +- .../impl/literal/AbstractLiteralIV.java | 10 +- .../literal/FullyInlineTypedLiteralIV.java | 8 +- .../rdf/internal/impl/literal/IPv4AddrIV.java | 2 +- .../internal/impl/literal/LiteralArrayIV.java | 2 +- .../impl/literal/LiteralExtensionIV.java | 14 +- .../internal/impl/literal/MockedValueIV.java | 2 +- .../rdf/internal/impl/literal/NumericIV.java | 8 +- .../internal/impl/literal/PackedLongIV.java | 6 +- .../literal/PartlyInlineTypedLiteralIV.java | 6 +- .../internal/impl/literal/UUIDLiteralIV.java | 8 +- .../internal/impl/literal/XSDBooleanIV.java | 6 +- .../internal/impl/literal/XSDDecimalIV.java | 4 +- .../internal/impl/literal/XSDIntegerIV.java | 6 +- .../internal/impl/literal/XSDNumericIV.java | 6 +- .../internal/impl/uri/FullyInlineURIIV.java | 10 +- .../internal/impl/uri/PartlyInlineURIIV.java | 6 +- .../rdf/internal/impl/uri/URIExtensionIV.java | 14 +- .../rdf/internal/impl/uri/VocabURIByteIV.java | 10 +- .../internal/impl/uri/VocabURIShortIV.java | 10 +- .../rdf/lexicon/BatchResolveBlobIVsTask.java | 2 +- .../rdf/lexicon/BatchResolveTermIVsTask.java | 2 +- .../BigdataSubjectCentricFullTextIndex.java | 2 +- .../BigdataValueCentricFullTextIndex.java | 6 +- .../bigdata/rdf/lexicon/BlobsIndexHelper.java | 4 +- .../rdf/lexicon/BlobsTupleSerializer.java | 4 +- .../bigdata/rdf/lexicon/BlobsWriteProc.java | 2 +- .../lexicon/ISubjectCentricTextIndexer.java | 4 +- .../com/bigdata/rdf/lexicon/ITextIndexer.java | 19 +- .../rdf/lexicon/IValueCentricTextIndexer.java | 4 +- .../rdf/lexicon/Id2TermTupleSerializer.java | 4 +- .../com/bigdata/rdf/lexicon/LexPredicate.java | 2 +- .../rdf/lexicon/LexiconKeyBuilder.java | 10 +- .../bigdata/rdf/lexicon/LexiconKeyOrder.java | 2 +- .../bigdata/rdf/lexicon/LexiconRelation.java | 18 +- .../rdf/lexicon/ReverseIndexWriterTask.java | 4 +- .../rdf/lexicon/Term2IdTupleSerializer.java | 4 +- .../rdf/load/AbstractRDFTaskFactory.java | 4 +- .../rdf/load/IStatementBufferFactory.java | 2 +- .../rdf/load/LoadStatementBufferFactory.java | 2 +- .../bigdata/rdf/load/RDFFilenameFilter.java | 2 +- .../bigdata/rdf/load/RDFLoadTaskFactory.java | 4 +- .../rdf/load/RDFVerifyTaskFactory.java | 4 +- .../rdf/load/SingleResourceReaderTask.java | 4 +- .../rdf/load/VerifyStatementBuffer.java | 6 +- .../rdf/model/BNodeContextFactory.java | 20 +- .../com/bigdata/rdf/model/BigdataBNode.java | 2 +- .../bigdata/rdf/model/BigdataBNodeImpl.java | 2 +- .../{BigdataURI.java => BigdataIRI.java} | 10 +- .../com/bigdata/rdf/model/BigdataLiteral.java | 4 +- .../bigdata/rdf/model/BigdataLiteralImpl.java | 89 ++++---- .../bigdata/rdf/model/BigdataQuadWrapper.java | 2 +- .../bigdata/rdf/model/BigdataResource.java | 2 +- .../bigdata/rdf/model/BigdataStatement.java | 4 +- .../rdf/model/BigdataStatementImpl.java | 10 +- .../com/bigdata/rdf/model/BigdataURIImpl.java | 6 +- .../com/bigdata/rdf/model/BigdataValue.java | 2 +- .../rdf/model/BigdataValueFactory.java | 36 ++-- .../rdf/model/BigdataValueFactoryImpl.java | 32 +-- .../rdf/model/BigdataValueSerializer.java | 12 +- .../rdf/rio/AbstractStatementBuffer.java | 24 +-- .../AsynchronousStatementBufferFactory.java | 18 +- .../com/bigdata/rdf/rio/BasicRioLoader.java | 14 +- ...ynchronousWriteStatementBufferFactory.java | 2 +- .../bigdata/rdf/rio/IRDFParserOptions.java | 6 +- .../java/com/bigdata/rdf/rio/IRioLoader.java | 4 +- .../com/bigdata/rdf/rio/IStatementBuffer.java | 8 +- .../com/bigdata/rdf/rio/PresortRioLoader.java | 14 +- .../com/bigdata/rdf/rio/RDFParserOptions.java | 8 +- .../com/bigdata/rdf/rio/StatementBuffer.java | 38 ++-- .../json/BigdataSPARQLResultsJSONParser.java | 22 +- ...BigdataSPARQLResultsJSONParserFactory.java | 8 +- ...taSPARQLResultsJSONParserForConstruct.java | 30 +-- ...LResultsJSONParserForConstructFactory.java | 8 +- .../json/BigdataSPARQLResultsJSONWriter.java | 8 +- ...BigdataSPARQLResultsJSONWriterFactory.java | 6 +- ...taSPARQLResultsJSONWriterForConstruct.java | 18 +- ...LResultsJSONWriterForConstructFactory.java | 8 +- .../rdf/rio/json/SPARQLJSONParserBase.java | 14 +- .../rdf/rio/json/SPARQLJSONWriterBase.java | 26 +-- .../rio/ntriples/BigdataNTriplesParser.java | 28 +-- .../BigdataNTriplesParserFactory.java | 6 +- .../rdf/rio/turtle/BigdataTurtleParser.java | 18 +- .../turtle/BigdataTurtleParserFactory.java | 8 +- .../rdf/rio/turtle/BigdataTurtleWriter.java | 6 +- .../turtle/BigdataTurtleWriterFactory.java | 6 +- .../rdf/rules/BackchainAccessPath.java | 6 +- .../com/bigdata/rdf/rules/DoNotAddFilter.java | 4 +- .../com/bigdata/rdf/rules/FastClosure.java | 2 +- .../java/com/bigdata/rdf/rules/MatchRule.java | 8 +- .../bigdata/rdf/rules/RuleFastClosure11.java | 4 +- .../bigdata/rdf/rules/RuleFastClosure13.java | 4 +- .../bigdata/rdf/rules/RuleFastClosure3.java | 2 +- .../bigdata/rdf/rules/RuleFastClosure5.java | 2 +- .../bigdata/rdf/rules/RuleFastClosure6.java | 2 +- .../bigdata/rdf/rules/RuleFastClosure7.java | 2 +- .../bigdata/rdf/rules/RuleFastClosure9.java | 4 +- .../rdf/rules/RuleOwlEquivalentClass.java | 2 +- .../rdf/rules/RuleOwlEquivalentProperty.java | 2 +- .../rdf/rules/RuleOwlFunctionalProperty.java | 13 +- .../bigdata/rdf/rules/RuleOwlHasValue.java | 6 +- .../RuleOwlInverseFunctionalProperty.java | 4 +- .../bigdata/rdf/rules/RuleOwlInverseOf1.java | 2 +- .../bigdata/rdf/rules/RuleOwlInverseOf2.java | 2 +- .../com/bigdata/rdf/rules/RuleOwlSameAs1.java | 2 +- .../bigdata/rdf/rules/RuleOwlSameAs1b.java | 2 +- .../com/bigdata/rdf/rules/RuleOwlSameAs2.java | 2 +- .../com/bigdata/rdf/rules/RuleOwlSameAs3.java | 2 +- .../rdf/rules/RuleOwlSymmetricProperty.java | 4 +- .../rdf/rules/RuleOwlTransitiveProperty1.java | 4 +- .../rdf/rules/RuleOwlTransitiveProperty2.java | 6 +- .../java/com/bigdata/rdf/rules/RuleRdf01.java | 2 +- .../com/bigdata/rdf/rules/RuleRdfs02.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs03.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs04a.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs04b.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs05.java | 2 +- .../com/bigdata/rdf/rules/RuleRdfs06.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs07.java | 2 +- .../com/bigdata/rdf/rules/RuleRdfs08.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs09.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs10.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs11.java | 2 +- .../com/bigdata/rdf/rules/RuleRdfs12.java | 4 +- .../com/bigdata/rdf/rules/RuleRdfs13.java | 4 +- .../bigdata/rdf/sparql/ast/ASTContainer.java | 4 +- .../bigdata/rdf/sparql/ast/DatasetNode.java | 2 +- .../com/bigdata/rdf/sparql/ast/DropGraph.java | 4 +- .../bigdata/rdf/sparql/ast/FunctionNode.java | 2 +- .../rdf/sparql/ast/FunctionRegistry.java | 10 +- .../com/bigdata/rdf/sparql/ast/LoadGraph.java | 8 +- .../rdf/sparql/ast/PropertyPathNode.java | 2 +- .../rdf/sparql/ast/StatementPatternNode.java | 2 +- .../rdf/sparql/ast/StaticAnalysis.java | 2 +- .../sparql/ast/SubqueryFunctionNodeBase.java | 4 +- .../com/bigdata/rdf/sparql/ast/Update.java | 4 +- .../ast/cache/DescribeBindingsCollector.java | 8 +- .../rdf/sparql/ast/cache/DescribeCache.java | 18 +- .../ast/cache/DescribeCacheUpdater.java | 14 +- .../rdf/sparql/ast/cache/IDescribeCache.java | 12 +- .../rdf/sparql/ast/eval/AST2BOpBase.java | 4 +- .../rdf/sparql/ast/eval/AST2BOpJoins.java | 2 +- .../rdf/sparql/ast/eval/AST2BOpUpdate.java | 130 ++++++------ .../sparql/ast/eval/AST2BOpUpdateContext.java | 14 +- .../rdf/sparql/ast/eval/AST2BOpUtility.java | 8 +- .../sparql/ast/eval/ASTConstructIterator.java | 18 +- .../ast/eval/ASTDeferredIVResolution.java | 55 ++--- .../rdf/sparql/ast/eval/ASTEvalHelper.java | 28 +-- .../ast/eval/ASTFulltextSearchOptimizer.java | 4 +- .../eval/ASTGeoSpatialSearchOptimizer.java | 12 +- .../ast/eval/ASTSearchInSearchOptimizer.java | 2 +- .../sparql/ast/eval/ASTSearchOptimizer.java | 12 +- .../ast/eval/ASTSearchOptimizerBase.java | 52 ++--- .../com/bigdata/rdf/sparql/ast/eval/CBD.java | 8 +- .../rdf/sparql/ast/eval/DataSetSummary.java | 12 +- .../ast/eval/GeoSpatialServiceFactory.java | 76 +++---- .../ast/eval/MutableTupleQueryResult.java | 10 +- .../sparql/ast/eval/SampleServiceFactory.java | 8 +- .../eval/SearchInSearchServiceFactory.java | 4 +- .../sparql/ast/eval/SearchServiceFactory.java | 4 +- .../rdf/sparql/ast/eval/ServiceParams.java | 6 +- .../sparql/ast/eval/SliceServiceFactory.java | 4 +- .../sparql/ast/eval/ValuesServiceFactory.java | 8 +- .../rdf/sparql/ast/hints/QueryHintScope.java | 6 +- .../optimizers/ASTALPServiceOptimizer.java | 2 +- .../ast/optimizers/ASTDescribeOptimizer.java | 8 +- .../ASTFastRangeCountOptimizer.java | 4 +- .../ASTFilterNormalizationOptimizer.java | 2 +- .../optimizers/ASTGraphGroupOptimizer.java | 10 +- .../ASTJoinOrderByTypeOptimizer.java | 4 +- .../optimizers/ASTPropertyPathOptimizer.java | 2 +- .../ast/optimizers/ASTQueryHintOptimizer.java | 16 +- .../ast/optimizers/ASTRangeOptimizer.java | 4 +- .../ASTSimpleOptionalOptimizer.java | 6 +- .../ASTStaticBindingsOptimizer.java | 2 +- .../ast/optimizers/DefaultOptimizerList.java | 14 +- .../ast/service/ExternalServiceCall.java | 6 +- .../service/IRemoteSparqlQueryBuilder.java | 4 +- .../sparql/ast/service/IServiceOptions.java | 6 +- .../service/OpenrdfNativeServiceOptions.java | 4 +- .../sparql/ast/service/RemoteServiceCall.java | 4 +- .../ast/service/RemoteServiceCallImpl.java | 8 +- .../service/RemoteSparql10QueryBuilder.java | 10 +- .../RemoteSparql11DraftQueryBuilder.java | 8 +- .../service/RemoteSparql11QueryBuilder.java | 8 +- .../service/RemoteSparqlBuilderFactory.java | 10 +- .../rdf/sparql/ast/service/ServiceCall.java | 4 +- .../ast/service/ServiceCallCreateParams.java | 4 +- .../ast/service/ServiceCallUtility.java | 20 +- .../rdf/sparql/ast/service/ServiceNode.java | 2 +- .../sparql/ast/service/ServiceRegistry.java | 4 +- .../storedquery/SimpleStoredQueryService.java | 4 +- .../storedquery/StoredQueryService.java | 6 +- .../src/java/com/bigdata/rdf/spo/ISPO.java | 2 +- .../rdf/spo/InGraphBinarySearchFilter.java | 6 +- .../src/java/com/bigdata/rdf/spo/SPO.java | 12 +- .../rdf/store/AbstractTripleStore.java | 28 +-- .../src/java/com/bigdata/rdf/store/BD.java | 10 +- .../src/java/com/bigdata/rdf/store/BDS.java | 35 ++-- .../store/BigdataBindingSetResolverator.java | 2 +- ...BigdataOpenRDFBindingSetsResolverator.java | 6 +- .../store/BigdataSolutionResolverator.java | 2 +- .../store/BigdataStatementIteratorImpl.java | 10 +- .../rdf/store/BigdataTriplePattern.java | 6 +- .../rdf/store/BigdataValueIteratorImpl.java | 2 +- .../com/bigdata/rdf/store/DataLoader.java | 4 +- .../bigdata/rdf/store/IRawTripleStore.java | 2 +- .../com/bigdata/rdf/store/ITripleStore.java | 8 +- .../bigdata/rdf/store/TripleStoreUtility.java | 2 +- .../com/bigdata/rdf/task/AbstractApiTask.java | 4 +- .../com/bigdata/rdf/util/VocabBuilder.java | 24 +-- .../com/bigdata/rdf/vocab/BaseVocabulary.java | 14 +- .../bigdata/rdf/vocab/BaseVocabularyDecl.java | 27 +-- .../com/bigdata/rdf/vocab/RDFSVocabulary.java | 10 +- .../com/bigdata/rdf/vocab/Vocabulary.java | 2 +- .../com/bigdata/rdf/vocab/VocabularyDecl.java | 6 +- .../core/BigdataCoreVocabulary_v20151210.java | 2 +- .../rdf/vocab/decls/BSBMVocabularyDecl.java | 50 +++-- .../rdf/vocab/decls/DCAllVocabularyDecl.java | 4 +- .../vocab/decls/DCElementsVocabularyDecl.java | 6 +- .../vocab/decls/DCTermsVocabularyDecl.java | 42 ++-- .../rdf/vocab/decls/FOAFVocabularyDecl.java | 6 +- .../vocab/decls/GeoSpatialVocabularyDecl.java | 6 +- .../rdf/vocab/decls/LUBMVocabularyDecl.java | 6 +- .../rdf/vocab/decls/OPVocabularyDecl.java | 4 +- .../rdf/vocab/decls/OWLVocabularyDecl.java | 8 +- .../rdf/vocab/decls/RDFSVocabularyDecl.java | 22 +- .../rdf/vocab/decls/RDFVocabularyDecl.java | 22 +- .../rdf/vocab/decls/SKOSVocabularyDecl.java | 85 ++++---- .../rdf/vocab/decls/SesameVocabularyDecl.java | 22 +- .../rdf/vocab/decls/VoidVocabularyDecl.java | 85 ++++---- .../vocab/decls/XMLSchemaVocabularyDecl.java | 107 +++++----- .../src/java/com/bigdata/service/fts/FTS.java | 4 +- .../fts/FulltextSearchServiceFactory.java | 4 +- .../service/geospatial/GeoSpatial.java | 61 +++--- .../service/geospatial/GeoSpatialConfig.java | 22 +- .../GeoSpatialDatatypeConfiguration.java | 31 +-- .../service/geospatial/IGeoSpatialQuery.java | 8 +- .../geospatial/impl/GeoSpatialQuery.java | 10 +- .../Bigdata2Sesame2BindingSetIterator.java | 12 +- .../rdf/sail/Bigdata2SesameIteration.java | 2 +- .../rdf/sail/BigdataParsedBooleanQuery.java | 6 +- .../rdf/sail/BigdataParsedGraphQuery.java | 6 +- .../rdf/sail/BigdataParsedTupleQuery.java | 6 +- .../com/bigdata/rdf/sail/BigdataSail.java | 54 ++--- .../rdf/sail/BigdataSailBooleanQuery.java | 8 +- .../rdf/sail/BigdataSailGraphQuery.java | 8 +- .../bigdata/rdf/sail/BigdataSailHelper.java | 2 +- .../rdf/sail/BigdataSailRepository.java | 6 +- .../sail/BigdataSailRepositoryConnection.java | 22 +- .../rdf/sail/BigdataSailTupleQuery.java | 10 +- .../bigdata/rdf/sail/BigdataSailUpdate.java | 10 +- .../rdf/sail/BigdataValueReplacer.java | 16 +- .../java/com/bigdata/rdf/sail/ExportKB.java | 16 +- .../rdf/sail/QueryEvaluationIterator.java | 6 +- .../java/com/bigdata/rdf/sail/RDRHistory.java | 4 +- .../java/com/bigdata/rdf/sail/SailBase.java | 8 +- .../rdf/sail/Sesame2BigdataIterator.java | 4 +- .../rdf/sail/bench/NanoSparqlClient.java | 20 +- .../com/bigdata/rdf/sail/bench/RunQuery.java | 8 +- .../rdf/sail/config/BigdataConfigSchema.java | 6 +- .../sail/config/BigdataRepositoryConfig.java | 14 +- .../sail/config/BigdataRepositoryFactory.java | 8 +- .../rdf/sail/config/BigdataSailConfig.java | 14 +- .../rdf/sail/config/BigdataSailFactory.java | 8 +- .../ASTDeferredIVResolutionInitializer.java | 14 +- .../rdf/sail/sparql/BaseDeclProcessor.java | 4 +- .../sail/sparql/Bigdata2ASTSPARQLParser.java | 20 +- .../rdf/sail/sparql/BigdataASTContext.java | 6 +- .../sail/sparql/BigdataASTVisitorBase.java | 4 +- .../rdf/sail/sparql/BigdataExprBuilder.java | 2 +- .../rdf/sail/sparql/BigdataParsedQuery.java | 10 +- .../rdf/sail/sparql/BigdataParsedUpdate.java | 10 +- .../sail/sparql/BlankNodeVarProcessor.java | 2 +- .../rdf/sail/sparql/GroupGraphPattern.java | 4 +- .../sail/sparql/GroupGraphPatternBuilder.java | 2 +- .../rdf/sail/sparql/NegatedPropertySet.java | 6 +- .../rdf/sail/sparql/PrefixDeclProcessor.java | 26 +-- .../rdf/sail/sparql/PropertySetElem.java | 2 +- .../SPARQLStarUpdateDataBlockParser.java | 18 +- .../bigdata/rdf/sail/sparql/SPARQLUtil.java | 2 +- .../sail/sparql/StringEscapesProcessor.java | 2 +- .../sail/sparql/TriplePatternExprBuilder.java | 10 +- .../rdf/sail/sparql/UpdateExprBuilder.java | 22 +- .../rdf/sail/sparql/ValueExprBuilder.java | 8 +- .../rdf/sail/webapp/BigdataRDFContext.java | 42 ++-- .../rdf/sail/webapp/BigdataRDFServlet.java | 33 +-- .../rdf/sail/webapp/BigdataServlet.java | 2 +- .../bigdata/rdf/sail/webapp/ConnegUtil.java | 10 +- .../rdf/sail/webapp/DataLoaderServlet.java | 2 +- .../sail/webapp/DatasetNotFoundException.java | 2 +- .../rdf/sail/webapp/DeleteServlet.java | 26 +-- .../rdf/sail/webapp/DescribeCacheServlet.java | 34 +-- .../rdf/sail/webapp/InsertServlet.java | 20 +- .../rdf/sail/webapp/MultiTenancyServlet.java | 27 +-- .../bigdata/rdf/sail/webapp/QueryServlet.java | 63 +++--- .../bigdata/rdf/sail/webapp/RESTServlet.java | 4 +- .../sail/webapp/RestApiGetContextsTask.java | 4 +- .../java/com/bigdata/rdf/sail/webapp/SD.java | 195 ++++++++--------- .../rdf/sail/webapp/UpdateServlet.java | 64 +++--- .../com/bigdata/rdf/sail/webapp/VoID.java | 61 +++--- .../rdf/sail/webapp/WorkbenchServlet.java | 35 ++-- .../bigdata/bop/aggregate/AggregateBase.java | 4 +- .../bop/controller/ServiceCallJoin.java | 22 +- .../bop/engine/StaticAnalysisStats.java | 4 +- .../bigdata/bop/solutions/IVComparator.java | 20 +- .../counters/format/CounterSetFormat.java | 5 +- .../com/bigdata/search/FullTextIndex.java | 13 +- .../com/bigdata/search/IAnalyzerFactory.java | 5 +- bigdata-core/pom.xml | 1 + bigdata-gas/pom.xml | 1 + .../com/bigdata/rdf/graph/BinderBase.java | 4 +- .../java/com/bigdata/rdf/graph/IBinder.java | 4 +- .../com/bigdata/rdf/graph/IGASContext.java | 4 +- .../com/bigdata/rdf/graph/IGASOptions.java | 4 +- .../com/bigdata/rdf/graph/IGASProgram.java | 4 +- .../com/bigdata/rdf/graph/IGASScheduler.java | 2 +- .../java/com/bigdata/rdf/graph/IGASState.java | 8 +- .../com/bigdata/rdf/graph/IGraphAccessor.java | 4 +- .../com/bigdata/rdf/graph/IPredecessor.java | 2 +- .../java/com/bigdata/rdf/graph/IReducer.java | 2 +- .../bigdata/rdf/graph/IStaticFrontier.java | 2 +- .../com/bigdata/rdf/graph/analytics/BFS.java | 6 +- .../com/bigdata/rdf/graph/analytics/CC.java | 6 +- .../rdf/graph/analytics/FuzzySSSP.java | 2 +- .../com/bigdata/rdf/graph/analytics/PR.java | 6 +- .../com/bigdata/rdf/graph/analytics/SSSP.java | 8 +- .../rdf/graph/impl/BaseGASProgram.java | 8 +- .../rdf/graph/impl/EdgeOnlyFilter.java | 2 +- .../bigdata/rdf/graph/impl/GASContext.java | 6 +- .../com/bigdata/rdf/graph/impl/GASEngine.java | 2 +- .../com/bigdata/rdf/graph/impl/GASState.java | 12 +- .../rdf/graph/impl/VertexTaskFactory.java | 2 +- .../graph/impl/frontier/StaticFrontier2.java | 2 +- .../rdf/graph/impl/ram/RAMGASEngine.java | 14 +- .../rdf/graph/impl/ram/RAMGraphFixture.java | 8 +- .../rdf/graph/impl/ram/RAMGraphLoader.java | 8 +- .../rdf/graph/impl/sail/SAILGASEngine.java | 16 +- .../rdf/graph/impl/sail/SAILGASRunner.java | 10 +- .../rdf/graph/impl/sail/SailGraphFixture.java | 8 +- .../impl/sail/Sesame2BigdataIterator.java | 2 +- .../graph/impl/scheduler/CHMScheduler.java | 2 +- .../rdf/graph/impl/scheduler/STScheduler.java | 2 +- .../rdf/graph/impl/util/GASImplUtil.java | 2 +- .../rdf/graph/impl/util/GASRunnerBase.java | 2 +- .../graph/impl/util/VertexDistribution.java | 2 +- .../rdf/graph/util/AbstractGraphFixture.java | 2 +- .../com/bigdata/rdf/graph/util/GASUtil.java | 4 +- .../bigdata/rdf/graph/util/GraphLoader.java | 45 ++-- .../bigdata/rdf/graph/util/IGraphFixture.java | 4 +- .../rdf/graph/util/SailGraphLoader.java | 12 +- .../bigdata/rdf/graph/analytics/TestBFS.java | 2 +- .../bigdata/rdf/graph/analytics/TestCC.java | 4 +- .../bigdata/rdf/graph/analytics/TestSSSP.java | 2 +- .../impl/ram/AbstractRAMGraphTestCase.java | 8 +- .../rdf/graph/impl/ram/TestGather.java | 6 +- .../impl/sail/AbstractSailGraphTestCase.java | 8 +- .../rdf/graph/impl/sail/TestGather.java | 8 +- .../com/bigdata/gom/samples/Example1.java | 4 +- .../com/bigdata/gom/samples/Example2.java | 12 +- bigdata-jar/pom.xml | 2 +- .../bigdata/perf/chem2bio2rdf/TestQuery.java | 4 +- .../bigdata/perf/chem2bio2rdf/TestQuery2.java | 8 +- bigdata-rdf-test/pom.xml | 1 + .../com/bigdata/bop/rdf/TestBOpUtility.java | 28 +-- .../bop/rdf/aggregate/TestGROUP_CONCAT.java | 2 +- .../rdf/filter/TestNativeDistinctFilter.java | 20 +- .../bop/rdf/joinGraph/GenerateBarData.java | 18 +- .../com/bigdata/rdf/axioms/TestAxioms.java | 26 +-- .../impl/bd/AbstractBigdataGraphTestCase.java | 36 ++-- .../bigdata/rdf/graph/impl/bd/TestBFS.java | 2 +- .../rdf/graph/impl/bd/TestFuzzySSSP.java | 2 +- .../bigdata/rdf/graph/impl/bd/TestGather.java | 4 +- .../bigdata/rdf/graph/impl/bd/TestSSSP.java | 2 +- .../AbstractEncodeDecodeMixedIVsTest.java | 173 ++++++++-------- .../rdf/internal/ColorsEnumExtension.java | 18 +- .../bigdata/rdf/internal/EpochExtension.java | 20 +- .../rdf/internal/HashCollisionUtility.java | 24 +-- .../bigdata/rdf/internal/ParserSpeedTest.java | 20 +- .../com/bigdata/rdf/internal/TestBlobIV.java | 6 +- .../TestEncodeDecodeGeoSpatialLiteralIVs.java | 12 +- .../rdf/internal/TestEncodeDecodeKeys.java | 58 +++--- .../TestEncodeDecodePackedLongIVs.java | 8 +- .../internal/TestEncodeDecodeUnicodeIVs.java | 94 ++++----- .../internal/TestEncodeDecodeXSDDateIVs.java | 10 +- .../TestFullyInlineTypedLiteralIV.java | 4 +- .../rdf/internal/TestFullyInlineURIIV.java | 22 +- ...MultiInlineURIHandlersSingleNamespace.java | 8 +- .../rdf/internal/TestPackedLongIVs.java | 10 +- .../com/bigdata/rdf/internal/TestTermIV.java | 6 +- .../rdf/internal/TestURIExtensionIV.java | 14 +- .../rdf/internal/TestVocabURIByteIV.java | 10 +- .../AbstractBindingSetEncoderTestCase.java | 28 +-- .../bigdata/rdf/lexicon/TestAccessPaths.java | 4 +- .../com/bigdata/rdf/lexicon/TestAddTerms.java | 10 +- .../bigdata/rdf/lexicon/TestBlobsIndex.java | 10 +- .../rdf/lexicon/TestBlobsWriteTask.java | 12 +- .../rdf/lexicon/TestCompletionScan.java | 6 +- .../rdf/lexicon/TestFullTextIndex.java | 16 +- .../com/bigdata/rdf/lexicon/TestIVCache.java | 4 +- .../lexicon/TestId2TermTupleSerializer.java | 16 +- .../com/bigdata/rdf/lexicon/TestInlining.java | 8 +- .../rdf/lexicon/TestLexAccessPatternEnum.java | 8 +- .../rdf/lexicon/TestLexiconKeyBuilder.java | 18 +- .../TestSubjectCentricFullTextIndex.java | 22 +- .../rdf/lexicon/TestTermIVComparator.java | 14 +- .../bigdata/rdf/lexicon/TestVocabulary.java | 16 +- .../model/TestBigdataValueSerialization.java | 18 +- .../com/bigdata/rdf/model/TestEquals.java | 24 +-- .../com/bigdata/rdf/model/TestFactory.java | 14 +- .../bigdata/rdf/rio/AbstractRIOTestCase.java | 4 +- .../com/bigdata/rdf/rio/EDSAsyncLoader.java | 4 +- ...estAsynchronousStatementBufferFactory.java | 4 +- .../bigdata/rdf/rio/TestLoadAndVerify.java | 2 +- .../bigdata/rdf/rio/TestNTriplesWithSids.java | 24 +-- .../rdf/rio/TestStandaloneRDRParsers.java | 12 +- .../bigdata/rdf/rio/TestStatementBuffer.java | 48 ++--- .../ntriples/BigdataNTriplesParserTest.java | 2 +- .../BigdataNTriplesParserTestCase.java | 10 +- ...tBackchainOwlSameAsPropertiesIterator.java | 10 +- .../TestBackchainTypeResourceIterator.java | 36 ++-- .../rules/TestCompareFullAndFastClosure.java | 2 +- .../rdf/rules/TestContextAdvancer.java | 20 +- .../rdf/rules/TestDatabaseAtOnceClosure.java | 30 +-- .../rdf/rules/TestDistinctTermScan.java | 4 +- .../bigdata/rdf/rules/TestJustifications.java | 4 +- .../java/com/bigdata/rdf/rules/TestMatch.java | 14 +- .../bigdata/rdf/rules/TestModelsEqual.java | 30 +-- .../com/bigdata/rdf/rules/TestOptionals.java | 14 +- ...tOwlSameAsPropertiesExpandingIterator.java | 10 +- .../bigdata/rdf/rules/TestRuleExpansion.java | 8 +- .../rdf/rules/TestRuleFastClosure_11_13.java | 4 +- .../rules/TestRuleFastClosure_3_5_6_7_9.java | 6 +- .../rdf/rules/TestRuleOwlEquivalentClass.java | 6 +- .../rules/TestRuleOwlEquivalentProperty.java | 6 +- .../rules/TestRuleOwlFunctionalProperty.java | 10 +- .../rdf/rules/TestRuleOwlHasValue.java | 10 +- .../rdf/rules/TestRuleOwlInverseOf.java | 6 +- .../bigdata/rdf/rules/TestRuleOwlSameAs.java | 6 +- .../rules/TestRuleOwlSymmetricProperty.java | 10 +- .../rules/TestRuleOwlTransitiveProperty.java | 8 +- .../com/bigdata/rdf/rules/TestRuleRdf01.java | 4 +- .../com/bigdata/rdf/rules/TestRuleRdfs03.java | 12 +- .../com/bigdata/rdf/rules/TestRuleRdfs04.java | 12 +- .../com/bigdata/rdf/rules/TestRuleRdfs07.java | 4 +- .../com/bigdata/rdf/rules/TestRuleRdfs10.java | 8 +- .../com/bigdata/rdf/rules/TestRuleRdfs11.java | 4 +- .../java/com/bigdata/rdf/rules/TestSlice.java | 24 +-- .../rdf/rules/TestTruthMaintenance.java | 46 ++-- .../AbstractBigdataExprBuilderTestCase.java | 2 +- .../ast/AbstractASTEvaluationTestCase.java | 2 +- .../bigdata/rdf/sparql/ast/BSBMQ5Setup.java | 16 +- .../com/bigdata/rdf/sparql/ast/TestAST.java | 2 +- .../rdf/sparql/ast/TestStaticAnalysis.java | 10 +- .../eval/AbstractDataAndSPARQLTestCase.java | 24 +-- .../AbstractDataDrivenSPARQLTestCase.java | 36 ++-- .../eval/AbstractInlineSELECTTestCase.java | 54 ++--- .../sparql/ast/eval/TestCustomFunction.java | 10 +- .../rdf/sparql/ast/eval/TestDescribe.java | 36 ++-- .../rdf/sparql/ast/eval/TestHashJoin.java | 6 +- .../rdf/sparql/ast/eval/TestInclude.java | 16 +- .../rdf/sparql/ast/eval/TestNamedGraphs.java | 4 +- .../rdf/sparql/ast/eval/TestNegation.java | 16 +- .../rdf/sparql/ast/eval/TestQueryHints.java | 12 +- .../rdf/sparql/ast/eval/TestSubQuery.java | 4 +- .../bigdata/rdf/sparql/ast/eval/TestTCK.java | 2 +- .../reif/TestReificationDoneRightEval.java | 34 +-- .../service/GeoSpatialTestVocabulary.java | 2 +- .../GeoSpatialTestWKTLiteralSerializer.java | 2 +- .../OpenrdfNativeMockServiceFactory.java | 6 +- .../TestBigdataNativeServiceEvaluation.java | 6 +- ...GeoSpatialServiceConfigurationParsing.java | 12 +- .../TestOpenrdfNativeServiceEvaluation.java | 10 +- .../TestRemoteSparql10QueryBuilder.java | 52 ++--- .../TestRemoteSparql11QueryBuilder.java | 52 ++--- .../TestRemoteSparqlBuilderFactory.java | 56 ++--- .../ast/eval/service/TestServiceRegistry.java | 12 +- .../ast/eval/update/TestUpdateBootstrap.java | 36 ++-- .../optimizers/AbstractOptimizerTestCase.java | 6 +- ...ctOptimizerTestCaseWithUtilityMethods.java | 20 +- .../TestASTAttachJoinFiltersOptimizer.java | 6 +- .../TestASTBatchResolveTermsOptimizer.java | 16 +- .../optimizers/TestASTBottomUpOptimizer.java | 82 ++++---- .../TestASTComplexOptionalOptimizer.java | 8 +- .../optimizers/TestASTConstructOptimizer.java | 80 +++---- .../optimizers/TestASTDescribeOptimizer.java | 74 +++---- .../TestASTEmptyGroupOptimizer.java | 14 +- .../TestASTFilterNormalizationOptimizer.java | 8 +- .../TestASTFlattenUnionsOptimizer.java | 6 +- .../TestASTFulltextSearchOptimizer.java | 4 +- .../TestASTGraphGroupOptimizer.java | 20 +- .../optimizers/TestASTHashJoinOptimizer.java | 16 +- .../TestASTNamedSubqueryOptimizer.java | 10 +- ...STOrderByAggregateFlatteningOptimizer.java | 2 +- .../optimizers/TestASTQueryHintOptimizer.java | 12 +- .../ast/optimizers/TestASTRangeOptimizer.java | 4 +- .../TestASTRunFirstRunLastOptimizer.java | 6 +- .../optimizers/TestASTSearchOptimizer.java | 4 +- .../TestASTServiceNodeOptimizer.java | 4 +- .../TestASTSetValueExpressionOptimizer.java | 4 +- .../TestASTSimpleOptionalOptimizer.java | 16 +- .../TestASTSparql11SubqueryOptimizer.java | 8 +- .../TestASTStaticBindingsOptimizer.java | 42 ++-- .../TestASTStaticJoinOptimizer.java | 8 +- .../TestASTSubGroupJoinVarOptimizer.java | 12 +- .../TestASTUnionFiltersOptimizer.java | 6 +- .../TestASTWildcardProjectionOptimizer.java | 6 +- .../TestIVariableBindingRequirements.java | 38 ++-- .../storedquery/TestStoredQueryService.java | 8 +- .../java/com/bigdata/rdf/spo/TestSPO.java | 20 +- .../bigdata/rdf/spo/TestSPOAccessPath.java | 30 +-- .../com/bigdata/rdf/spo/TestSPOStarJoin.java | 8 +- .../bigdata/rdf/store/AbstractTestCase.java | 12 +- .../bigdata/rdf/store/StressTestCentos.java | 10 +- .../com/bigdata/rdf/store/TestBulkFilter.java | 4 +- .../com/bigdata/rdf/store/TestDataLoader.java | 4 +- .../com/bigdata/rdf/store/TestInlineURIs.java | 52 ++--- .../com/bigdata/rdf/store/TestInsertRate.java | 8 +- .../com/bigdata/rdf/store/TestIsModified.java | 24 +-- ...tLocalTripleStoreTransactionSemantics.java | 10 +- .../bigdata/rdf/store/TestRestartSafe.java | 24 +-- .../rdf/store/TestSharedLexiconTempStore.java | 8 +- .../rdf/store/TestStatementIdentifiers.java | 72 +++---- .../bigdata/rdf/store/TestTripleStore.java | 90 ++++---- .../rdf/vocab/TestMultiVocabulary.java | 4 +- .../com/bigdata/rdf/vocab/TestVocabulary.java | 10 +- .../vocab/TestVocabularyDecl_BLZG1591.java | 4 +- bigdata-sails-test/pom.xml | 1 + .../com/bigdata/rdf/sail/DavidsTestBOps.java | 28 +-- .../rdf/sail/ProxyBigdataSailTestCase.java | 14 +- .../sail/StressTest_ClosedByInterrupt_RW.java | 26 +-- .../java/com/bigdata/rdf/sail/TestBOps.java | 28 +-- .../rdf/sail/TestBigdataValueReplacer.java | 24 +-- .../rdf/sail/TestBootstrapBigdataSail.java | 16 +- .../com/bigdata/rdf/sail/TestChangeSets.java | 6 +- .../com/bigdata/rdf/sail/TestCnxnCreate.java | 4 +- .../rdf/sail/TestConcurrentKBCreate.java | 4 +- .../bigdata/rdf/sail/TestHistoryIndex.java | 34 +-- .../bigdata/rdf/sail/TestInlineValues.java | 20 +- .../com/bigdata/rdf/sail/TestJoinScope.java | 22 +- .../com/bigdata/rdf/sail/TestLexJoinOps.java | 22 +- .../rdf/sail/TestMROWTransactions.java | 14 +- .../bigdata/rdf/sail/TestMaterialization.java | 18 +- ...illisecondPrecisionForInlineDateTimes.java | 26 +-- .../com/bigdata/rdf/sail/TestMultiGraphs.java | 30 +-- .../bigdata/rdf/sail/TestNoExceptions.java | 24 +-- .../com/bigdata/rdf/sail/TestOptionals.java | 20 +- .../com/bigdata/rdf/sail/TestOrderBy.java | 12 +- .../bigdata/rdf/sail/TestProvenanceQuery.java | 32 +-- .../rdf/sail/TestPruneBindingSets.java | 18 +- .../com/bigdata/rdf/sail/TestQuadsAPI.java | 24 +-- .../com/bigdata/rdf/sail/TestRDRHistory.java | 14 +- .../rdf/sail/TestReadWriteTransactions.java | 24 +-- .../com/bigdata/rdf/sail/TestRollbacks.java | 22 +- .../com/bigdata/rdf/sail/TestSearchQuery.java | 38 ++-- .../bigdata/rdf/sail/TestSesameFilters.java | 22 +- .../rdf/sail/TestSesameMultiGraphs.java | 24 +-- .../com/bigdata/rdf/sail/TestSetBinding.java | 22 +- .../java/com/bigdata/rdf/sail/TestSids.java | 18 +- .../bigdata/rdf/sail/TestSingleTailRule.java | 44 ++-- .../com/bigdata/rdf/sail/TestSparqlStar.java | 56 ++--- .../rdf/sail/TestSparqlUpdateCommit.java | 2 +- .../java/com/bigdata/rdf/sail/TestStrBOp.java | 18 +- .../com/bigdata/rdf/sail/TestTemplate.java | 26 +-- .../com/bigdata/rdf/sail/TestTicket1086.java | 12 +- .../com/bigdata/rdf/sail/TestTicket1388.java | 24 +-- .../com/bigdata/rdf/sail/TestTicket1518.java | 12 +- .../com/bigdata/rdf/sail/TestTicket1681.java | 22 +- .../com/bigdata/rdf/sail/TestTicket1682.java | 22 +- .../com/bigdata/rdf/sail/TestTicket1716.java | 10 +- .../com/bigdata/rdf/sail/TestTicket1747.java | 10 +- .../com/bigdata/rdf/sail/TestTicket1753.java | 12 +- .../com/bigdata/rdf/sail/TestTicket1755.java | 24 +-- .../com/bigdata/rdf/sail/TestTicket1785.java | 26 +-- .../com/bigdata/rdf/sail/TestTicket1788.java | 26 +-- .../com/bigdata/rdf/sail/TestTicket1875.java | 10 +- .../com/bigdata/rdf/sail/TestTicket1889.java | 16 +- .../bigdata/rdf/sail/TestTicket1889_2.java | 16 +- .../com/bigdata/rdf/sail/TestTicket1893.java | 10 +- .../com/bigdata/rdf/sail/TestTicket2043.java | 18 +- .../com/bigdata/rdf/sail/TestTicket2043b.java | 18 +- .../com/bigdata/rdf/sail/TestTicket2083.java | 18 +- .../com/bigdata/rdf/sail/TestTicket275.java | 22 +- .../com/bigdata/rdf/sail/TestTicket276.java | 36 ++-- .../com/bigdata/rdf/sail/TestTicket348.java | 36 ++-- .../com/bigdata/rdf/sail/TestTicket353.java | 24 +-- .../com/bigdata/rdf/sail/TestTicket355.java | 24 +-- .../com/bigdata/rdf/sail/TestTicket422.java | 14 +- .../com/bigdata/rdf/sail/TestTicket4249.java | 26 +-- .../com/bigdata/rdf/sail/TestTicket473.java | 22 +- .../com/bigdata/rdf/sail/TestTicket581.java | 10 +- .../com/bigdata/rdf/sail/TestTicket610.java | 18 +- .../com/bigdata/rdf/sail/TestTicket632.java | 28 +-- .../com/bigdata/rdf/sail/TestTicket647.java | 36 ++-- .../com/bigdata/rdf/sail/TestTicket669.java | 30 +-- .../com/bigdata/rdf/sail/TestTicket693.java | 16 +- .../com/bigdata/rdf/sail/TestTicket967.java | 36 ++-- .../com/bigdata/rdf/sail/TestTxCreate.java | 4 +- .../java/com/bigdata/rdf/sail/TestUnions.java | 26 +-- .../bigdata/rdf/sail/contrib/TestOOMBug.java | 16 +- .../com/bigdata/rdf/sail/graph/TestPaths.java | 12 +- .../sparql/Bigdata2ASTSPARQL11SyntaxTest.java | 14 +- .../sparql/Bigdata2ASTSPARQLSyntaxTest.java | 6 +- .../sparql/BigdataSPARQL2ASTParserTest.java | 6 +- .../sail/sparql/TestBigdataExprBuilder.java | 26 +-- .../rdf/sail/sparql/TestBindingsClause.java | 4 +- .../sparql/TestGroupGraphPatternBuilder.java | 8 +- .../TestReificationDoneRightParser.java | 18 +- .../rdf/sail/sparql/TestSubqueryPatterns.java | 14 +- .../sail/sparql/TestTriplePatternBuilder.java | 12 +- .../sail/sparql/TestUpdateExprBuilder.java | 88 ++++---- .../sail/sparql/TestUpdateExprBuilder2.java | 18 +- .../rdf/sail/sparql/TestValueExprBuilder.java | 6 +- .../rdf/sail/sparql/TestVirtualGraphs.java | 36 ++-- .../tck/BigdataArbitraryLengthPathTest.java | 14 +- .../tck/BigdataComplexSparqlQueryTest.java | 24 +-- .../rdf/sail/tck/BigdataConnectionTest.java | 14 +- .../BigdataEmbeddedFederationSparqlTest.java | 12 +- .../sail/tck/BigdataFederationSparqlTest.java | 12 +- .../BigdataSPARQLUpdateConformanceTest.java | 32 +-- .../rdf/sail/tck/BigdataSPARQLUpdateTest.java | 30 +-- .../sail/tck/BigdataSPARQLUpdateTest2.java | 24 +-- .../sail/tck/BigdataSparqlFullRWTxTest.java | 2 +- .../rdf/sail/tck/BigdataSparqlTest.java | 58 +++--- .../rdf/sail/tck/BigdataStoreTest.java | 38 ++-- .../sail/webapp/AbstractSimpleInsertTest.java | 22 +- .../webapp/AbstractTestNanoSparqlClient.java | 56 ++--- .../rdf/sail/webapp/ProxyTestCase.java | 16 +- .../StressTestConcurrentRestApiRequests.java | 22 +- .../webapp/StressTest_REST_MultiTenancy.java | 8 +- .../bigdata/rdf/sail/webapp/TestBLZG1943.java | 16 +- .../rdf/sail/webapp/TestBackupServlet.java | 2 +- .../TestBigdataSailRemoteRepository.java | 52 ++--- .../bigdata/rdf/sail/webapp/TestConneg.java | 8 +- .../sail/webapp/TestDataLoaderServlet.java | 6 +- .../rdf/sail/webapp/TestFederatedQuery.java | 62 +++--- .../bigdata/rdf/sail/webapp/TestHelper.java | 8 +- .../rdf/sail/webapp/TestMultiTenancyAPI.java | 16 +- .../rdf/sail/webapp/TestNanoSparqlClient.java | 36 ++-- .../rdf/sail/webapp/TestRebuildTextIndex.java | 12 +- .../rdf/sail/webapp/TestServiceWhiteList.java | 4 +- .../rdf/sail/webapp/TestSparqlUpdate.java | 30 +-- .../rdf/sail/webapp/Test_REST_ASK.java | 2 +- .../Test_REST_DELETE_BY_ACCESS_PATH.java | 10 +- .../webapp/Test_REST_DELETE_WITH_BODY.java | 2 +- .../rdf/sail/webapp/Test_REST_DESCRIBE.java | 18 +- .../rdf/sail/webapp/Test_REST_ESTCARD.java | 12 +- .../rdf/sail/webapp/Test_REST_HASSTMT.java | 12 +- .../webapp/Test_REST_ServiceDescription.java | 4 +- .../rdf/sail/webapp/Test_Ticket_1207.java | 22 +- .../rdf/sail/webapp/Test_Ticket_1717.java | 6 +- .../rdf/sail/webapp/Test_Ticket_1893.java | 14 +- .../rdf/sail/webapp/Test_Ticket_2091.java | 8 +- .../rdf/sail/webapp/Test_Ticket_605.java | 12 +- .../rdf/sail/webapp/Test_Ticket_T165559.java | 16 +- .../rdf/sail/webapp/Test_Ticket_T168741.java | 14 +- .../rdf/sail/webapp/Test_Ticket_T172113.java | 6 +- .../rdf/sail/webapp/Test_Ticket_T173243.java | 14 +- .../org/openrdf/model/util/ModelUtil.java | 14 +- .../parser/sparql/ComplexSPARQLQueryTest.java | 70 +++---- .../query/parser/sparql/SPARQLDataSet.java | 2 +- .../query/parser/sparql/SPARQLUpdateTest.java | 48 ++--- .../parser/sparql/SPARQLUpdateTestv2.java | 42 ++-- .../parser/sparql/manifest/ManifestTest.java | 40 ++-- .../sparql/manifest/SPARQL11ManifestTest.java | 40 ++-- .../sparql/manifest/SPARQL11SyntaxTest.java | 42 ++-- .../sparql/manifest/SPARQLQueryTest.java | 88 ++++---- .../sparql/manifest/SPARQLSyntaxTest.java | 24 +-- .../manifest/SPARQLUpdateConformanceTest.java | 54 ++--- .../repository/RepositoryConnectionTest.java | 84 ++++---- .../java/org/openrdf/sail/RDFStoreTest.java | 56 ++--- .../com/bigdata/samples/Concurrency.java | 18 +- .../src/samples/com/bigdata/samples/LUBM.java | 4 +- .../com/bigdata/samples/LoadNamedGraphs.java | 8 +- .../com/bigdata/samples/ReleaseTimes.java | 16 +- .../com/bigdata/samples/SampleCode.java | 48 ++--- .../samples/com/bigdata/samples/ScaleOut.java | 18 +- .../com/bigdata/samples/SparqlBuilder.java | 6 +- .../com/bigdata/samples/TestNamedGraphs.java | 18 +- .../samples/remoting/DemoSesameServer.java | 24 +-- .../rdf/sail/webapp/Test_Ticket_789.java | 24 +-- bigdata-war/pom.xml | 1 + blazegraph-war/pom.xml | 1 + contrib/src/problems/alex/LoadPdb.java | 30 +-- pom.xml | 10 +- .../com/bigdata/rdf/ServiceProviderHook.java | 24 +-- .../rdf/properties/PropertiesFormat.java | 5 +- .../properties/PropertiesParserRegistry.java | 4 +- .../properties/PropertiesWriterRegistry.java | 2 +- sparql-grammar/pom.xml | 1 + .../rdf/sail/sparql/ast/ASTCompare.java | 2 +- .../bigdata/rdf/sail/sparql/ast/ASTLoad.java | 2 +- .../bigdata/rdf/sail/sparql/ast/ASTMath.java | 2 +- .../sail/sparql/ast/ASTNumericLiteral.java | 2 +- .../rdf/sail/sparql/ast/ASTRDFValue.java | 4 +- .../sail/sparql/ast/SyntaxTreeBuilder.java | 12 +- .../ast/SyntaxTreeBuilderTokenManager.java | 12 +- .../vocab/pubchem/PubChemVocabularyDecl.java | 6 +- .../pubchem/TestPubchemVocabInlineUris.java | 16 +- 863 files changed, 6124 insertions(+), 6078 deletions(-) rename bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/{BigdataURI.java => BigdataIRI.java} (88%) diff --git a/bigdata-blueprints/pom.xml b/bigdata-blueprints/pom.xml index f07be65813..f852a45fbd 100644 --- a/bigdata-blueprints/pom.xml +++ b/bigdata-blueprints/pom.xml @@ -260,6 +260,7 @@ ga('send', 'pageview'); org.eclipse.rdf4j rdf4j-runtime ${rdf4j.version} + pom diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java index 406c463412..5ca6230d15 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataEdge.java @@ -28,8 +28,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java index f2fa39369f..a8977d6648 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataElement.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Element; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java index e954a14c55..90c3820637 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraph.java @@ -22,7 +22,7 @@ */ package com.bigdata.blueprints; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.lang.reflect.Array; import java.util.Collection; @@ -36,23 +36,23 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.OpenRDFException; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryInterruptedException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.Update; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; +import org.eclipse.rdf4j.OpenRDFException; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryInterruptedException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; import com.bigdata.blueprints.BigdataGraphAtom.EdgeAtom; import com.bigdata.blueprints.BigdataGraphAtom.EdgeLabelAtom; @@ -133,24 +133,24 @@ public interface Options { protected final int maxQueryTime; /** - * URI used for typing elements. + * IRI used for typing elements. */ - protected final URI TYPE; + protected final IRI TYPE; /** - * URI used to represent a Vertex. + * IRI used to represent a Vertex. */ - protected final URI VERTEX; + protected final IRI VERTEX; /** - * URI used to represent a Edge. + * IRI used to represent a Edge. */ - protected final URI EDGE; + protected final IRI EDGE; /** - * URI used for labeling edges. + * IRI used for labeling edges. */ - protected final URI LABEL; + protected final IRI LABEL; /** * Factory for round-tripping between Blueprints data and RDF data. @@ -219,9 +219,9 @@ public BlueprintsValueFactory getValueFactory() { * * @see {@link BigdataElement} */ - public Object getProperty(final URI uri, final String prop) { + public Object getProperty(final IRI IRI, final String prop) { - return getProperty(uri, factory.toPropertyURI(prop)); + return getProperty(IRI, factory.toPropertyURI(prop)); } @@ -230,12 +230,12 @@ public Object getProperty(final URI uri, final String prop) { * * @see {@link BigdataElement} */ - public Object getProperty(final URI uri, final URI prop) { + public Object getProperty(final IRI IRI, final IRI prop) { try { final RepositoryResult result = - cxn().getStatements(uri, prop, null, false); + cxn().getStatements(IRI, prop, null, false); try { @@ -308,9 +308,9 @@ protected Object getProperty(final Value value) { // * // * @see {@link BigdataElement} // */ -// public List getProperties(final URI uri, final String prop) { +// public List getProperties(final IRI IRI, final String prop) { // -// return getProperties(uri, factory.toPropertyURI(prop)); +// return getProperties(IRI, factory.toPropertyURI(prop)); // // } // @@ -321,12 +321,12 @@ protected Object getProperty(final Value value) { // * // * @see {@link BigdataElement} // */ -// public List getProperties(final URI uri, final URI prop) { +// public List getProperties(final IRI IRI, final IRI prop) { // // try { // // final RepositoryResult result = -// getWriteConnection().getStatements(uri, prop, null, false); +// getWriteConnection().getStatements(IRI, prop, null, false); // // final List props = new LinkedList(); // @@ -359,12 +359,12 @@ protected Object getProperty(final Value value) { * * @see {@link BigdataElement} */ - public Set getPropertyKeys(final URI uri) { + public Set getPropertyKeys(final IRI IRI) { try { final RepositoryResult result = - cxn().getStatements(uri, null, null, false); + cxn().getStatements(IRI, null, null, false); try { @@ -411,9 +411,9 @@ public Set getPropertyKeys(final URI uri) { * * @see {@link BigdataElement} */ - public Object removeProperty(final URI uri, final String prop) { + public Object removeProperty(final IRI IRI, final String prop) { - return removeProperty(uri, factory.toPropertyURI(prop)); + return removeProperty(IRI, factory.toPropertyURI(prop)); } @@ -422,13 +422,13 @@ public Object removeProperty(final URI uri, final String prop) { * * @see {@link BigdataElement} */ - public Object removeProperty(final URI uri, final URI prop) { + public Object removeProperty(final IRI IRI, final IRI prop) { try { - final Object oldVal = getProperty(uri, prop); + final Object oldVal = getProperty(IRI, prop); - cxn().remove(uri, prop, null); + cxn().remove(IRI, prop, null); return oldVal; @@ -444,7 +444,7 @@ public Object removeProperty(final URI uri, final URI prop) { * * @see {@link BigdataElement} */ - public void setProperty(final URI s, final String prop, final Object val) { + public void setProperty(final IRI s, final String prop, final Object val) { setProperty(s, factory.toPropertyURI(prop), toLiterals(val)); @@ -493,7 +493,7 @@ protected Collection toLiterals(final Object val) { // * // * @see {@link BigdataElement} // */ -// public void setProperty(final URI uri, final URI prop, final Literal val) { +// public void setProperty(final IRI IRI, final IRI prop, final Literal val) { // // try { // @@ -502,12 +502,12 @@ protected Collection toLiterals(final Object val) { // if (!laxProperties) { // // // remove the old value -// cxn.remove(uri, prop, null); +// cxn.remove(IRI, prop, null); // // } // // // add the new value -// cxn.add(uri, prop, val); +// cxn.add(IRI, prop, val); // // } catch (RuntimeException e) { // throw e; @@ -523,7 +523,7 @@ protected Collection toLiterals(final Object val) { * * @see {@link BigdataElement} */ - public void setProperty(final URI uri, final URI prop, + public void setProperty(final IRI IRI, final IRI prop, final Collection vals) { try { @@ -533,13 +533,13 @@ public void setProperty(final URI uri, final URI prop, if (!laxProperties) { // remove the old value - cxn.remove(uri, prop, null); + cxn.remove(IRI, prop, null); } // add the new values for (Literal val : vals) { - cxn.add(uri, prop, val); + cxn.add(IRI, prop, val); } /* @@ -567,9 +567,9 @@ public void setProperty(final URI uri, final URI prop, // * // * @see {@link BigdataElement} // */ -// public void addProperty(final URI uri, final String prop, final Object val) { +// public void addProperty(final IRI IRI, final String prop, final Object val) { // -// setProperty(uri, factory.toPropertyURI(prop), factory.toLiteral(val)); +// setProperty(IRI, factory.toPropertyURI(prop), factory.toLiteral(val)); // // } // @@ -578,11 +578,11 @@ public void setProperty(final URI uri, final URI prop, // * // * @see {@link BigdataElement} // */ -// public void addProperty(final URI uri, final URI prop, final Literal val) { +// public void addProperty(final IRI IRI, final IRI prop, final Literal val) { // // try { // -// getWriteConnection().add(uri, prop, val); +// getWriteConnection().add(IRI, prop, val); // // } catch (RuntimeException e) { // throw e; @@ -653,7 +653,7 @@ public Edge addEdge(final Object key, final Vertex from, final Vertex to, final String eid = key != null ? key.toString() : UUID.randomUUID().toString(); - final URI edgeURI = factory.toEdgeURI(eid); + final IRI edgeURI = factory.toEdgeURI(eid); try { @@ -662,8 +662,8 @@ public Edge addEdge(final Object key, final Vertex from, final Vertex to, // throw new IllegalArgumentException("edge " + eid + " already exists"); // } - final URI fromURI = factory.toVertexURI(from.getId().toString()); - final URI toURI = factory.toVertexURI(to.getId().toString()); + final IRI fromURI = factory.toVertexURI(from.getId().toString()); + final IRI toURI = factory.toVertexURI(to.getId().toString()); final RepositoryConnection cxn = cxn(); @@ -704,16 +704,16 @@ public Vertex addVertex(final Object key) { final String vid = key != null ? key.toString() : UUID.randomUUID().toString(); - final URI uri = factory.toVertexURI(vid); + final IRI IRI = factory.toVertexURI(vid); // do we need to check this? // if (cxn().hasStatement(vertexURI, TYPE, VERTEX, false)) { // throw new IllegalArgumentException("vertex " + vid + " already exists"); // } - cxn().add(uri, TYPE, VERTEX); + cxn().add(IRI, TYPE, VERTEX); - return new BigdataVertex(uri, this); + return new BigdataVertex(IRI, this); } catch (RuntimeException e) { throw e; @@ -737,7 +737,7 @@ public Edge getEdge(final Object key) { try { - final URI edge = factory.toEdgeURI(key.toString()); + final IRI edge = factory.toEdgeURI(key.toString()); final RepositoryResult result = cxn().getStatements(null, edge, null, false); @@ -784,7 +784,7 @@ public Iterable getEdges() { try { - final URI wild = null; + final IRI wild = null; return getEdges(wild, wild); } catch (RuntimeException ex) { @@ -809,7 +809,7 @@ public Iterable getEdges() { * the edge labels to consider (optional) * @return the edges matching the supplied criteria */ - Iterable getEdges(final URI from, final URI to, + Iterable getEdges(final IRI from, final IRI to, final String... labels) throws Exception { final GraphQueryResult stmts = getElements(from, to, labels); @@ -836,7 +836,7 @@ Iterable getEdges(final URI from, final URI to, * filter(?label in ("label1", "label2", ...)) . * } */ - protected GraphQueryResult getElements(final URI from, final URI to, + protected GraphQueryResult getElements(final IRI from, final IRI to, final String... labels) throws Exception { final StringBuilder sb = new StringBuilder(); @@ -863,7 +863,7 @@ protected GraphQueryResult getElements(final URI from, final URI to, .replace("?from", from != null ? "<"+from+">" : "?from") .replace("?to", to != null ? "<"+to+">" : "?to"); - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -882,7 +882,7 @@ protected GraphQueryResult getElements(final URI from, final URI to, */ Iterable getEdges(final String queryStr) throws Exception { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -909,7 +909,7 @@ Iterable getEdges(final String queryStr) throws Exception { * @return * the vertices matching the supplied criteria */ - Iterable getVertices(final URI from, final URI to, + Iterable getVertices(final IRI from, final IRI to, final String... labels) throws Exception { if (from != null && to != null) { @@ -940,7 +940,7 @@ Iterable getVertices(final URI from, final URI to, Iterable getVertices(final String queryStr, final boolean subject) throws Exception { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn().prepareGraphQuery(QueryLanguage.SPARQL, queryStr); final GraphQueryResult stmts = query.evaluate(); @@ -969,7 +969,7 @@ public Iterable getEdges(final String prop, final Object val) { if (log.isInfoEnabled()) log.info("("+prop+", "+val+")"); - final URI p = factory.toPropertyURI(prop); + final IRI p = factory.toPropertyURI(prop); final Literal o = factory.toLiteral(val); try { @@ -1004,12 +1004,12 @@ public Vertex getVertex(final Object key) { if (key == null) throw new IllegalArgumentException(); - final URI uri = factory.toVertexURI(key.toString()); + final IRI IRI = factory.toVertexURI(key.toString()); try { - if (cxn().hasStatement(uri, TYPE, VERTEX, false)) { - return new BigdataVertex(uri, this); + if (cxn().hasStatement(IRI, TYPE, VERTEX, false)) { + return new BigdataVertex(IRI, this); } return null; @@ -1059,7 +1059,7 @@ public Iterable getVertices(final String prop, final Object val) { if (log.isInfoEnabled()) log.info("("+prop+", "+val+")"); - final URI p = factory.toPropertyURI(prop); + final IRI p = factory.toPropertyURI(prop); final Literal o = factory.toLiteral(val); try { @@ -1104,19 +1104,19 @@ public void removeEdge(final Edge edge) { final RepositoryConnection cxn = cxn(); - final URI uri = factory.toURI(edge); + final IRI IRI = factory.toURI(edge); - if (!cxn.hasStatement(uri, TYPE, EDGE, false)) { + if (!cxn.hasStatement(IRI, TYPE, EDGE, false)) { throw new IllegalStateException(); } - final URI wild = null; + final IRI wild = null; // remove the edge statement - cxn.remove(wild, uri, wild); + cxn.remove(wild, IRI, wild); // remove its properties - cxn.remove(uri, wild, wild); + cxn.remove(IRI, wild, wild); } catch (RuntimeException e) { throw e; @@ -1138,19 +1138,19 @@ public void removeVertex(final Vertex vertex) { final RepositoryConnection cxn = cxn(); - final URI uri = factory.toURI(vertex); + final IRI IRI = factory.toURI(vertex); - if (!cxn.hasStatement(uri, TYPE, VERTEX, false)) { + if (!cxn.hasStatement(IRI, TYPE, VERTEX, false)) { throw new IllegalStateException(); } - final URI wild = null; + final IRI wild = null; // remove outgoing edges and properties - cxn.remove(uri, wild, wild); + cxn.remove(IRI, wild, wild); // remove incoming edges - cxn.remove(wild, wild, uri); + cxn.remove(wild, wild, IRI); } catch (RuntimeException e) { throw e; @@ -1198,7 +1198,7 @@ public boolean hasNext() { public Vertex next() { try { final Statement stmt = stmts.next(); - final URI v = (URI) + final IRI v = (IRI) (subject ? stmt.getSubject() : stmt.getObject()); final Vertex vertex = new BigdataVertex(v, BigdataGraph.this); cache.add(vertex); @@ -1384,7 +1384,7 @@ public ICloseableIterator project(final String queryStr, try { - final org.openrdf.query.GraphQuery query = + final org.eclipse.rdf4j.query.GraphQuery query = cxn.prepareGraphQuery(QueryLanguage.SPARQL, queryStr); setMaxQueryTime(query); @@ -1426,7 +1426,7 @@ public ICloseableIterator project(final String queryStr, public boolean isValid(final Object e) { final Statement stmt = (Statement) e; // do not project history - return stmt.getSubject() instanceof URI; + return stmt.getSubject() instanceof IRI; } }); @@ -1448,8 +1448,8 @@ protected Object resolve(final Object e) { */ protected BigdataGraphAtom toGraphAtom(final Statement stmt) { - final URI s = (URI) stmt.getSubject(); - final URI p = (URI) stmt.getPredicate(); + final IRI s = (IRI) stmt.getSubject(); + final IRI p = (IRI) stmt.getPredicate(); final Value o = stmt.getObject(); return toGraphAtom(s, p, o); @@ -1459,13 +1459,13 @@ protected BigdataGraphAtom toGraphAtom(final Statement stmt) { /** * Convert a unit of RDF data to an atomic unit of PG data. */ - protected BigdataGraphAtom toGraphAtom(final URI s, final URI p, final Value o) { + protected BigdataGraphAtom toGraphAtom(final IRI s, final IRI p, final Value o) { final String sid = factory.fromURI(s); final String pid = factory.fromURI(p); final BigdataGraphAtom atom; - if (o instanceof URI) { + if (o instanceof IRI) { /* * Either an edge or an element type statement. @@ -1487,7 +1487,7 @@ protected BigdataGraphAtom toGraphAtom(final URI s, final URI p, final Value o) /* * Edge. */ - final String oid = factory.fromURI((URI) o); + final String oid = factory.fromURI((IRI) o); atom = new EdgeAtom(pid, sid, oid); } @@ -1617,8 +1617,8 @@ protected BigdataBindingSet convert(final BindingSet bs) { final Object o; if (val instanceof Literal) { o = factory.fromLiteral((Literal) val); - } else if (val instanceof URI) { - o = factory.fromURI((URI) val); + } else if (val instanceof IRI) { + o = factory.fromURI((IRI) val); } else { continue; } @@ -1734,14 +1734,14 @@ public void update(final String queryStr, final String extQueryId) * @see {@link AbstractTripleStore.Options#RDR_HISTORY_CLASS} * @see {@link RDRHistory} */ - public ICloseableIterator history(final List ids) + public ICloseableIterator history(final List ids) throws Exception { final String randomUUID = UUID.randomUUID().toString(); return history(ids, randomUUID); } @SuppressWarnings("unchecked") - public ICloseableIterator history(final List ids, + public ICloseableIterator history(final List ids, final String extQueryId) throws Exception { final RepositoryConnection cxn = cxn(); @@ -1751,7 +1751,7 @@ public ICloseableIterator history(final List ids, if (ids.size() > 0) { final StringBuilder vc = new StringBuilder(); vc.append(" values (?s) { \n"); - for (URI id : ids) { + for (IRI id : ids) { vc.append(" (<"+id+">) \n"); } vc.append(" } \n"); @@ -1810,10 +1810,10 @@ public ICloseableIterator history(final List ids, @Override protected Object resolve(final Object e) { final BindingSet bs = (BindingSet) e; - final URI s = (URI) bs.getValue("s"); - final URI p = (URI) bs.getValue("p"); + final IRI s = (IRI) bs.getValue("s"); + final IRI p = (IRI) bs.getValue("p"); final Value o = bs.getValue("o"); - final URI a = (URI) bs.getValue("action"); + final IRI a = (IRI) bs.getValue("action"); final Literal t = (Literal) bs.getValue("time"); if (!t.getDatatype().equals(XSD.DATETIME)) { @@ -1967,7 +1967,7 @@ public void close() { * Utility function to set the Query timeout to the global * setting if it is configured. */ - protected void setMaxQueryTime(final org.openrdf.query.Query query) { + protected void setMaxQueryTime(final org.eclipse.rdf4j.query.Query query) { if (maxQueryTime > 0) { query.setMaxQueryTime(maxQueryTime); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java index 7e49582c03..7177595d19 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphBulkLoad.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.UUID; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.impl.AbstractQuery; -import org.openrdf.repository.RepositoryConnection; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.impl.AbstractQuery; +import org.eclipse.rdf4j.repository.RepositoryConnection; import com.bigdata.rdf.changesets.IChangeLog; import com.bigdata.rdf.changesets.IChangeRecord; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java index fd8508c079..2c67bdeb58 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphEmbedded.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.blueprints.BigdataGraphEdit.Action; import com.bigdata.bop.engine.IRunningQuery; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java index 1db8ab9f93..ca658d4edb 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataGraphQuery.java @@ -29,8 +29,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Edge; import com.tinkerpop.blueprints.Predicate; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java index 625fde0c62..f2562cf3dc 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataRDFFactory.java @@ -22,11 +22,12 @@ */ package com.bigdata.blueprints; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.store.BD; @@ -56,14 +57,14 @@ public class BigdataRDFFactory extends DefaultBlueprintsValueFactory { public static final String EDGE_NAMESPACE = "http://www.bigdata.com/rdf/graph/edge/"; /** - * URI used to represent a Vertex. + * IRI used to represent a Vertex. */ - public static final URI VERTEX = new URIImpl(BD.NAMESPACE + "Vertex"); + public static final IRI VERTEX = SimpleValueFactory.getInstance().createIRI(BD.NAMESPACE, "Vertex"); /** - * URI used to represent a Edge. + * IRI used to represent a Edge. */ - public static final URI EDGE = new URIImpl(BD.NAMESPACE + "Edge"); + public static final IRI EDGE = SimpleValueFactory.getInstance().createIRI(BD.NAMESPACE, "Edge"); public static BigdataRDFFactory INSTANCE = new BigdataRDFFactory(); @@ -71,7 +72,7 @@ public class BigdataRDFFactory extends DefaultBlueprintsValueFactory { * Construct an instance with a simple Sesame ValueFactoryImpl. */ private BigdataRDFFactory() { - super(new ValueFactoryImpl(), + super(SimpleValueFactory.getInstance(), GRAPH_NAMESPACE, VERTEX_NAMESPACE, EDGE_NAMESPACE, RDF.TYPE, VERTEX, EDGE, RDFS.LABEL); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java index 36686bce0b..0e508551f2 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BigdataVertex.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java index d7a0057245..1b90659a8f 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/BlueprintsValueFactory.java @@ -22,8 +22,8 @@ */ package com.bigdata.blueprints; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.IRI; import com.tinkerpop.blueprints.Element; @@ -36,61 +36,61 @@ public interface BlueprintsValueFactory { /** - * Return the URI used for typing elements. + * Return the IRI used for typing elements. */ - URI getTypeURI(); + IRI getTypeURI(); /** - * Return the URI used to identify vertices. + * Return the IRI used to identify vertices. */ - URI getVertexURI(); + IRI getVertexURI(); /** - * Return the URI used to identify edges. + * Return the IRI used to identify edges. */ - URI getEdgeURI(); + IRI getEdgeURI(); /** - * Return the URI used for labeling edges. + * Return the IRI used for labeling edges. */ - URI getLabelURI(); + IRI getLabelURI(); /** - * Create a vertex URI from a blueprints vertex id. + * Create a vertex IRI from a blueprints vertex id. */ - URI toVertexURI(Object key); + IRI toVertexURI(Object key); /** - * Create an edge URI from a blueprints edge id. + * Create an edge IRI from a blueprints edge id. */ - URI toEdgeURI(Object key); + IRI toEdgeURI(Object key); /** - * Create an element URI from a blueprints element id. + * Create an element IRI from a blueprints element id. */ - URI toURI(Element e); + IRI toURI(Element e); /** - * Create a property URI from a blueprints property name. + * Create a property IRI from a blueprints property name. */ - URI toPropertyURI(String property); + IRI toPropertyURI(String property); // /** -// * Create a blueprints vertex id from a vertex URI. +// * Create a blueprints vertex id from a vertex IRI. // */ -// String fromVertexURI(URI uri); +// String fromVertexURI(IRI IRI); // // /** -// * Create a blueprints edge id from an edge URI. +// * Create a blueprints edge id from an edge IRI. // */ -// String fromEdgeURI(URI uri); +// String fromEdgeURI(IRI IRI); // // /** -// * Create a blueprints property name from a property URI. +// * Create a blueprints property name from a property IRI. // */ -// String fromPropertyURI(URI uri); +// String fromPropertyURI(IRI IRI); - String fromURI(URI uri); + String fromURI(IRI IRI); /** * Create a datatyped literal from a blueprints property value. @@ -103,18 +103,18 @@ public interface BlueprintsValueFactory { Object fromLiteral(Literal lit); // /** -// * Is the URI a vertex? +// * Is the IRI a vertex? // */ -// boolean isVertex(URI uri); +// boolean isVertex(IRI IRI); // // /** -// * Is the URI an edge? +// * Is the IRI an edge? // */ -// boolean isEdge(URI uri); +// boolean isEdge(IRI IRI); // // /** -// * Is the URI an edge? +// * Is the IRI an edge? // */ -// boolean isProperty(URI uri); +// boolean isProperty(IRI IRI); } diff --git a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java index 964fb5473e..85fc6c8f95 100644 --- a/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java +++ b/bigdata-blueprints/src/main/java/com/bigdata/blueprints/DefaultBlueprintsValueFactory.java @@ -26,11 +26,11 @@ import java.net.URLDecoder; import java.net.URLEncoder; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.internal.XSD; import com.tinkerpop.blueprints.Edge; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java index e34e2478fc..b808487176 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/SimpleBlueprintsValueFactory.java @@ -31,8 +31,8 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.impl.literal.IPv4AddrIV; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java index a9079af50b..3d7b05d4b1 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestBigdataGraphEmbeddedRepository.java @@ -25,8 +25,8 @@ import java.io.File; import java.util.Properties; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.sail.BigdataSail; diff --git a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java index f6ce750b68..0834b9a012 100644 --- a/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java +++ b/bigdata-blueprints/src/test/java/com/bigdata/blueprints/TestPathConstraints.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryLanguage; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; import com.bigdata.rdf.sail.BigdataSailTupleQuery; diff --git a/bigdata-client/pom.xml b/bigdata-client/pom.xml index 6b01d9b2e4..8800b210fe 100644 --- a/bigdata-client/pom.xml +++ b/bigdata-client/pom.xml @@ -112,6 +112,7 @@ ga('send', 'pageview'); org.eclipse.rdf4j rdf4j-runtime ${rdf4j.version} + pom org.eclipse.jetty diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java index 500175a645..0506eeb5e9 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/AbstractBigdataRemoteQuery.java @@ -1,8 +1,8 @@ package com.bigdata.rdf.sail.remote; -import org.openrdf.model.URI; -import org.openrdf.query.Binding; -import org.openrdf.query.impl.AbstractQuery; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.impl.AbstractQuery; import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue; import com.bigdata.rdf.sail.webapp.client.IPreparedQuery; @@ -19,7 +19,7 @@ public AbstractBigdataRemoteQuery(String baseURI) { } /** - * @see org.openrdf.http.client.HTTPClient#getQueryMethodParameters(QueryLanguage, String, String, Dataset, boolean, int, Binding...) + * @see org.eclipse.rdf4j.http.client.HTTPClient#getQueryMethodParameters(QueryLanguage, String, String, Dataset, boolean, int, Binding...) */ protected void configureConnectOptions(IPreparedQuery q) { if (baseURI != null) { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java index b3b871611b..2d25a492b7 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteBooleanQuery.java @@ -2,8 +2,8 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.QueryEvaluationException; import com.bigdata.rdf.sail.webapp.client.IPreparedBooleanQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java index 4bd4c94676..6b35acdc68 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteGraphQuery.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; import com.bigdata.rdf.sail.webapp.client.IPreparedGraphQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java index faa2cfc19e..598582733d 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataRemoteTupleQuery.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; import com.bigdata.rdf.sail.webapp.client.IPreparedTupleQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java index fe7c98ef4c..28158dab8c 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailFactory.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Properties; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.sail.Sail; import com.bigdata.rdf.sail.webapp.client.RemoteRepositoryManager; import com.bigdata.util.httpd.Config; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java index 5ef511bdd7..0bf13e053f 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepository.java @@ -28,11 +28,11 @@ import java.util.Collection; import java.util.UUID; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; import com.bigdata.rdf.sail.model.RunningQuery; import com.bigdata.rdf.sail.webapp.client.RemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java index 8afb778fa8..25359107ee 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java @@ -24,9 +24,6 @@ package com.bigdata.rdf.sail.remote; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.Iteration; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -38,37 +35,39 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.IsolationLevel; -import org.openrdf.model.Graph; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.BooleanQuery; -import org.openrdf.query.Dataset; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.Query; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.Update; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.repository.UnknownTransactionStateException; -import org.openrdf.rio.ParserConfig; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.IsolationLevel; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.Iteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Namespace; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.BooleanQuery; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.Query; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.repository.UnknownTransactionStateException; +import org.eclipse.rdf4j.rio.ParserConfig; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.rdf.sail.webapp.client.IPreparedSparqlUpdate; import com.bigdata.rdf.sail.webapp.client.IRemoteTx; @@ -153,7 +152,7 @@ protected RemoteRepository getRepositoryForConnection() { * Report the fast range count (aka ESTCARD) associated with the specified * access path. */ - public long count(final Resource s, final URI p, final Value o, + public long count(final Resource s, final IRI p, final Value o, final Resource... c) throws RepositoryException { @@ -176,7 +175,7 @@ public long count(final Resource s, final URI p, final Value o, */ @Override public RepositoryResult getStatements(final Resource s, - final URI p, final Value o, final boolean includeInferred, + final IRI p, final Value o, final boolean includeInferred, final Resource... c) throws RepositoryException { try { @@ -244,7 +243,7 @@ public void close() throws RepositoryException { * overestimate and ignores includeInferred (REST API) */ @Override - public boolean hasStatement(final Resource s, final URI p, final Value o, + public boolean hasStatement(final Resource s, final IRI p, final Value o, final boolean includeInferred, final Resource... c) throws RepositoryException { @@ -390,7 +389,7 @@ public void add( final Iteration stmts, final Resource... c) throws RepositoryException, E { - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); while (stmts.hasNext()) { @@ -403,7 +402,7 @@ public void add( } @Override - public void add(final Resource s, final URI p, final Value o, + public void add(final Resource s, final IRI p, final Value o, final Resource... c) throws RepositoryException { add(new StatementImpl(s, p, o), c); @@ -422,7 +421,7 @@ public void add(final Statement stmt, final Resource... c) // log.warn("single statement updates not recommended"); - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); g.add(stmt); @@ -520,7 +519,7 @@ public void remove( final Iteration stmts, final Resource... c) throws RepositoryException, E { - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); while (stmts.hasNext()) { @@ -544,7 +543,7 @@ public void remove(final Statement stmt, final Resource... c) // log.warn("single statement updates not recommended"); - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); g.add(stmt); @@ -563,7 +562,7 @@ public void remove(final Iterable stmts, } @Override - public void remove(final Resource s, URI p, Value o, final Resource... c) + public void remove(final Resource s, IRI p, Value o, final Resource... c) throws RepositoryException { final RemoveOp op = new RemoveOp(s, p, o, c); @@ -705,7 +704,7 @@ public void export(final RDFHandler handler, final Resource... c) } @Override - public void exportStatements(final Resource s, final URI p, final Value o, + public void exportStatements(final Resource s, final IRI p, final Value o, final boolean includeInferred, final RDFHandler handler, final Resource... c) throws RepositoryException, RDFHandlerException { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java index 184cf31575..449cd37822 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AST2SPARQLUtil.java @@ -30,12 +30,12 @@ import java.util.HashMap; import java.util.Map; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.parser.sparql.SPARQLUtil; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLUtil; /** * Utility class for externalizing SPARQL prefix declaration management. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java index c59bd2b541..762b8dfa03 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AbstractConnectOptions.java @@ -33,9 +33,9 @@ import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.message.BasicNameValuePair; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.rio.RDFFormat; public class AbstractConnectOptions implements IMimeTypes { diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java index 2fc1da017c..c6bfaf4f90 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/AcceptHeaderFactory.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -32,7 +32,7 @@ package com.bigdata.rdf.sail.webapp.client; -import info.aduna.lang.FileFormat; +import org.eclipse.rdf4j.common.lang.FileFormat; import java.util.Iterator; import java.util.LinkedHashSet; @@ -40,12 +40,12 @@ import java.util.List; import java.util.Set; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.BooleanQueryResultParserRegistry; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParserRegistry; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserRegistry; /** * Utility class for generating accept heades modeled on diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java index a03197293f..7150f1de49 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundGraphResult.java @@ -16,14 +16,14 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.openrdf.model.Statement; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.repository.sparql.query.QueueCursor; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.repository.sparql.query.QueueCursor; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; /** * Provides concurrent access to statements as they are being parsed. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java index ecc8f1172f..dd71a4b79b 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java @@ -12,16 +12,16 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.impl.TupleQueryResultImpl; -import org.openrdf.query.resultio.QueryResultParseException; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.repository.sparql.query.QueueCursor; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.impl.TupleQueryResultImpl; +import org.eclipse.rdf4j.query.resultio.QueryResultParseException; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.repository.sparql.query.QueueCursor; /** * Provides concurrent access to tuple results as they are being parsed. diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java index daf1b83ba6..d780486c7e 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/ContextsResult.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Collection; -import org.openrdf.model.Resource; +import org.eclipse.rdf4j.model.Resource; /** * Class representing the result of a get contexts operation against @@ -46,4 +46,4 @@ public ContextsResult(final Collection contexts) { } -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java index 6e76f561e8..212965ec3c 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/EncodeDecodeValue.java @@ -27,15 +27,15 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Utility class to encode/decode RDF {@link Value}s for interchange with the @@ -242,12 +242,12 @@ public class EncodeDecodeValue { // } /** - * Decode a URI or Literal. + * Decode a IRI or Literal. * * @param s * The value to be decoded. * - * @return The URI or literal -or- null if the argument was + * @return The IRI or literal -or- null if the argument was * null. * * @throws IllegalArgumentException @@ -317,9 +317,9 @@ public static Value decodeValue(final String s) { final String datatypeStr = s.substring(closeQuotePos + 3); - final URI datatypeURI = decodeURI(datatypeStr); + final IRI datatypeIRI = decodeIRI(datatypeStr); - return new LiteralImpl(label,datatypeURI); + return new LiteralImpl(label,datatypeIRI); } else { @@ -330,15 +330,15 @@ public static Value decodeValue(final String s) { } else if (ch == '<') { /* - * URI + * IRI */ if (s.charAt(slen - 1) != '>') throw new IllegalArgumentException(s); - final String uriStr = s.substring(1, slen - 1); + final String iriStr = s.substring(1, slen - 1); - return new URIImpl(uriStr); + return SimpleValueFactory.getInstance().createIRI(iriStr); } else { @@ -369,22 +369,22 @@ public static Resource decodeResource(final String param) { } /** - * Type safe variant for a {@link URI}. + * Type safe variant for a {@link IRI}. * * @param param * The encoded value. * - * @return The URI -or- null if the argument was + * @return The IRI -or- null if the argument was * null. */ - public static URI decodeURI(final String param) { + public static IRI decodeIRI(final String param) { final Value v = decodeValue(param); - if (v == null || v instanceof URI) - return (URI) v; + if (v == null || v instanceof IRI) + return (IRI) v; - throw new IllegalArgumentException("Not an URI: '" + param + "'"); + throw new IllegalArgumentException("Not an IRI: '" + param + "'"); } @@ -392,7 +392,7 @@ public static URI decodeURI(final String param) { * Encode an RDF {@link Value} as it should appear if used in a SPARQL * query. E.g., a literal will look like "abc", * "abc"@en or - * "3"^^xsd:int. A URI will look like <http://www.bigdata.com/> + * "3"^^xsd:int. A IRI will look like <http://www.bigdata.com/> * . * * @param v @@ -409,13 +409,13 @@ public static String encodeValue(final Value v) { return null; if (v instanceof BNode) throw new IllegalArgumentException(); - if (v instanceof URI) { + if (v instanceof IRI) { return "<" + v.stringValue() + ">"; } if (v instanceof Literal) { final Literal lit = (Literal) v; final StringBuilder sb = new StringBuilder(); - URI datatype = lit.getDatatype(); + IRI datatype = lit.getDatatype(); sb.append("\""); sb.append(lit.getLabel()); sb.append("\""); diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java index 81c5aecf94..e1cee026f7 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedGraphQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.query.GraphQueryResult; +import org.eclipse.rdf4j.query.GraphQueryResult; /** * A prepared graph query for the {@link RemoteRepository}. @@ -56,4 +56,4 @@ public interface IPreparedGraphQuery extends IPreparedQuery { */ GraphQueryResult evaluate(IPreparedQueryListener listener) throws Exception; -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java index 6cbbb98b2f..02c044f7dc 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IPreparedTupleQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; /** * A prepared tuple query against a {@link JettyeRemoteRepository}. @@ -57,4 +57,4 @@ public interface IPreparedTupleQuery extends IPreparedQuery { public TupleQueryResult evaluate(IPreparedQueryListener listener) throws Exception; -} +} diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java index 9992911a2f..6c043d4e95 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/IRemoteRepository.java @@ -25,10 +25,10 @@ import java.util.UUID; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; /** * Interface for the Java API to the NanoSparqlServer. See diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java index 4351705958..286464e500 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java @@ -23,7 +23,7 @@ package com.bigdata.rdf.sail.webapp.client; -import info.aduna.io.IOUtil; +import org.eclipse.rdf4j.common.io.IOUtil; import java.io.Closeable; import java.io.File; @@ -41,13 +41,13 @@ import org.apache.http.entity.mime.content.ByteArrayBody; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepository; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java index 92641444d0..54641ac0c2 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryBase.java @@ -36,16 +36,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterFactory; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterFactory; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import org.xml.sax.Attributes; import org.xml.sax.ext.DefaultHandler2; diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java index 12dd55cde8..acff08ec9e 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryDecls.java @@ -22,8 +22,8 @@ */ package com.bigdata.rdf.sail.webapp.client; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; //Note: Do not import. Not part of the bigdata-client.jar // diff --git a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java index 50b23da5bb..e4c38f6193 100644 --- a/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java +++ b/bigdata-client/src/main/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java @@ -50,25 +50,25 @@ import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpMethod; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.impl.TupleQueryResultImpl; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.BooleanQueryResultParser; -import org.openrdf.query.resultio.BooleanQueryResultParserFactory; -import org.openrdf.query.resultio.BooleanQueryResultParserRegistry; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.query.resultio.TupleQueryResultParserFactory; -import org.openrdf.query.resultio.TupleQueryResultParserRegistry; -import org.openrdf.repository.sparql.query.InsertBindingSetCursor; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.impl.TupleQueryResultImpl; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParser; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.repository.sparql.query.InsertBindingSetCursor; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; import com.bigdata.rdf.ServiceProviderHook; import com.bigdata.rdf.properties.PropertiesFormat; diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java index 0110c176d5..7ee56a8468 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnectionTest.java @@ -34,20 +34,20 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.DatasetImpl; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.DatasetImpl; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; import com.bigdata.rdf.sail.webapp.client.EncodeDecodeValue; import com.bigdata.rdf.sail.webapp.client.MockRemoteRepository; @@ -67,16 +67,16 @@ public class BigdataSailRemoteRepositoryConnectionTest extends TestCase { private final boolean includeInferred = false; private final Resource s = new URIImpl("http://test/s"); - private final URI p = new URIImpl("http://test/p"); + private final IRI p = new URIImpl("http://test/p"); private final Value o = new URIImpl("http://test/o"); private final Resource c = new URIImpl("http://test/c"); - private final URI defaultGraph1 = new URIImpl("http://test/defaultGraph1"); - private final URI defaultGraph2 = new URIImpl("http://test/defaultGraph2"); - private final URI namedGraph1 = new URIImpl("http://test/namedGraph1"); - private final URI namedGraph2 = new URIImpl("http://test/namedGraph2"); + private final IRI defaultGraph1 = new URIImpl("http://test/defaultGraph1"); + private final IRI defaultGraph2 = new URIImpl("http://test/defaultGraph2"); + private final IRI namedGraph1 = new URIImpl("http://test/namedGraph1"); + private final IRI namedGraph2 = new URIImpl("http://test/namedGraph2"); private final DatasetImpl dataset = new DatasetImpl(); - private final Set defaultGraphs = new HashSet<>(); - private final Set namedGraphs = new HashSet<>(); + private final Set defaultGraphs = new HashSet<>(); + private final Set namedGraphs = new HashSet<>(); @Before protected void setUp() { diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java index 011a5ae5d0..58840c68c1 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/MockRemoteRepository.java @@ -3,6 +3,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -13,8 +14,10 @@ import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.resultio.QueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; public class MockRemoteRepository extends RemoteRepository { @@ -53,10 +56,10 @@ public int getStatus() { }; String requestMimeType = request.getHeaders().get(HttpHeader.ACCEPT).split(";")[0]; - TupleQueryResultFormat tupleQueryMimeType = TupleQueryResultFormat.forMIMEType(requestMimeType); + Optional tupleQueryMimeType = TupleQueryResultParserRegistry.getInstance().getFileFormatForMIMEType(requestMimeType); String responseMimeType; String responseContent; - if (tupleQueryMimeType!=null) { + if (tupleQueryMimeType.isPresent()) { responseMimeType = TupleQueryResultFormat.TSV.getDefaultMIMEType(); responseContent = tupleQueryResponse; } else { diff --git a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java index dd2d3471d9..8f049728e7 100644 --- a/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java +++ b/bigdata-client/src/test/java/com/bigdata/rdf/sail/webapp/client/TestEncodeDecodeValue.java @@ -31,14 +31,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; /** * Test suite for utility class to encode and decode RDF Values for interchange diff --git a/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java b/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java index 548c7cf0fc..8e4f40611d 100644 --- a/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java +++ b/bigdata-common-util/src/main/java/com/bigdata/util/Depends.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -238,7 +238,7 @@ public LGPL21Dep(String component, String projectURL) { private final static Dep slf4j = new Dep("slf4j", "http://www.slf4j.org/", "http://www.slf4j.org/license.html"); - private final static Dep sesame = new Dep("sesame", + private final static Dep rdf4j = new Dep("rdf4j", "http://www.openrdf.org/", "http://www.openrdf.org/download.jsp"); //Used for RDFa support. Apache2 License @@ -266,10 +266,10 @@ public LGPL21Dep(String component, String projectURL) { private final static Dep jetty = new Dep("jetty", "http://www.eclipse.org/jetty/", "http://www.apache.org/licenses/LICENSE-2.0.html"); - - private final static Dep jsonld = new Dep("jsonld", - "https://github.com/jsonld-java/jsonld-java/", - "https://raw.githubusercontent.com/jsonld-java/jsonld-java/master/LICENCE"); + + private final static Dep jsonld = new Dep("jsonld", + "https://github.com/jsonld-java/jsonld-java/", + "https://raw.githubusercontent.com/jsonld-java/jsonld-java/master/LICENCE"); private final static Dep servletApi = new ApacheDep("servlet-api", "http://tomcat.apache.org"); @@ -317,13 +317,13 @@ public LGPL21Dep(String component, String projectURL) { // webapp // cweb,// slf4j,// - sesame,// + rdf4j,// semargl,// icu,// // nxparser,// nanohttp,// jetty,// - jsonld,// + jsonld,// servletApi,// jacksonCore,// blueprintsCore,// diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java index 25b1ed7eeb..7c3f9de4f7 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/Example1.java @@ -6,8 +6,8 @@ import java.util.concurrent.Executors; import org.eclipse.jetty.client.HttpClient; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.BigdataStatics; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java index 5910ecd9af..53b88b027e 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/IGOMProxy.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.net.URL; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java index d5f3ce6597..c6dc8b161f 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/LocalGOMTestCase.java @@ -37,10 +37,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java index e292d706cd..97f01ff92b 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/ProxyGOMTest.java @@ -7,12 +7,12 @@ import java.net.URL; import java.util.Iterator; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java index 36aa32d7a8..a00f96906b 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/RemoteGOMTestCase.java @@ -44,10 +44,10 @@ import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.om.IObjectManager; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java index 42c5fa5118..d4dcfc231d 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGOM.java @@ -36,12 +36,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.BasicSkin; import com.bigdata.gom.gpo.GPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java index 2a118172cc..3014c64b3a 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestGPO.java @@ -31,12 +31,12 @@ import junit.framework.Test; import junit.framework.TestCase; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; import com.bigdata.gom.gpo.ILinkSet; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java index bcc750b3a7..c05261bc14 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java @@ -2,8 +2,8 @@ import java.util.Properties; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParserRegistry; import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.rio.turtle.BigdataTurtleParser; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java index 67c95f9c3d..454e9e1918 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOWLSkin.java @@ -32,9 +32,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.alchemy.owl.OWLClassSkin; import com.bigdata.gom.alchemy.owl.OWLOntologySkin; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java index 94ae3510f3..3270af19a8 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestOwlGOM.java @@ -36,13 +36,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java index 35e4426a26..b7d02888fe 100644 --- a/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java +++ b/bigdata-core-test/bigdata-gom/src/test/com/bigdata/gom/TestRemoteGOM.java @@ -45,12 +45,12 @@ import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.BigdataStatics; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java index 1ad2a4d7c0..b6e1e2c523 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/engine/AbstractQueryEngineTestCase.java @@ -58,8 +58,8 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 package com.bigdata.bop.engine; -import info.aduna.iteration.Iterations; -import info.aduna.text.StringUtil; +import org.eclipse.rdf4j.common.iteration.Iterations; +import org.eclipse.rdf4j.common.text.StringUtil; import java.util.ArrayList; import java.util.Arrays; @@ -77,13 +77,13 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007 import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.util.ModelUtil; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryResultUtil; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.impl.MutableTupleQueryResult; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.util.ModelUtil; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryResultUtil; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java index 203a5231f3..9288e439fd 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinOpTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -61,7 +61,7 @@ import com.bigdata.journal.ITx; import com.bigdata.journal.Journal; import com.bigdata.rdf.internal.IV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.StatementEnum; @@ -131,14 +131,14 @@ public JoinSetup(final String kbNamespace) { { final BigdataValueFactory vf = kb.getValueFactory(); final String uriString = "http://bigdata.com/"; - final BigdataURI _knows = vf.asValue(FOAFVocabularyDecl.knows); - final BigdataURI _brad = vf.createURI(uriString+"brad"); - final BigdataURI _john = vf.createURI(uriString+"john"); - final BigdataURI _fred = vf.createURI(uriString+"fred"); - final BigdataURI _mary = vf.createURI(uriString+"mary"); - final BigdataURI _paul = vf.createURI(uriString+"paul"); - final BigdataURI _leon = vf.createURI(uriString+"leon"); - final BigdataURI _luke = vf.createURI(uriString+"luke"); + final BigdataIRI _knows = vf.asValue(FOAFVocabularyDecl.knows); + final BigdataIRI _brad = vf.createURI(uriString+"brad"); + final BigdataIRI _john = vf.createURI(uriString+"john"); + final BigdataIRI _fred = vf.createURI(uriString+"fred"); + final BigdataIRI _mary = vf.createURI(uriString+"mary"); + final BigdataIRI _paul = vf.createURI(uriString+"paul"); + final BigdataIRI _leon = vf.createURI(uriString+"leon"); + final BigdataIRI _luke = vf.createURI(uriString+"luke"); final BigdataValue[] a = new BigdataValue[] { _knows,// diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java index bf2d927e59..b7d442ddbe 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -35,10 +35,10 @@ import junit.framework.TestCase; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; @@ -2695,4 +2695,4 @@ public void test_service04b() { } -} +} diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java index d6de01ff44..e929094d2e 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractAggregationTestCase.java @@ -34,7 +34,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOpContext; import com.bigdata.bop.Bind; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java index 09ebf38ac0..43f7e685c8 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/AbstractDistinctSolutionsTestCase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -35,8 +35,8 @@ import junit.framework.TestCase2; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LiteralImpl; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java index fa511b7974..a53e95cec6 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByRewriter.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.Bind; import com.bigdata.bop.Constant; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java index 9e9ebbcef7..9f7d926949 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestGroupByState.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import junit.framework.TestCase2; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.Bind; import com.bigdata.bop.Constant; diff --git a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java index efad2ee049..acc9bb4b6a 100644 --- a/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java +++ b/bigdata-core-test/bigdata/src/test/com/bigdata/bop/solutions/TestIVComparator.java @@ -30,7 +30,7 @@ import junit.framework.TestCase2; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IV; @@ -44,7 +44,7 @@ import com.bigdata.rdf.internal.impl.literal.XSDNumericIV; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; @@ -101,8 +101,8 @@ private static class V { /* * URIs */ - final IV noninline_uri1 = new TermId(VTE.URI, termId++); - final IV noninline_uri2 = new TermId(VTE.URI, termId++); + final IV noninline_uri1 = new TermId(VTE.URI, termId++); + final IV noninline_uri2 = new TermId(VTE.URI, termId++); /* * Blank nodes. @@ -126,8 +126,8 @@ public V() { } final IDatatypeURIResolver resolver = new IDatatypeURIResolver() { - public BigdataURI resolve(final URI uri) { - final BigdataURI buri = f.createURI(uri.stringValue()); + public BigdataIRI resolve(final URI uri) { + final BigdataIRI buri = f.createURI(uri.stringValue()); buri.setIV(new TermId(VTE.URI,termId++)); return buri; } diff --git a/bigdata-core-test/pom.xml b/bigdata-core-test/pom.xml index e512550f98..de7908e5b7 100644 --- a/bigdata-core-test/pom.xml +++ b/bigdata-core-test/pom.xml @@ -386,6 +386,7 @@ See https://maven.apache.org/plugins/maven-jar-plugin/examples/create-test-jar.h org.eclipse.rdf4j rdf4j-runtime ${rdf4j.version} + pom org.eclipse.rdf4j diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLClassSkin.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLClassSkin.java index 100f42e5b6..e795e90445 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLClassSkin.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLClassSkin.java @@ -25,7 +25,7 @@ import java.util.Iterator; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.gom.gpo.BasicSkin; import com.bigdata.gom.gpo.GPO; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLOntologySkin.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLOntologySkin.java index a1cf8b2948..665bfa1295 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLOntologySkin.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLOntologySkin.java @@ -25,8 +25,8 @@ import java.util.Iterator; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.gom.gpo.BasicSkin; import com.bigdata.gom.gpo.GPO; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLPropertySkin.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLPropertySkin.java index d3b2572f06..6d50f9b9b5 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLPropertySkin.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/alchemy/owl/OWLPropertySkin.java @@ -23,9 +23,9 @@ */ package com.bigdata.gom.alchemy.owl; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.gom.gpo.BasicSkin; import com.bigdata.gom.gpo.IGPO; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/BasicSkin.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/BasicSkin.java index 7364b226ab..eac6f8d248 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/BasicSkin.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/BasicSkin.java @@ -2,11 +2,11 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; /** * The BasicSkin provides standard type wrappers to help with conversions diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/GPO.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/GPO.java index f802f81e77..cf4f677354 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/GPO.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/GPO.java @@ -11,17 +11,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.LiteralImpl; +import org.eclipse.rdf4j.model.impl.StatementImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.gom.om.IObjectManager; import com.bigdata.gom.om.ObjectMgrModel; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/IGPO.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/IGPO.java index 2f7b4b32b9..46bd06f3ad 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/IGPO.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/IGPO.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,10 +27,10 @@ import java.util.Map; import java.util.Set; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.gom.om.IObjectManager; import com.bigdata.gom.skin.GenericSkinRegistry; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/ILinkSet.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/ILinkSet.java index 9c035fd0ea..7e660ceab8 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/ILinkSet.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/ILinkSet.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; /** * A collection of links into (edges in) or links out of (edges out) of an diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/LinkSet.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/LinkSet.java index 83498514ae..8f4ba73d51 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/LinkSet.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/gpo/LinkSet.java @@ -5,10 +5,10 @@ import java.util.Iterator; import java.util.NoSuchElementException; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.gom.om.IObjectManager; import com.bigdata.gom.om.ObjectMgrModel; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IDGenerator.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IDGenerator.java index e3890499b1..696b0bffde 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IDGenerator.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IDGenerator.java @@ -29,8 +29,8 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; /** * Generator for globally unique URIs. diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IIDGenerator.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IIDGenerator.java index b6f771a467..1448e7a564 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IIDGenerator.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IIDGenerator.java @@ -23,7 +23,7 @@ */ package com.bigdata.gom.om; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; /** * The IIDGenerator interface is used to create default object URI diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IObjectManager.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IObjectManager.java index d3d9380498..77d5f89ffd 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IObjectManager.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/IObjectManager.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -32,11 +32,11 @@ import java.util.Map; import java.util.UUID; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.gom.gpo.IGPO; import com.bigdata.rdf.model.BigdataValueFactory; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/NanoSparqlObjectManager.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/NanoSparqlObjectManager.java index 73c77bac42..3428753a79 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/NanoSparqlObjectManager.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/NanoSparqlObjectManager.java @@ -30,11 +30,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.query.BindingSet; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; import com.bigdata.rdf.model.BigdataValueFactoryImpl; import com.bigdata.rdf.sail.Sesame2BigdataIterator; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectManager.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectManager.java index d2f3123b5b..b06a1a0e74 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectManager.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectManager.java @@ -30,16 +30,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Statement; -import org.openrdf.query.BindingSet; -import org.openrdf.query.GraphQuery; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.GraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.repository.RepositoryException; import com.bigdata.bop.engine.QueryEngine; import com.bigdata.bop.fed.QueryEngineFactory; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectMgrModel.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectMgrModel.java index 61c828ea7a..f6be84b378 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectMgrModel.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/om/ObjectMgrModel.java @@ -41,18 +41,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.cache.ConcurrentWeakValueCache; import com.bigdata.gom.gpo.GPO; import com.bigdata.gom.gpo.IGPO; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataBNode; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import cutthecrap.utils.striterators.ICloseableIterator; @@ -92,7 +92,7 @@ public abstract class ObjectMgrModel implements IObjectManager { * This is only for the predicates and provides the guarantee that we can * reference test on predicates within the scope of a given object manager. */ - private final ConcurrentHashMap m_internedKeys = new ConcurrentHashMap(); + private final ConcurrentHashMap m_internedKeys = new ConcurrentHashMap(); /** * We need to maintain a dirty list in order to pin object references that @@ -190,16 +190,16 @@ final public BigdataValueFactory getValueFactory() { * * @return The interned version of the predicate. */ - public BigdataURI internKey(final URI aKey) { + public BigdataIRI internKey(final URI aKey) { // Ensure URI is for the namespace associated with this OM. - final BigdataURI key = m_valueFactory.asValue(aKey); + final BigdataIRI key = m_valueFactory.asValue(aKey); // Internal the URI. - final BigdataURI old = m_internedKeys.putIfAbsent(key, key); + final BigdataIRI old = m_internedKeys.putIfAbsent(key, key); // Resolve data race. - final BigdataURI uri = old != null ? old : key; + final BigdataIRI uri = old != null ? old : key; return uri; diff --git a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/web/GOMWebUtil.java b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/web/GOMWebUtil.java index 7e11b4e0bf..3524b9efc0 100644 --- a/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/web/GOMWebUtil.java +++ b/bigdata-core/bigdata-gom/src/java/com/bigdata/gom/web/GOMWebUtil.java @@ -3,7 +3,7 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryException; import com.bigdata.gom.om.ObjectManager; import com.bigdata.journal.ITx; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/AVERAGE.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/AVERAGE.java index 46e9ccf1c9..abcaa2a51b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/AVERAGE.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/AVERAGE.java @@ -25,9 +25,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/SUM.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/SUM.java index e356125e1d..f81fdc5831 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/SUM.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/SUM.java @@ -25,9 +25,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ChunkedResolutionOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ChunkedResolutionOp.java index e7736e5f72..9cd303848e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ChunkedResolutionOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ChunkedResolutionOp.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java index a50f2d8e88..05fac10cf5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParseOp.java @@ -44,18 +44,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.RDFParser.DatatypeHandling; -import org.openrdf.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java index 26f2ca39f6..135e07cdd3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/BaseAxioms.java @@ -37,7 +37,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.KeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/OwlAxioms.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/OwlAxioms.java index 355097b032..baf7fc28cc 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/OwlAxioms.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/OwlAxioms.java @@ -26,9 +26,9 @@ import java.util.Collection; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataValueFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/RdfsAxioms.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/RdfsAxioms.java index 533f90d0e0..4bd4ed402a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/RdfsAxioms.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/axioms/RdfsAxioms.java @@ -28,8 +28,8 @@ import java.util.Collection; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataValueFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/changesets/InferenceChangeLogReporter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/changesets/InferenceChangeLogReporter.java index 2b9558b63a..9c69a8cdb6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/changesets/InferenceChangeLogReporter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/changesets/InferenceChangeLogReporter.java @@ -4,7 +4,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.rdf.filter.NativeDistinctFilter; import com.bigdata.htree.HTree; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/error/SparqlDynamicErrorException.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/error/SparqlDynamicErrorException.java index 822bf32cdc..cb26e9c7c3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/error/SparqlDynamicErrorException.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/error/SparqlDynamicErrorException.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.error; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.util.NV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java index 0f763ce009..a62a12ee21 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java @@ -8,10 +8,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.sail.Sail; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.sail.Sail; import com.bigdata.btree.BTree; import com.bigdata.btree.IIndex; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASRunner.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASRunner.java index 8bb8d21a6a..17c83f61a1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASRunner.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASRunner.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailConnection; import com.bigdata.Banner; import com.bigdata.journal.BufferMode; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java index 4128998c0c..a9d8bf3fc3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java @@ -7,11 +7,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.graph.IGASEngine; import com.bigdata.rdf.graph.IGASProgram; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java index 6a31a6f94b..dd1622c3be 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java @@ -2,9 +2,9 @@ import java.util.Properties; -import org.openrdf.model.ValueFactory; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.rdf.graph.IGraphAccessor; import com.bigdata.rdf.graph.impl.bd.BigdataGASEngine.BigdataGraphAccessor; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASService.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASService.java index 91a5db11d0..92c85e07f2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASService.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASService.java @@ -34,11 +34,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java index ce0c522601..ba5a6f628d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java @@ -3,7 +3,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.IVUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/PATHS.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/PATHS.java index 57d967a9d5..33529bcf19 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/PATHS.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/PATHS.java @@ -28,10 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IVariable; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler.java index 7ce55b18d9..e55844759a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler.java @@ -24,7 +24,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.graph.IGASScheduler; import com.bigdata.rdf.graph.IGASSchedulerImpl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler2.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler2.java index 86692ecfdf..cb9cfead32 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler2.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/TLScheduler2.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.graph.IGASScheduler; import com.bigdata.rdf.graph.IGASSchedulerImpl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractSPOBuffer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractSPOBuffer.java index acf7f40d34..e83475b14b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractSPOBuffer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractSPOBuffer.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.inf; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.spo.ISPO; import com.bigdata.rdf.spo.ISPOBuffer; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java index a7709d3d13..7b21867a12 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java @@ -5,8 +5,8 @@ import java.io.ObjectInput; import java.io.ObjectOutput; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.spo.ISPO; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java index c57974a54b..8e390f3b51 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTE.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,9 +31,9 @@ import java.math.BigInteger; import java.util.UUID; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.internal.impl.BlobIV; import com.bigdata.rdf.lexicon.LexiconRelation; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEExtension.java index 28bdebb815..178bd5e988 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/DTEExtension.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.impl.AbstractIV; import com.bigdata.rdf.internal.impl.literal.PackedLongIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java index 3c3b453e3b..b1bdb3eb33 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IDatatypeURIResolver.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -24,10 +24,10 @@ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.vocab.Vocabulary; /** @@ -67,6 +67,6 @@ public interface IDatatypeURIResolver { * if the argument is not part of the pre-declared * {@link Vocabulary}. */ - BigdataURI resolve(final URI datatypeURI); + BigdataIRI resolve(final IRI datatypeURI); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java index 27b36d64c1..fdb45dba55 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,12 +26,12 @@ import java.util.Set; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.impl.TermId; import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.vocab.Vocabulary; @@ -51,11 +51,11 @@ public interface IExtension { /** * Return the fully resolved datatype(s) handled by this interface in the - * form of a {@link BigdataURI} with the {@link TermId} already set. + * form of a {@link BigdataIRI} with the {@link TermId} already set. * * @return the datatype */ - Set getDatatypes(); + Set getDatatypes(); /** * Create an {@link LiteralExtensionIV} from an RDF value. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java index 0a2f225623..fff0092555 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java @@ -26,10 +26,10 @@ import java.util.Iterator; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.impl.BlobIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; /** @@ -51,7 +51,7 @@ public interface IExtensionFactory { * * @param resolver * The interface used to resolve an {@link URI} to an - * {@link BigdataURI}. + * {@link BigdataIRI}. * @param config * The {@link ILexiconConfiguration}. */ diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IInlineURIFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IInlineURIFactory.java index 224e5772cc..072fc7592d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IInlineURIFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IInlineURIFactory.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.uri.URIExtensionIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java index 6dcbd4ae8d..f7246a0967 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,8 +26,8 @@ import java.util.TimeZone; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.constraints.IMathOpHandler; import com.bigdata.rdf.internal.impl.AbstractInlineExtensionIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java index 986dcb4cb2..8dd3641bc5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,10 +29,10 @@ import java.io.Serializable; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.rdf.internal.impl.TermId; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVCache.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVCache.java index fb313f2a80..48700cae97 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVCache.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVCache.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.internal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java index cb4bcb3a1d..2ff3a34923 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java @@ -39,8 +39,8 @@ import java.util.List; import java.util.UUID; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.KeyBuilder; @@ -79,7 +79,7 @@ import com.bigdata.rdf.lexicon.TermIdEncoder; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.StatementEnum; import com.bigdata.rdf.spo.ISPO; import com.bigdata.rdf.spo.SPOKeyOrder; @@ -367,7 +367,7 @@ public static IV decodeFromOffset(final byte[] key, final int offset, // TODO Should really be switch((int)extensionByte). switch (AbstractIV.getInternalValueTypeEnum(flags)) { case URI: - return new PartlyInlineURIIV(delegate, + return new PartlyInlineURIIV(delegate, extensionIV); case LITERAL: return new PartlyInlineTypedLiteralIV(delegate, @@ -534,7 +534,7 @@ static private IV decodeInlineURI(final byte flags, final byte[] key, (AbstractLiteralIV) decodeFromOffset( key, o); - final IV iv = new URIExtensionIV(localNameIV, + final IV iv = new URIExtensionIV(localNameIV, namespaceIV); return iv; @@ -558,11 +558,11 @@ static private IV decodeInlineURI(final byte flags, final byte[] key, // } case XSDByte: { final byte x = key[o];//KeyBuilder.decodeByte(key[o]); - return new VocabURIByteIV(x); + return new VocabURIByteIV(x); } case XSDShort: { final short x = KeyBuilder.decodeShort(key, o); - return new VocabURIShortIV(x); + return new VocabURIShortIV(x); } case XSDString: { // decode buffer. @@ -578,7 +578,7 @@ static private IV decodeInlineURI(final byte flags, final byte[] key, } catch (IOException e) { throw new RuntimeException(e); } - return new FullyInlineURIIV(new URIImpl(str1), + return new FullyInlineURIIV(new URIImpl(str1), 1/* flags */+ nbytes); } default: diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIFactory.java index e7ff436258..603e9d4a6d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIFactory.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.TreeMap; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.uri.URIExtensionIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIHandler.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIHandler.java index 1003cc26b8..678ae9cbdb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIHandler.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/InlineURIHandler.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.uri.URIExtensionIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java index c5f4083d6a..3bf463aca3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java @@ -42,12 +42,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.constraints.DateTimeUtility; import com.bigdata.rdf.internal.constraints.IMathOpHandler; @@ -76,7 +76,7 @@ import com.bigdata.rdf.lexicon.LexiconKeyOrder; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueSerializer; @@ -427,7 +427,7 @@ public void initExtensions(final IDatatypeURIResolver resolver) { final IExtension extension = itr.next(); // final BigdataURI datatype = extension.getDatatype(); - for (BigdataURI datatype : extension.getDatatypes()) { + for (BigdataIRI datatype : extension.getDatatypes()) { if (datatype == null) continue; @@ -554,7 +554,7 @@ public IV createInlineIV(final Value value) { * can not be inlined into the statement indices. */ @SuppressWarnings("unchecked") - private IV createInlineURIIV(final URI value) { + private IV createInlineURIIV(final URI value) { // deprecated in favor of the extensible InlineURIFactory mechanism // try { @@ -592,7 +592,7 @@ public IV createInlineIV(final Value value) { if (value.stringValue().length() <= maxInlineTextLength) { - return new FullyInlineURIIV(value); + return new FullyInlineURIIV(value); } @@ -602,7 +602,7 @@ public IV createInlineIV(final Value value) { final String namespace = ((URI) value).getNamespace(); - final IV namespaceIV = vocab.get(new URIImpl(namespace)); + final IV namespaceIV = vocab.get(new URIImpl(namespace)); if (namespaceIV != null) { @@ -610,7 +610,7 @@ public IV createInlineIV(final Value value) { new FullyInlineTypedLiteralIV( localName); - return new URIExtensionIV(localNameIV, namespaceIV); + return new URIExtensionIV(localNameIV, namespaceIV); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoInlineURIFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoInlineURIFactory.java index 35204220b8..5d696e722c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoInlineURIFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoInlineURIFactory.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.uri.URIExtensionIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoSuchVocabularyItem.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoSuchVocabularyItem.java index b3818b7ab8..203b4a9aa2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoSuchVocabularyItem.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/NoSuchVocabularyItem.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java index 65e550cc44..282510a329 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/VTE.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,22 +27,22 @@ package com.bigdata.rdf.internal; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.impl.AbstractIV; /** * Value Type Enumeration (IVTE) is a class with methods for interpreting and - * setting the bit flags used to identify the type of an RDF Value (URI, + * setting the bit flags used to identify the type of an RDF Value (IRI, * Literal, Blank Node, SID, etc). */ public enum VTE { - /** A URI. */ - URI((byte) 0x00), + /** A IRI. */ + IRI((byte) 0x00), /** A blank node. */ BNODE((byte) 0x01), @@ -84,14 +84,14 @@ final public byte v() { */ static public VTE valueOf(final byte b) { /* - * Note: Java does not permit the construction URI.v in the cases of the + * Note: Java does not permit the construction IRI.v in the cases of the * switch (it is not interpreted as a constant). Therefore the switch * cases are hard wired to the values specified for each of the 4 RDF * Value types above. */ switch (b & 0x03) { // mask off everything but the low 2 bits. case 0x00: - return URI; + return IRI; case 0x01: return BNODE; case 0x02: @@ -108,7 +108,7 @@ static public VTE valueOf(final byte b) { * This is used in various internal toString() implementations. */ public final char getCharCode() { - if (v == URI.v) + if (v == IRI.v) return 'U'; else if (v == LITERAL.v) return 'L'; @@ -122,7 +122,7 @@ else if (v == STATEMENT.v) static public final VTE valueOf(char c) { switch(c) { case 'U': - return URI; + return IRI; case 'L': return LITERAL; case 'B': @@ -135,11 +135,11 @@ static public final VTE valueOf(char c) { } /** - * Determine the VTE based on the type of Value - URI, Literal, or BNode. + * Determine the VTE based on the type of Value - IRI, Literal, or BNode. */ static public final VTE valueOf(final Value v) { - if (v instanceof URI) - return URI; + if (v instanceof IRI) + return IRI; if (v instanceof Literal) return LITERAL; if (v instanceof BNode) diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java index a21dc178de..da6c9a44fd 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSD.java @@ -24,9 +24,9 @@ package com.bigdata.rdf.internal; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * Collects various XSD URIs as constants. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BNodeBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BNodeBOp.java index 8eee0739bd..a777ad25c6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BNodeBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BNodeBOp.java @@ -25,8 +25,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/CompareBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/CompareBOp.java index f1178aa42a..682133265e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/CompareBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/CompareBOp.java @@ -28,10 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.query.algebra.Compare.CompareOp; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ComputedIN.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ComputedIN.java index f4ced088b1..8bb51acfe9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ComputedIN.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ComputedIN.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,7 +25,7 @@ import java.util.Map; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ConcatBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ConcatBOp.java index cac00f8bb3..8f64800f60 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ConcatBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ConcatBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,8 +25,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DatatypeBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DatatypeBOp.java index 761d1fdf7a..0f468ffc0a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DatatypeBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DatatypeBOp.java @@ -28,10 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; @@ -39,7 +39,7 @@ import com.bigdata.rdf.error.SparqlTypeErrorException; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.XSD; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sparql.ast.GlobalAnnotations; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateBOp.java index 64cabec4db..10531e8ce0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateBOp.java @@ -31,11 +31,11 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.function.datetime.Timezone; -import org.openrdf.query.algebra.evaluation.function.datetime.Tz; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.function.datetime.Timezone; +import org.eclipse.rdf4j.query.algebra.evaluation.function.datetime.Tz; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateTimeUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateTimeUtility.java index 0af58c181d..d5b2da128d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateTimeUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateTimeUtility.java @@ -4,10 +4,10 @@ import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.bigdata.rdf.error.SparqlTypeErrorException; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DigestBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DigestBOp.java index 577e761d7a..01afcaecb4 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DigestBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DigestBOp.java @@ -26,8 +26,8 @@ import java.security.MessageDigest; import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EBVBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EBVBOp.java index 7c4c7914f5..c91cdb3241 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EBVBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EBVBOp.java @@ -26,9 +26,9 @@ import java.util.Map; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EncodeForURIBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EncodeForURIBOp.java index 20818c9605..14c0a641ca 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EncodeForURIBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/EncodeForURIBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ import java.net.URLEncoder; import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/FuncBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/FuncBOp.java index 6932cbefdf..a20c64d044 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/FuncBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/FuncBOp.java @@ -28,10 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.function.Function; -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.query.algebra.evaluation.function.FunctionRegistry; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IMathOpHandler.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IMathOpHandler.java index cde487820b..92b3c410a4 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IMathOpHandler.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IMathOpHandler.java @@ -1,6 +1,6 @@ package com.bigdata.rdf.internal.constraints; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.constraints.MathBOp.MathOp; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IVValueExpression.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IVValueExpression.java index 125fa1f117..7be411745d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IVValueExpression.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IVValueExpression.java @@ -26,8 +26,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.AbstractAccessPathOp; import com.bigdata.bop.BOp; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IriBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IriBOp.java index ac7bdcf66a..3bd3196403 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IriBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IriBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,9 +25,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; @@ -37,7 +37,7 @@ import com.bigdata.rdf.error.SparqlTypeErrorException; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.XSD; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.GlobalAnnotations; /** @@ -103,7 +103,7 @@ public IV get(final IBindingSet bs) throws SparqlTypeErrorException { // final BigdataURI uri = getValueFactory().createURI(baseURI+lit.getLabel()); - BigdataURI uri = null; + BigdataIRI uri = null; try { uri = getValueFactory().createURI(lit.getLabel()); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java index aec94ebd97..53f6783952 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangBOp.java @@ -26,7 +26,7 @@ import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java index 81d1c8ef5b..85c2fe5de9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LangMatchesBOp.java @@ -26,8 +26,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LcaseBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LcaseBOp.java index 8ae73603e7..b4c2d444eb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LcaseBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/LcaseBOp.java @@ -1,6 +1,6 @@ /* -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,7 +26,7 @@ import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathBOp.java index 8070fc2222..2fea8e4c36 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathBOp.java @@ -36,7 +36,7 @@ Copyright Aduna (http://www.aduna-software.com/) (c) 1997-2007. import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; @@ -88,7 +88,7 @@ public enum MathOp { CEIL, FLOOR; - public static MathOp valueOf(org.openrdf.query.algebra.MathExpr.MathOp op) { + public static MathOp valueOf(org.eclipse.rdf4j.query.algebra.MathExpr.MathOp op) { switch(op) { case PLUS: return MathOp.PLUS; case MINUS: return MathOp.MINUS; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathUtility.java index 9f3169e5e4..efcca946ca 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/MathUtility.java @@ -4,10 +4,10 @@ import java.math.BigInteger; import java.math.RoundingMode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.bigdata.rdf.error.SparqlTypeErrorException; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NumericBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NumericBOp.java index e5cfef1d03..fd293b2195 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NumericBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NumericBOp.java @@ -27,9 +27,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/RegexBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/RegexBOp.java index 5d948afef4..5c23c4b968 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/RegexBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/RegexBOp.java @@ -29,9 +29,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ReplaceBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ReplaceBOp.java index eb69b55143..e537c784b9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ReplaceBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ReplaceBOp.java @@ -29,11 +29,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SameTermBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SameTermBOp.java index bc24047c33..a7903be285 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SameTermBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SameTermBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,10 +26,10 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrAfterBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrAfterBOp.java index cb1f83bf76..9a130c2cfb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrAfterBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrAfterBOp.java @@ -26,9 +26,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBOp.java index 26b1ffb411..4bdb6552f2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBOp.java @@ -28,9 +28,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBeforeBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBeforeBOp.java index 8f25d37110..7a44499b61 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBeforeBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBeforeBOp.java @@ -26,9 +26,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrdtBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrdtBOp.java index c98cdecb21..00c6987ac1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrdtBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrdtBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,9 +25,9 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; @@ -37,7 +37,7 @@ import com.bigdata.rdf.internal.NotMaterializedException; import com.bigdata.rdf.internal.XSD; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.GlobalAnnotations; public class StrdtBOp extends IVValueExpression implements INeedsMaterialization { @@ -77,7 +77,7 @@ public IV get(final IBindingSet bs) throws SparqlTypeErrorException { if (!datatype.isURI()) throw new SparqlTypeErrorException(); - final BigdataURI dt = (BigdataURI) asValue(datatype); + final BigdataIRI dt = (BigdataIRI) asValue(datatype); final Literal lit = asLiteral(iv); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlangBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlangBOp.java index 33df100cbe..c587336108 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlangBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlangBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,8 +25,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlenBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlenBOp.java index 8404952e7d..740ccdced9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlenBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlenBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,7 +26,7 @@ import java.math.BigInteger; import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SubstrBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SubstrBOp.java index af29aaaaf5..acd409b01f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SubstrBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/SubstrBOp.java @@ -1,6 +1,6 @@ /* -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -26,8 +26,8 @@ import java.util.Map; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UUIDBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UUIDBOp.java index 22ebd23634..b85b585dae 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UUIDBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UUIDBOp.java @@ -39,7 +39,7 @@ import com.bigdata.bop.NV; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sparql.ast.DummyConstantNode; import com.bigdata.rdf.sparql.ast.FilterNode; @@ -106,7 +106,7 @@ final public IV get(final IBindingSet bs) { } else { - final BigdataURI uri = vf.createURI("urn:uuid:" + uuid.toString()); + final BigdataIRI uri = vf.createURI("urn:uuid:" + uuid.toString()); return DummyConstantNode.toDummyIV(uri); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UcaseBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UcaseBOp.java index 679d33c2f1..20d360c8ca 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UcaseBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UcaseBOp.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,7 +25,7 @@ import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdLongBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdLongBOp.java index fc6a62aeda..029736a245 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdLongBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdLongBOp.java @@ -31,8 +31,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdStrBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdStrBOp.java index 2b95721f66..215758b45f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdStrBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdStrBOp.java @@ -28,9 +28,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdUnsignedLongBOp.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdUnsignedLongBOp.java index 56ab94a696..532fa57685 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdUnsignedLongBOp.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/XsdUnsignedLongBOp.java @@ -32,8 +32,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoder.java index ec02c58b6c..a25578cf52 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoder.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,8 +30,8 @@ import java.util.Iterator; import java.util.LinkedHashSet; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoderWithIVCache.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoderWithIVCache.java index c8a2981178..6d1e399348 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoderWithIVCache.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVBindingSetEncoderWithIVCache.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -34,7 +34,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVSolutionSetEncoder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVSolutionSetEncoder.java index 0d9305a5b3..b102a5b2b2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVSolutionSetEncoder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/encoder/IVSolutionSetEncoder.java @@ -36,7 +36,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IConstant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractIV.java index 98819f84ca..29ede6fea9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,8 +30,8 @@ import java.io.IOException; import java.util.UUID; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.KeyBuilder; @@ -62,7 +62,7 @@ import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV; import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV; import com.bigdata.rdf.lexicon.ITermIndexCodes; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; /** @@ -721,7 +721,7 @@ public IKeyBuilder encode(final IKeyBuilder keyBuilder) { if(isExtension()) { @SuppressWarnings("unchecked") - final URIExtensionIV extension = (URIExtensionIV) this; + final URIExtensionIV extension = (URIExtensionIV) this; // The namespaceIV (a Vocabulary item). IVUtility.encode(keyBuilder, extension.getExtensionIV()); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractNonInlineIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractNonInlineIV.java index ddde81a477..83045d42bf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractNonInlineIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractNonInlineIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,10 +29,10 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/BlobIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/BlobIV.java index f6a9616fcf..7e3d294f28 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/BlobIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/BlobIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,10 +23,10 @@ */ package com.bigdata.rdf.internal.impl; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.rdf.internal.DTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/TermId.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/TermId.java index 7165d81d3c..0bb9e3c8d7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/TermId.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/TermId.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,10 +23,10 @@ */ package com.bigdata.rdf.internal.impl; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.KeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/AbstractBNodeIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/AbstractBNodeIV.java index fc403c3e07..9a8b5f4659 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/AbstractBNodeIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/AbstractBNodeIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,9 +23,9 @@ */ package com.bigdata.rdf.internal.impl.bnode; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.VTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/FullyInlineUnicodeBNodeIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/FullyInlineUnicodeBNodeIV.java index 77e405e620..5b42477451 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/FullyInlineUnicodeBNodeIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/FullyInlineUnicodeBNodeIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.internal.impl.bnode; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IInlineUnicode; @@ -173,4 +173,4 @@ public boolean needsMaterialization() { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/NumericBNodeIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/NumericBNodeIV.java index 2642a42543..7c6221b736 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/NumericBNodeIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/NumericBNodeIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.internal.impl.bnode; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; @@ -135,4 +135,4 @@ public boolean needsMaterialization() { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/SidIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/SidIV.java index 5910fa661f..b51a0abc04 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/SidIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/SidIV.java @@ -31,8 +31,8 @@ import java.io.Serializable; import java.math.BigInteger; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.KeyBuilder; @@ -47,7 +47,7 @@ import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataResource; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.StatementEnum; @@ -178,7 +178,7 @@ public V asValue(final LexiconRelation lex) { bnode.setStatement(lex.getValueFactory().createStatement( (BigdataResource) spo.s().asValue(lex), - (BigdataURI) spo.p().asValue(lex), + (BigdataIRI) spo.p().asValue(lex), (BigdataValue) spo.o().asValue(lex), c)); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/UUIDBNodeIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/UUIDBNodeIV.java index 9f225d1760..0381baea62 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/UUIDBNodeIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/bnode/UUIDBNodeIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,7 +25,7 @@ import java.util.UUID; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; @@ -132,4 +132,4 @@ public boolean needsMaterialization() { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/CompressedTimestampExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/CompressedTimestampExtension.java index ce3f3956b4..c98101e946 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/CompressedTimestampExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/CompressedTimestampExtension.java @@ -26,17 +26,17 @@ import java.util.Collections; import java.util.Set; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.PackedLongIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; @@ -56,7 +56,7 @@ @SuppressWarnings("rawtypes") public class CompressedTimestampExtension implements IExtension { - private final BigdataURI datatype; + private final BigdataIRI datatype; public static final URI COMPRESSED_TIMESTAMP = new URIImpl("http://www.bigdata.com/rdf/datatype#compressedTimestamp"); @@ -66,7 +66,7 @@ public CompressedTimestampExtension(final IDatatypeURIResolver resolver) { datatype = resolver.resolve(COMPRESSED_TIMESTAMP); } - public Set getDatatypes() { + public Set getDatatypes() { return Collections.singleton(datatype); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DateTimeExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DateTimeExtension.java index 951e53cdc3..345a681c52 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DateTimeExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DateTimeExtension.java @@ -39,10 +39,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; @@ -51,7 +51,7 @@ import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.XSDNumericIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.store.AbstractTripleStore; @@ -68,7 +68,7 @@ public class DateTimeExtension implements IExtension private static final transient Logger log = LogManager.getLogger(DateTimeExtension.class); - private final Map datatypes; + private final Map datatypes; private final TimeZone defaultTZ; @@ -76,7 +76,7 @@ public DateTimeExtension(final IDatatypeURIResolver resolver, final TimeZone defaultTZ) { // this.dateTime = resolver.resolve(XSD.DATETIME); - this.datatypes = new LinkedHashMap(); + this.datatypes = new LinkedHashMap(); resolve(resolver, XSD.DATETIME); resolve(resolver, XSD.DATE); resolve(resolver, XSD.TIME); @@ -96,15 +96,15 @@ private void resolve(final IDatatypeURIResolver resolver, final URI uri) { log.debug("resolving: " + uri); } - final BigdataURI val = resolver.resolve(uri); + final BigdataIRI val = resolver.resolve(uri); datatypes.put(val.getIV(), val); } @Override - public Set getDatatypes() { + public Set getDatatypes() { - return new LinkedHashSet(datatypes.values()); + return new LinkedHashSet(datatypes.values()); } @@ -183,8 +183,8 @@ public LiteralExtensionIV createIV(final long timestamp, final URI dt) { if (dt == null) throw new IllegalArgumentException(); - BigdataURI resolvedDT = null; - for (BigdataURI val : datatypes.values()) { + BigdataIRI resolvedDT = null; + for (BigdataIRI val : datatypes.values()) { // Note: URI.stringValue() is efficient.... if (val.stringValue().equals(dt.stringValue())) { resolvedDT = val; @@ -224,7 +224,7 @@ public V asValue(final LiteralExtensionIV iv, final BigdataValueFactory vf) { try { - final BigdataURI dt = datatypes.get(iv.getExtensionIV()); + final BigdataIRI dt = datatypes.get(iv.getExtensionIV()); final DatatypeFactory f = datatypeFactorySingleton; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DerivedNumericsExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DerivedNumericsExtension.java index 493fb8a1c2..278fa81167 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DerivedNumericsExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/DerivedNumericsExtension.java @@ -32,10 +32,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; @@ -44,7 +44,7 @@ import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.XSDIntegerIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; @@ -63,11 +63,11 @@ public class DerivedNumericsExtension implements IExtens private static final transient Logger log = LogManager.getLogger(DerivedNumericsExtension.class); - private final Map datatypes; + private final Map datatypes; public DerivedNumericsExtension(final IDatatypeURIResolver resolver) { - this.datatypes = new LinkedHashMap(); + this.datatypes = new LinkedHashMap(); resolve(resolver, XSD.POSITIVE_INTEGER); resolve(resolver, XSD.NEGATIVE_INTEGER); resolve(resolver, XSD.NON_POSITIVE_INTEGER); @@ -81,14 +81,14 @@ private void resolve(final IDatatypeURIResolver resolver, final URI uri) { log.debug("resolving: " + uri); } - final BigdataURI val = resolver.resolve(uri); + final BigdataIRI val = resolver.resolve(uri); datatypes.put(val.getIV(), val); } - public Set getDatatypes() { + public Set getDatatypes() { - return new LinkedHashSet(datatypes.values()); + return new LinkedHashSet(datatypes.values()); } @@ -110,8 +110,8 @@ public LiteralExtensionIV createIV(final Value value) { final String dts = dt.stringValue(); - BigdataURI resolvedDT = null; - for (BigdataURI val : datatypes.values()) { + BigdataIRI resolvedDT = null; + for (BigdataIRI val : datatypes.values()) { // Note: URI.stringValue() is efficient.... if (val.stringValue().equals(dts)) { resolvedDT = val; @@ -160,7 +160,7 @@ public V asValue(final LiteralExtensionIV iv, final BigdataValueFactory vf) { final BigInteger bi = iv.getDelegate().integerValue(); - final BigdataURI dt = datatypes.get(iv.getExtensionIV()); + final BigdataIRI dt = datatypes.get(iv.getExtensionIV()); final String s = bi.toString(); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/GeoSpatialLiteralExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/GeoSpatialLiteralExtension.java index b42f9574d4..69c5c6ab84 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/GeoSpatialLiteralExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/GeoSpatialLiteralExtension.java @@ -33,8 +33,8 @@ import java.util.Properties; import java.util.Set; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.DefaultKeyBuilderFactory; import com.bigdata.btree.keys.IKeyBuilder; @@ -45,7 +45,7 @@ import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.XSDIntegerIV; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.service.geospatial.GeoSpatialDatatypeConfiguration; @@ -80,7 +80,7 @@ public class GeoSpatialLiteralExtension implements IExte private final IGeoSpatialLiteralSerializer litSerializer; - private final BigdataURI datatype; + private final BigdataIRI datatype; private final GeoSpatialDatatypeConfiguration datatypeConfig; @@ -95,7 +95,7 @@ public class GeoSpatialLiteralExtension implements IExte public GeoSpatialLiteralExtension( final IDatatypeURIResolver resolver, final GeoSpatialDatatypeConfiguration config) { - this.datatype = resolver.resolve(config.getUri()); + this.datatype = resolver.resolve(config.getIri()); this.datatypeConfig = config; this.litSerializer = config.getLiteralSerializer(); this.kbfactory = new DefaultKeyBuilderFactory(new Properties()); @@ -106,9 +106,9 @@ private IKeyBuilder getKeyBuilder() { } @Override - public Set getDatatypes() { + public Set getDatatypes() { - final HashSet datatypes = new LinkedHashSet(); + final HashSet datatypes = new LinkedHashSet(); datatypes.add(datatype); return datatypes; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/USDFloatExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/USDFloatExtension.java index 09e987695d..bdfc5adcb3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/USDFloatExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/USDFloatExtension.java @@ -27,9 +27,9 @@ import java.util.Collections; import java.util.Set; -import org.openrdf.model.Literal; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; @@ -37,7 +37,7 @@ import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.XSDNumericIV; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.vocab.decls.BSBMVocabularyDecl; @@ -50,7 +50,7 @@ @SuppressWarnings("rawtypes") public class USDFloatExtension implements IExtension { - private final BigdataURI datatype; + private final BigdataIRI datatype; public USDFloatExtension(final IDatatypeURIResolver resolver) { @@ -58,7 +58,7 @@ public USDFloatExtension(final IDatatypeURIResolver resolver) { } - public Set getDatatypes() { + public Set getDatatypes() { return Collections.singleton(datatype); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/XSDStringExtension.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/XSDStringExtension.java index c6f4942c3c..31ce61b131 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/XSDStringExtension.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/extensions/XSDStringExtension.java @@ -27,9 +27,9 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; @@ -37,7 +37,7 @@ import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; import com.bigdata.rdf.internal.impl.literal.FullyInlineTypedLiteralIV; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; @@ -47,7 +47,7 @@ */ public class XSDStringExtension implements IExtension { - private final BigdataURI xsdStringURI; + private final BigdataIRI xsdStringURI; private final int maxInlineStringLength; public XSDStringExtension(final IDatatypeURIResolver resolver, @@ -65,9 +65,9 @@ public XSDStringExtension(final IDatatypeURIResolver resolver, } - public Set getDatatypes() { + public Set getDatatypes() { - final Set datatypes = new LinkedHashSet(); + final Set datatypes = new LinkedHashSet(); datatypes.add(xsdStringURI); return datatypes; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/AbstractLiteralIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/AbstractLiteralIV.java index 363cc20d0d..2f240a246e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/AbstractLiteralIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/AbstractLiteralIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -28,10 +28,10 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/FullyInlineTypedLiteralIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/FullyInlineTypedLiteralIV.java index 1c021924ef..a5522d85df 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/FullyInlineTypedLiteralIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/FullyInlineTypedLiteralIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -24,9 +24,9 @@ package com.bigdata.rdf.internal.impl.literal; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IInlineUnicode; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/IPv4AddrIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/IPv4AddrIV.java index 0b35d67e38..a6198c1eaf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/IPv4AddrIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/IPv4AddrIV.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.DTEExtension; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralArrayIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralArrayIV.java index 803f8a128e..1c3951eab9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralArrayIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralArrayIV.java @@ -24,7 +24,7 @@ import java.util.Arrays; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.btree.keys.KeyBuilder; import com.bigdata.rdf.internal.DTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralExtensionIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralExtensionIV.java index d7a3a2fbf6..ecb8fae897 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralExtensionIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/LiteralExtensionIV.java @@ -5,8 +5,8 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.DTEExtension; @@ -19,7 +19,7 @@ import com.bigdata.rdf.internal.impl.AbstractInlineExtensionIV; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; /** * Class provides support for datatype {@link Literal}s for which an @@ -47,7 +47,7 @@ public class LiteralExtensionIV private final AbstractLiteralIV delegate; - private final IV datatype; + private final IV datatype; /** * {@inheritDoc} @@ -76,7 +76,7 @@ public IV clone(final boolean clearCache) { public LiteralExtensionIV( final AbstractLiteralIV delegate, - final IV datatype) { + final IV datatype) { super(VTE.LITERAL, true/*extension*/, delegate.getDTE()); @@ -85,7 +85,7 @@ public LiteralExtensionIV( this.delegate = delegate; - this.datatype = (AbstractIV) datatype; + this.datatype = (AbstractIV) datatype; } @@ -118,7 +118,7 @@ public DTEExtension getDTEX() { * Extension IV is the datatype for this literal. */ @Override - public IV getExtensionIV() { + public IV getExtensionIV() { return datatype; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/MockedValueIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/MockedValueIV.java index 78b4b5d161..dba8f61eb7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/MockedValueIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/MockedValueIV.java @@ -25,7 +25,7 @@ */ package com.bigdata.rdf.internal.impl.literal; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.btree.keys.KeyBuilder; import com.bigdata.rdf.internal.DTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/NumericIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/NumericIV.java index 4b0de73938..323573e575 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/NumericIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/NumericIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,8 +29,8 @@ import java.util.HashSet; import java.util.Set; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.XSD; @@ -71,4 +71,4 @@ public NumericIV(final DTE dte) { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PackedLongIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PackedLongIV.java index 9eaeba12f9..602f3ade88 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PackedLongIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PackedLongIV.java @@ -26,9 +26,9 @@ import java.math.BigDecimal; import java.math.BigInteger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.io.LongPacker; import com.bigdata.rdf.internal.DTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PartlyInlineTypedLiteralIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PartlyInlineTypedLiteralIV.java index d7614fba55..f2784d6574 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PartlyInlineTypedLiteralIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/PartlyInlineTypedLiteralIV.java @@ -5,9 +5,9 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.INonInlineExtensionCodes; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/UUIDLiteralIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/UUIDLiteralIV.java index 1bdc35c190..5264a6dfbf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/UUIDLiteralIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/UUIDLiteralIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -25,8 +25,8 @@ import java.util.UUID; -import org.openrdf.model.Literal; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.ValueFactory; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; @@ -126,4 +126,4 @@ public int _compareTo(IV o) { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDBooleanIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDBooleanIV.java index 56e9fe493a..8970423a41 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDBooleanIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDBooleanIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -24,7 +24,7 @@ package com.bigdata.rdf.internal.impl.literal; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; @@ -175,4 +175,4 @@ public int _compareTo(IV o) { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDDecimalIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDDecimalIV.java index 98ed19e9a9..ba6ca56f4c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDDecimalIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDDecimalIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ import java.math.BigDecimal; import java.math.BigInteger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.btree.keys.KeyBuilder; import com.bigdata.rdf.internal.DTE; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDIntegerIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDIntegerIV.java index f0ec497f2e..fe340dabf3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDIntegerIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDIntegerIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ import java.math.BigDecimal; import java.math.BigInteger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.btree.keys.KeyBuilder; import com.bigdata.rdf.internal.DTE; @@ -182,4 +182,4 @@ public int _compareTo(IV o) { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDNumericIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDNumericIV.java index 62a7e427f2..aa5d95b63f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDNumericIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/literal/XSDNumericIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ import java.math.BigDecimal; import java.math.BigInteger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; @@ -302,4 +302,4 @@ public int byteLength() { } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/FullyInlineURIIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/FullyInlineURIIV.java index ebf8053fd9..a2167442cb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/FullyInlineURIIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/FullyInlineURIIV.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -24,8 +24,8 @@ package com.bigdata.rdf.internal.impl.uri; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IInlineUnicode; @@ -34,7 +34,7 @@ import com.bigdata.rdf.internal.VTE; import com.bigdata.rdf.internal.impl.AbstractInlineIV; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; /** @@ -42,7 +42,7 @@ * class is mainly targeted at inlining at fully inlining URIs in scale-out * (which can be an attractive option). */ -public class FullyInlineURIIV extends AbstractInlineIV +public class FullyInlineURIIV extends AbstractInlineIV implements IInlineUnicode, URI { /** diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/PartlyInlineURIIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/PartlyInlineURIIV.java index da61c938dc..df17765911 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/PartlyInlineURIIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/PartlyInlineURIIV.java @@ -1,6 +1,6 @@ package com.bigdata.rdf.internal.impl.uri; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.INonInlineExtensionCodes; import com.bigdata.rdf.internal.IV; @@ -8,7 +8,7 @@ import com.bigdata.rdf.internal.impl.AbstractNonInlineExtensionIVWithDelegateIV; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; /** * A {@link URI} modeled as a namespace {@link IV} plus an inline Unicode @@ -18,7 +18,7 @@ * @version $Id$ * @param */ -public class PartlyInlineURIIV extends +public class PartlyInlineURIIV extends AbstractNonInlineExtensionIVWithDelegateIV { /** diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/URIExtensionIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/URIExtensionIV.java index bd9c69fcb7..11867c79fc 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/URIExtensionIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/URIExtensionIV.java @@ -1,7 +1,7 @@ package com.bigdata.rdf.internal.impl.uri; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.ILexiconConfiguration; import com.bigdata.rdf.internal.IV; @@ -11,7 +11,7 @@ import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.vocab.Vocabulary; @@ -26,7 +26,7 @@ * @author Bryan Thompson * @param */ -public class URIExtensionIV +public class URIExtensionIV extends AbstractInlineExtensionIV implements URI { @@ -38,7 +38,7 @@ public class URIExtensionIV /** * The namespace. */ - private final AbstractInlineIV namespaceIV; + private final AbstractInlineIV namespaceIV; /** * The localName. @@ -96,7 +96,7 @@ public URIExtensionIV( this.delegateIV = delegateIV; - this.namespaceIV = (AbstractInlineIV) namespaceIV; + this.namespaceIV = (AbstractInlineIV) namespaceIV; } @@ -124,7 +124,7 @@ public Object getInlineValue() { * Extension IV is the namespace for the {@link URI}. */ @Override - public IV getExtensionIV() { + public IV getExtensionIV() { return namespaceIV; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIByteIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIByteIV.java index c022d1477c..55d990fa1b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIByteIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIByteIV.java @@ -26,8 +26,8 @@ */ package com.bigdata.rdf.internal.impl.uri; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.KeyBuilder; import com.bigdata.rdf.internal.DTE; @@ -35,7 +35,7 @@ import com.bigdata.rdf.internal.VTE; import com.bigdata.rdf.internal.impl.AbstractInlineIV; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.vocab.Vocabulary; @@ -48,7 +48,7 @@ * * @author thompsonbry */ -public class VocabURIByteIV extends AbstractInlineIV +public class VocabURIByteIV extends AbstractInlineIV implements URI { /** @@ -102,7 +102,7 @@ public int _compareTo(final IV o) { final byte v = KeyBuilder.decodeByte(value); final byte v2 = KeyBuilder - .decodeByte(((VocabURIByteIV) o).value); + .decodeByte(((VocabURIByteIV) o).value); return v == v2 ? 0 : v < v2 ? -1 : 1; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIShortIV.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIShortIV.java index 73a145adf6..98e7691cf7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIShortIV.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/VocabURIShortIV.java @@ -26,15 +26,15 @@ */ package com.bigdata.rdf.internal.impl.uri; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.DTE; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.VTE; import com.bigdata.rdf.internal.impl.AbstractInlineIV; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.vocab.Vocabulary; @@ -47,7 +47,7 @@ * * @author thompsonbry */ -public class VocabURIShortIV extends AbstractInlineIV +public class VocabURIShortIV extends AbstractInlineIV implements URI { /** @@ -92,7 +92,7 @@ final public boolean isVocabulary() { @Override public int _compareTo(final IV o) { - final short value2 = ((VocabURIShortIV) o).value; + final short value2 = ((VocabURIShortIV) o).value; return value == value2 ? 0 : value < value2 ? -1 : 1; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveBlobIVsTask.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveBlobIVsTask.java index 84dd509762..da395b5ca1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveBlobIVsTask.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveBlobIVsTask.java @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.IIndex; import com.bigdata.btree.keys.IKeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveTermIVsTask.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveTermIVsTask.java index affb983b49..77c7af5333 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveTermIVsTask.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BatchResolveTermIVsTask.java @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.IIndex; import com.bigdata.btree.keys.IKeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataSubjectCentricFullTextIndex.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataSubjectCentricFullTextIndex.java index 6484f7630c..d278d2213c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataSubjectCentricFullTextIndex.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataSubjectCentricFullTextIndex.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.btree.DefaultTupleSerializer; import com.bigdata.btree.IIndex; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataValueCentricFullTextIndex.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataValueCentricFullTextIndex.java index bdbee5fd75..48768fe100 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataValueCentricFullTextIndex.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BigdataValueCentricFullTextIndex.java @@ -38,9 +38,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.btree.DefaultTupleSerializer; import com.bigdata.btree.IndexMetadata; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsIndexHelper.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsIndexHelper.java index 4bcf217335..747e254d29 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsIndexHelper.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsIndexHelper.java @@ -31,8 +31,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.IIndex; import com.bigdata.btree.IRangeQuery; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsTupleSerializer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsTupleSerializer.java index 6ee6841d46..755bcb65f1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsTupleSerializer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsTupleSerializer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -33,7 +33,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.DefaultTupleSerializer; import com.bigdata.btree.ITuple; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsWriteProc.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsWriteProc.java index d969f2f7cb..0dfbfc14ae 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsWriteProc.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/BlobsWriteProc.java @@ -33,7 +33,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.IIndex; import com.bigdata.btree.keys.IKeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ISubjectCentricTextIndexer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ISubjectCentricTextIndexer.java index f74165c089..b273ca414e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ISubjectCentricTextIndexer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ISubjectCentricTextIndexer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.Locale; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITextIndexer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITextIndexer.java index f8b3b0b57e..7820636076 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITextIndexer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ITextIndexer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,9 +29,10 @@ import java.io.Serializable; import java.util.Locale; +import java.util.Optional; import java.util.concurrent.TimeUnit; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.store.AbstractTripleStore; import com.bigdata.rdf.store.BDS; @@ -111,7 +112,7 @@ public static class FullTextQuery implements Serializable { private static final long serialVersionUID = 4159873519447769476L; final String query; - final String languageCode; + final Optional languageCode; final boolean prefixMatch; final double minCosine; final double maxCosine; @@ -126,7 +127,7 @@ public static class FullTextQuery implements Serializable { public FullTextQuery(final String query) { this( query, - null, + Optional.empty(), BDS.DEFAULT_PREFIX_MATCH, null, BDS.DEFAULT_MATCH_ALL_TERMS, @@ -140,7 +141,7 @@ public FullTextQuery(final String query) { ); } - public FullTextQuery(final String query, final String languageCode, + public FullTextQuery(final String query, final Optional languageCode, final boolean prefixMatch) { this( query, @@ -158,7 +159,7 @@ public FullTextQuery(final String query, final String languageCode, ); } - public FullTextQuery(final String query, final String languageCode, + public FullTextQuery(final String query, final Optional languageCode, final boolean prefixMatch, final String matchRegex, final boolean matchAllTerms, final boolean matchExact) { this( @@ -177,7 +178,7 @@ public FullTextQuery(final String query, final String languageCode, ); } - public FullTextQuery(final String query, final String languageCode, + public FullTextQuery(final String query, final Optional languageCode, final boolean prefixMatch, final String matchRegex, final boolean matchAllTerms, final boolean matchExact, final double minCosine, final double maxCosine, @@ -238,7 +239,7 @@ public FullTextQuery(final String query, final String languageCode, * @param unit * The unit in which the timeout is expressed. */ - public FullTextQuery(final String query, final String languageCode, + public FullTextQuery(final String query, final Optional languageCode, final boolean prefixMatch, final String matchRegex, final boolean matchAllTerms, final boolean matchExact, final double minCosine, final double maxCosine, @@ -270,7 +271,7 @@ public String getQuery() { /** * @return the languageCode */ - public String getLanguageCode() { + public Optional getLanguageCode() { return languageCode; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/IValueCentricTextIndexer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/IValueCentricTextIndexer.java index e9ce016452..e05cdac1ee 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/IValueCentricTextIndexer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/IValueCentricTextIndexer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.Locale; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.store.AbstractTripleStore; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java index f8634cf3ea..1d91792757 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Id2TermTupleSerializer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -33,7 +33,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.DefaultTupleSerializer; import com.bigdata.btree.ITuple; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexPredicate.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexPredicate.java index 1c4246c451..e4432d1056 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexPredicate.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexPredicate.java @@ -25,7 +25,7 @@ import java.util.Map; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java index 35cf454898..f0811a7762 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyBuilder.java @@ -1,10 +1,10 @@ package com.bigdata.rdf.lexicon; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.btree.keys.IKeyBuilderFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyOrder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyOrder.java index 36a8b2e67b..f575e03332 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyOrder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconKeyOrder.java @@ -3,7 +3,7 @@ import java.io.ObjectStreamException; import java.util.Comparator; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.journal.Journal; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java index 7b3c195897..7eda11108e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java @@ -55,12 +55,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.omg.CORBA.portable.ValueFactory; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; @@ -103,7 +103,7 @@ import com.bigdata.rdf.internal.impl.extensions.XSDStringExtension; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; @@ -1622,13 +1622,13 @@ protected Object resolve(final Object arg0) { * * @see IDatatypeURIResolver */ - public BigdataURI resolve(final URI uri) { + public BigdataIRI resolve(final URI uri) { if(uri == null) throw new IllegalArgumentException(); // Turn the caller's argument into a BigdataURI. - final BigdataURI value = valueFactory.asValue(uri); + final BigdataIRI value = valueFactory.asValue(uri); // Lookup against the Vocabulary. final IV iv = vocab.get(value); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java index 01f0c59429..e66b0370ac 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/ReverseIndexWriterTask.java @@ -2,8 +2,8 @@ import java.util.concurrent.Callable; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.IIndex; import com.bigdata.btree.keys.IKeyBuilder; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java index 2a7f806866..b18a55f44c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdTupleSerializer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -32,7 +32,7 @@ import java.io.ObjectOutput; import java.util.Properties; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.btree.DefaultTupleSerializer; import com.bigdata.btree.ITuple; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/AbstractRDFTaskFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/AbstractRDFTaskFactory.java index 596184183f..f58b9a582c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/AbstractRDFTaskFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/AbstractRDFTaskFactory.java @@ -6,8 +6,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.rio.RDFParserOptions; import com.bigdata.rdf.store.AbstractTripleStore; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/IStatementBufferFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/IStatementBufferFactory.java index 9f9c6b5fc8..6963bfdf25 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/IStatementBufferFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/IStatementBufferFactory.java @@ -1,6 +1,6 @@ package com.bigdata.rdf.load; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.rdf.rio.IStatementBuffer; import com.bigdata.rdf.rio.StatementBuffer; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/LoadStatementBufferFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/LoadStatementBufferFactory.java index 1b88f1135f..c17164f9f2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/LoadStatementBufferFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/LoadStatementBufferFactory.java @@ -1,6 +1,6 @@ package com.bigdata.rdf.load; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.rdf.rio.StatementBuffer; import com.bigdata.rdf.spo.ISPO; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFFilenameFilter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFFilenameFilter.java index c09102e744..e6b9e8a0c6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFFilenameFilter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFFilenameFilter.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java index eedbdff371..05c13b561a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java @@ -1,7 +1,7 @@ package com.bigdata.rdf.load; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.counters.CounterSet; import com.bigdata.counters.Instrument; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFVerifyTaskFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFVerifyTaskFactory.java index 21c6ec2dd9..3e357a7ef2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFVerifyTaskFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFVerifyTaskFactory.java @@ -1,7 +1,7 @@ package com.bigdata.rdf.load; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.rio.RDFParserOptions; import com.bigdata.rdf.store.AbstractTripleStore; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/SingleResourceReaderTask.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/SingleResourceReaderTask.java index 64505a709b..763e672128 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/SingleResourceReaderTask.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/SingleResourceReaderTask.java @@ -10,8 +10,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.rdf.rio.IStatementBuffer; import com.bigdata.rdf.rio.LoadStats; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java index aa6b4f0261..879c23692f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/load/VerifyStatementBuffer.java @@ -5,9 +5,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java index e34c59dc21..20b05ab930 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java @@ -5,11 +5,11 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; /** * Class provides a document-scoped context for generating blank node @@ -206,12 +206,12 @@ public BigdataStatement createStatement(Resource s, URI p, Value o, } @Override - public BigdataURI createURI(String namespace, String localName) { + public BigdataIRI createURI(String namespace, String localName) { return valueFactory.createURI(namespace, localName); } @Override - public BigdataURI createURI(String uriString) { + public BigdataIRI createURI(String uriString) { return valueFactory.createURI(uriString); } @@ -221,12 +221,12 @@ public BigdataValueSerializer getValueSerializer() { } @Override - public BigdataURI getLangStringURI() { + public BigdataIRI getLangStringURI() { return valueFactory.getLangStringURI(); } @Override - public BigdataURI getXSDStringURI() { + public BigdataIRI getXSDStringURI() { return valueFactory.getXSDStringURI(); } @@ -244,7 +244,7 @@ public BigdataResource asValue(Resource v) { } @Override - public BigdataURI asValue(URI v) { + public BigdataIRI asValue(URI v) { return valueFactory.asValue(v); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java index e923bb58d7..388634fdc3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; /** * A {@link BNode} that exposes the internal term identifier. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java index cbbfbc2de0..3378584ee0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.BNode; +import org.eclipse.rdf4j.model.BNode; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.impl.bnode.SidIV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURI.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataIRI.java similarity index 88% rename from bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURI.java rename to bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataIRI.java index dff108df27..0e9235dbe8 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURI.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataIRI.java @@ -47,25 +47,25 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** - * A {@link URI} that exposes the internal term identifier. + * A {@link IRI} that exposes the internal term identifier. * * @author Bryan Thompson * @version $Id$ */ -public interface BigdataURI extends URI, BigdataResource { +public interface BigdataIRI extends IRI, BigdataResource { /** * Return the length of the value that would be returned by - * {@link URI#getNamespace()}. + * {@link IRI#getNamespace()}. */ int getNamespaceLength(); /** * Return the length of the value that would be returned by - * {@link URI#getLocalName()}. + * {@link IRI#getLocalName()}. */ int getLocalNameLength(); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteral.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteral.java index b4a0bee8de..ec1167f6e3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteral.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteral.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; /** * A {@link Literal} that exposes the internal term identifier. @@ -60,6 +60,6 @@ public interface BigdataLiteral extends Literal, BigdataValue { /** * Specialized return type. */ - public BigdataURI getDatatype(); + public BigdataIRI getDatatype(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java index 293b6a98bf..30dc3a0e66 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataLiteralImpl.java @@ -49,13 +49,14 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. import java.math.BigDecimal; import java.math.BigInteger; +import java.util.Optional; import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.Literal; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; /** * A literal. Use {@link BigdataValueFactory} to create instances of this class. @@ -71,14 +72,14 @@ public class BigdataLiteralImpl extends BigdataValueImpl implements private static final long serialVersionUID = 2301819664179569810L; private final String label; - private final String language; - private final BigdataURI datatype; + private final Optional language; + private final BigdataIRI datatype; /** * Used by {@link BigdataValueFactoryImpl}. */ BigdataLiteralImpl(final BigdataValueFactory valueFactory, - final String label, final String language, final BigdataURI datatype) { + final String label, final String language, final BigdataIRI datatype) { super(valueFactory, null); @@ -93,12 +94,12 @@ public class BigdataLiteralImpl extends BigdataValueImpl implements } this.datatype = (datatype == null ? valueFactory.getLangStringURI() : datatype); // force to lowercase (Sesame does this too). - this.language = language.toLowerCase().intern(); + this.language = Optional.of(language.toLowerCase().intern()); } else { if (RDF.LANGSTRING.equals(datatype)) { throw new IllegalArgumentException("Language tagged literals cannot have a null language tag"); } - this.language = null; + this.language = Optional.empty(); this.datatype = (datatype == null ? valueFactory.getXSDStringURI() : datatype); } } @@ -109,57 +110,57 @@ public String toString() { final StringBuilder sb = new StringBuilder(); sb.append('\"'); - + sb.append(label); - + sb.append('\"'); if (language != null) { - + sb.append('@'); - + sb.append(language); - + } else if (datatype != null && !XMLSchema.STRING.equals(datatype)) { - + sb.append("^^<"); - + sb.append(datatype); - + sb.append('>'); - + } - + return sb.toString(); - + } - + @Override public String stringValue() { - + return label; - + } @Override final public String getLabel() { return label; - + } @Override - final public String getLanguage() { + final public Optional getLanguage() { return language; - + } @Override - final public BigdataURI getDatatype() { + final public BigdataIRI getDatatype() { return datatype; - + } final public int hashCode() { @@ -173,42 +174,42 @@ final public int hashCode() { } return hashCode; } - + final public boolean equals(Object o) { if (!(o instanceof Literal)) return false; - return equals((Literal)o); - + return equals((Literal) o); + } - + final public boolean equals(final Literal o) { if (this == o) return true; - + if (o == null) return false; - if ((o instanceof BigdataValue) // - && isRealIV() - && ((BigdataValue)o).isRealIV() - && ((BigdataValue) o).getValueFactory() == getValueFactory()) { + if ((o instanceof BigdataValue) // + && isRealIV() + && ((BigdataValue) o).isRealIV() + && ((BigdataValue) o).getValueFactory() == getValueFactory()) { - return getIV().equals(((BigdataValue) o).getIV()); + return getIV().equals(((BigdataValue) o).getIV()); } - + if (!label.equals(o.getLabel())) return false; - if (language != null) { + if (language.isPresent() && o.getLanguage().isPresent()) { // the language code is case insensitive. - return language.equalsIgnoreCase(o.getLanguage()); + return language.get().equalsIgnoreCase(o.getLanguage().get()); - } else if (o.getLanguage() != null) { + } else if (o.getLanguage() != language) { return false; @@ -227,11 +228,11 @@ && isRealIV() return true; } - + /* * XSD stuff. */ - + @Override final public boolean booleanValue() { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataQuadWrapper.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataQuadWrapper.java index 3cb7a49ce1..3c1ac45619 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataQuadWrapper.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataQuadWrapper.java @@ -30,7 +30,7 @@ /** * This class wraps a {@link BigdataStatement} and provides {@link #hashCode()} * and {@link #equals(Object)} respecting all four fields rather than SPO as per - * the {@link org.openrdf.model.Statement} contract. + * the {@link org.eclipse.rdf4j.model.Statement} contract. * * @author jeremycarroll */ diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResource.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResource.java index 447b3685d0..9a5984eeb0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResource.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataResource.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.Resource; +import org.eclipse.rdf4j.model.Resource; /** * A {@link Resource} that exposes the internal term identifier. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatement.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatement.java index a1c3d1cf63..ecbf94ac0f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatement.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatement.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.rdf.spo.ISPO; @@ -67,7 +67,7 @@ public interface BigdataStatement extends Statement, ISPO { /** * Specialized return type. */ - public BigdataURI getPredicate(); + public BigdataIRI getPredicate(); /** * Specialized return type. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java index 97fac7bb00..b4ca6d5e2b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java @@ -24,8 +24,8 @@ */ package com.bigdata.rdf.model; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.impl.bnode.SidIV; @@ -60,7 +60,7 @@ public class BigdataStatementImpl implements BigdataStatement { private static final long serialVersionUID = 6739949195958368365L; private final BigdataResource s; - private final BigdataURI p; + private final BigdataIRI p; private final BigdataValue o; private final BigdataResource c; private IV sid = null; @@ -74,7 +74,7 @@ public class BigdataStatementImpl implements BigdataStatement { * Used by {@link BigdataValueFactory} */ public BigdataStatementImpl(final BigdataResource subject, - final BigdataURI predicate, final BigdataValue object, + final BigdataIRI predicate, final BigdataValue object, final BigdataResource context, final StatementEnum type, final boolean userFlag) { @@ -113,7 +113,7 @@ final public BigdataResource getSubject() { } @Override - final public BigdataURI getPredicate() { + final public BigdataIRI getPredicate() { return p; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java index 4fcf9defc2..cd5a52b076 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java @@ -47,8 +47,8 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.URI; -import org.openrdf.model.util.URIUtil; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.util.URIUtil; /** * A URI. Use {@link BigdataValueFactory} to create instances of this class. @@ -56,7 +56,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. * @author Bryan Thompson * @version $Id$ */ -public class BigdataURIImpl extends BigdataResourceImpl implements BigdataURI { +public class BigdataURIImpl extends BigdataResourceImpl implements BigdataIRI { /** * diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java index d8a2f078ec..375eaa4e04 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValue.java @@ -47,7 +47,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. package com.bigdata.rdf.model; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.IElement; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java index 114f10d240..b2116c0dd3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java @@ -31,12 +31,12 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; import com.bigdata.rdf.store.IRawTripleStore; @@ -122,23 +122,23 @@ public interface BigdataValueFactory extends ValueFactory { BigdataLiteral createLiteral(String label, String language); - BigdataLiteral createLiteral(String label, URI datatype); + BigdataLiteral createLiteral(String label, IRI datatype); - BigdataLiteral createLiteral(String label, URI datatype, String language); + BigdataLiteral createLiteral(String label, IRI datatype, String language); - BigdataURI createURI(String uriString); + BigdataIRI createURI(String uriString); - BigdataURI createURI(String namespace, String localName); + BigdataIRI createURI(String namespace, String localName); /** * Create a statement whose {@link StatementEnum} is NOT specified. */ - BigdataStatement createStatement(Resource s, URI p, Value o); + BigdataStatement createStatement(Resource s, IRI p, Value o); /** * Create a statement whose {@link StatementEnum} is NOT specified. */ - BigdataStatement createStatement(Resource s, URI p, Value o, Resource c); + BigdataStatement createStatement(Resource s, IRI p, Value o, Resource c); /** * Create a statement (core impl). The s,p,o, and the optional c arguments @@ -158,7 +158,7 @@ public interface BigdataValueFactory extends ValueFactory { * @param type * The statement type (optional). */ - BigdataStatement createStatement(Resource s, URI p, Value o, + BigdataStatement createStatement(Resource s, IRI p, Value o, Resource c, StatementEnum type); /** @@ -181,7 +181,7 @@ BigdataStatement createStatement(Resource s, URI p, Value o, * @param userFlag * The user flag */ - BigdataStatement createStatement(Resource s, URI p, Value o, + BigdataStatement createStatement(Resource s, IRI p, Value o, Resource c, StatementEnum type, boolean userFlag); /** @@ -215,9 +215,9 @@ BigdataStatement createStatement(Resource s, URI p, Value o, BigdataResource asValue(Resource v); /** - * Strongly typed for {@link URI}s. + * Strongly typed for {@link IRI}s. */ - BigdataURI asValue(URI v); + BigdataIRI asValue(IRI v); /** * Strongly typed for {@link Literal}s. @@ -243,10 +243,10 @@ BigdataStatement createStatement(Resource s, URI p, Value o, /** * Get this factory's implementation of rdf:langString */ - BigdataURI getLangStringURI(); + BigdataIRI getLangStringURI(); /** * Get this factory's implementation of xsd:string */ - BigdataURI getXSDStringURI(); + BigdataIRI getXSDStringURI(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java index 59945e919e..2d022155e3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java @@ -36,14 +36,14 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.datatypes.XMLDatatypeUtil; -import org.openrdf.model.impl.BooleanLiteralImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; +import org.eclipse.rdf4j.model.impl.BooleanLiteralImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.cache.WeakValueCache; import com.bigdata.rdf.internal.IV; @@ -290,12 +290,12 @@ public BigdataBNodeImpl createBNode(final BigdataStatement stmt) { // Subject, predicate, object and context should be processed to use the target value factory // See https://jira.blazegraph.com/browse/BLZG-1875 final BigdataResource originalS = stmt.getSubject(); - final BigdataURI originalP = stmt.getPredicate(); + final BigdataIRI originalP = stmt.getPredicate(); final BigdataValue originalO = stmt.getObject(); final BigdataResource originalC = stmt.getContext(); final BigdataResource s = asValue(originalS); - final BigdataURI p = asValue(originalP); + final BigdataIRI p = asValue(originalP); final BigdataValue o = asValue(originalO); final BigdataResource c = asValue(originalC); @@ -625,7 +625,7 @@ public BigdataStatementImpl createStatement(Resource s, URI p, Value o, return new BigdataStatementImpl(// (BigdataResource) asValue(s),// - (BigdataURI) asValue(p),// + (BigdataIRI) asValue(p),// (BigdataValue) asValue(o),// (BigdataResource) asValue(c),// optional type, // the statement type (optional). @@ -692,7 +692,7 @@ final public BigdataValue asValue(final Value v) { this,// Note: Passing in this factory! label,// language,// - (BigdataURI)asValue(datatype)// + (BigdataIRI)asValue(datatype)// ); } else { @@ -717,12 +717,12 @@ public BigdataValueSerializer getValueSerializer() { } @Override - public BigdataURI getLangStringURI() { + public BigdataIRI getLangStringURI() { return rdf_langstring; } @Override - public BigdataURI getXSDStringURI() { + public BigdataIRI getXSDStringURI() { return xsd_string; } @@ -734,9 +734,9 @@ public BigdataResource asValue(Resource v) { } @Override - public BigdataURI asValue(URI v) { + public BigdataIRI asValue(URI v) { - return (BigdataURI)asValue((Value)v); + return (BigdataIRI)asValue((Value)v); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueSerializer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueSerializer.java index b0195f2fec..27fed21dde 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueSerializer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueSerializer.java @@ -32,12 +32,12 @@ import java.io.IOException; import java.io.OutputStream; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.io.ByteArrayBuffer; import com.bigdata.io.DataInputBuffer; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AbstractStatementBuffer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AbstractStatementBuffer.java index bbfd9d9e88..7cd6841862 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AbstractStatementBuffer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AbstractStatementBuffer.java @@ -7,21 +7,21 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ContextStatementImpl; +import org.eclipse.rdf4j.model.impl.StatementImpl; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.StatementEnum; @@ -418,7 +418,7 @@ public void add(final F e) { final G stmt = (G) getValueFactory().createStatement(// (BigdataResource) convertValue(e.getSubject()), // - (BigdataURI) convertValue(e.getPredicate()), // + (BigdataIRI) convertValue(e.getPredicate()), // convertValue(e.getObject()), // (BigdataResource) convertValue(e.getContext()), (e instanceof BigdataStatement ? ((BigdataStatement) e) @@ -477,7 +477,7 @@ public void add(Resource s, URI p, Value o, Resource c, StatementEnum type) { final G stmt = (G) getValueFactory().createStatement(// (BigdataResource) convertValue(s), // - (BigdataURI) convertValue(p), // + (BigdataIRI) convertValue(p), // convertValue(o), // (BigdataResource) convertValue(c), // type); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java index 937d2447e8..7748759bdd 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java @@ -70,12 +70,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; import com.bigdata.btree.AsynchronousIndexWriteConfiguration; import com.bigdata.btree.IndexMetadata; @@ -110,7 +110,7 @@ import com.bigdata.rdf.model.BigdataLiteral; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueImpl; @@ -4000,7 +4000,7 @@ private void handleStatement(final Resource s, final URI p, _handleStatement( (Resource) getCanonicalValue((BigdataResource) valueFactory .asValue(s)),// - (URI) getCanonicalValue((BigdataURI) valueFactory + (URI) getCanonicalValue((BigdataIRI) valueFactory .asValue(p)),// (Value) getCanonicalValue((BigdataValue) valueFactory .asValue(o)),// @@ -4020,7 +4020,7 @@ private void _handleStatement(final Resource s, final URI p, final Value o, final Resource c, final StatementEnum type) { final BigdataStatement stmt = valueFactory.createStatement( - (BigdataResource) s, (BigdataURI) p, (BigdataValue) o, + (BigdataResource) s, (BigdataIRI) p, (BigdataValue) o, (BigdataResource) c, type); if (statements == null) { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/BasicRioLoader.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/BasicRioLoader.java index efc0a66ecf..5946a39cbf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/BasicRioLoader.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/BasicRioLoader.java @@ -30,13 +30,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.Rio; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.Rio; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IAsynchronousWriteStatementBufferFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IAsynchronousWriteStatementBufferFactory.java index 52f5454c4d..e4c39f5b31 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IAsynchronousWriteStatementBufferFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IAsynchronousWriteStatementBufferFactory.java @@ -3,7 +3,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.counters.CounterSet; import com.bigdata.rdf.load.IStatementBufferFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRDFParserOptions.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRDFParserOptions.java index 7dbcbacdb8..de85b89894 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRDFParserOptions.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRDFParserOptions.java @@ -1,8 +1,8 @@ package com.bigdata.rdf.rio; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParser.DatatypeHandling; -import org.openrdf.rio.helpers.RDFParserBase; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.rio.helpers.RDFParserBase; /** * Instances of this interface may be used to configure options on an diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRioLoader.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRioLoader.java index a55f1f9a60..9cb65d7e03 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRioLoader.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IRioLoader.java @@ -30,8 +30,8 @@ import java.io.InputStream; import java.io.Reader; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; /** * Interface for parsing RDF data using the Sesame RIO parser. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IStatementBuffer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IStatementBuffer.java index b267eddf63..7f1294808b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IStatementBuffer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/IStatementBuffer.java @@ -32,10 +32,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataStatement; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/PresortRioLoader.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/PresortRioLoader.java index 87f5a55651..a23227f9a8 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/PresortRioLoader.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/PresortRioLoader.java @@ -23,13 +23,13 @@ */ package com.bigdata.rdf.rio; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.rio.RDFHandler; -import org.openrdf.rio.RDFHandlerException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.rio.RDFHandler; +import org.eclipse.rdf4j.rio.RDFHandlerException; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; /** * Statement handler for the RIO RDF Parser that writes on a @@ -59,7 +59,7 @@ public class PresortRioLoader extends BasicRioLoader implements RDFHandler * The value that will be used for the graph/context co-ordinate when * loading data represented in a triple format into a quad store. */ - private BigdataURI defaultGraphURI = null ; + private BigdataIRI defaultGraphURI = null ; /** * Sets up parser to load RDF. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/RDFParserOptions.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/RDFParserOptions.java index 05b2b7b427..62d3eb6a9e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/RDFParserOptions.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/RDFParserOptions.java @@ -32,9 +32,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParser.DatatypeHandling; -import org.openrdf.rio.helpers.RDFParserBase; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.rio.helpers.RDFParserBase; /** * Instances of this class may be used to configure options on an @@ -210,7 +210,7 @@ public synchronized String toString() { } /* (non-Javadoc) - * @see com.bigdata.rdf.rio.IRDFParserOptions#setDatatypeHandling(org.openrdf.rio.RDFParser.DatatypeHandling) + * @see com.bigdata.rdf.rio.IRDFParserOptions#setDatatypeHandling(org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling) */ @Override synchronized public void setDatatypeHandling( diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java index ce88cc0c25..38ac0e11c4 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java @@ -43,12 +43,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.counters.CounterSet; import com.bigdata.counters.ICounterSetAccess; @@ -62,7 +62,7 @@ import com.bigdata.rdf.model.BigdataBNodeImpl; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.StatementEnum; @@ -258,11 +258,11 @@ public final AbstractTripleStore getDatabase() { /** * Reification vocabulary. */ - private final BigdataURI RDF_SUBJECT; - private final BigdataURI RDF_PREDICATE; - private final BigdataURI RDF_OBJECT; - private final BigdataURI RDF_STATEMENT; - private final BigdataURI RDF_TYPE; + private final BigdataIRI RDF_SUBJECT; + private final BigdataIRI RDF_PREDICATE; + private final BigdataIRI RDF_OBJECT; + private final BigdataIRI RDF_STATEMENT; + private final BigdataIRI RDF_TYPE; /** * The maximum #of Statements, URIs, Literals, or BNodes that the buffer can @@ -1524,7 +1524,7 @@ public Batch merge(final List> avail) { // Create new statement using distinct values. final BigdataStatement stmt = (BigdataStatement) sb.stmts[i]; final BigdataResource s = (BigdataResource) getDistinctTerm(stmt.getSubject()); - final BigdataURI p = (BigdataURI) getDistinctTerm(stmt.getPredicate()); + final BigdataIRI p = (BigdataIRI) getDistinctTerm(stmt.getPredicate()); final BigdataValue o = getDistinctTerm(stmt.getObject()); final BigdataResource c = stmt.getContext() == null ? null : (BigdataResource) getDistinctTerm(stmt.getContext()); @@ -2328,7 +2328,7 @@ private BigdataValue getDistinctTerm(final BigdataValue term, final boolean addI bnode.setStatement(valueFactory.createStatement( (BigdataResource) getDistinctTerm(stmt.getSubject(), true), - (BigdataURI) getDistinctTerm(stmt.getPredicate(), true), + (BigdataIRI) getDistinctTerm(stmt.getPredicate(), true), (BigdataValue) getDistinctTerm(stmt.getObject(), true) )); @@ -2530,7 +2530,7 @@ protected void handleStatement(Resource _s, URI _p, Value _o, Resource _c, final BigdataResource s = (BigdataResource) getDistinctTerm(valueFactory.asValue(_s), true); - final BigdataURI p = (BigdataURI) + final BigdataIRI p = (BigdataIRI) getDistinctTerm(valueFactory.asValue(_p), true); final BigdataValue o = getDistinctTerm(valueFactory.asValue(_o), true); @@ -2715,7 +2715,7 @@ private static class ReifiedStmt implements Statement { private static final long serialVersionUID = -7706421769807306702L; private BigdataResource s; - private BigdataURI p; + private BigdataIRI p; private BigdataValue o; private BigdataResource c; @@ -2737,7 +2737,7 @@ public BigdataValue getObject() { } @Override - public BigdataURI getPredicate() { + public BigdataIRI getPredicate() { return p; } @@ -2754,7 +2754,7 @@ public void set(final URI p, final BigdataValue o) { } else if (p.toString().equals(RDF.PREDICATE.toString())) { - setPredicate((BigdataURI) o); + setPredicate((BigdataIRI) o); } else if (p.toString().equals(RDF.OBJECT.toString())) { @@ -2776,7 +2776,7 @@ public void setSubject(final BigdataResource s) { this.s = s; } - public void setPredicate(final BigdataURI p) { + public void setPredicate(final BigdataIRI p) { this.p = p; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParser.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParser.java index e3cad4620f..ed3fc9e73d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParser.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParser.java @@ -21,17 +21,17 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.resultio.QueryResultFormat; -import org.openrdf.query.resultio.QueryResultParseException; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.resultio.QueryResultFormat; +import org.eclipse.rdf4j.query.resultio.QueryResultParseException; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataValueFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserFactory.java index 9e875b4e6f..d2cbc1a521 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserFactory.java @@ -16,10 +16,10 @@ */ package com.bigdata.rdf.rio.json; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.query.resultio.TupleQueryResultParserFactory; -import org.openrdf.query.resultio.sparqljson.SPARQLResultsJSONParser; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory; +import org.eclipse.rdf4j.query.resultio.sparqljson.SPARQLResultsJSONParser; /** * A {@link TupleQueryResultParserFactory} for parsers of SPARQL-1.1 JSON Tuple diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstruct.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstruct.java index bd1ab4c6dc..88aaa25c43 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstruct.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstruct.java @@ -22,21 +22,21 @@ import java.util.List; import org.apache.commons.io.input.ReaderInputStream; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.resultio.QueryResultParseException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.helpers.RDFParserBase; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.resultio.QueryResultParseException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.helpers.RDFParserBase; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstructFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstructFactory.java index 02fe53e96a..d77cf92e19 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstructFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstructFactory.java @@ -16,10 +16,10 @@ */ package com.bigdata.rdf.rio.json; -import org.openrdf.query.resultio.TupleQueryResultParserFactory; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; import com.bigdata.rdf.ServiceProviderHook; import com.bigdata.rdf.model.BigdataValueFactoryImpl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriter.java index eda1618b4b..a42ce13752 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriter.java @@ -20,10 +20,10 @@ import java.io.OutputStream; import java.io.Writer; -import org.openrdf.model.Value; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultWriter; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriter; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataStatement; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactory.java index 908dbba360..3e4f33d7d6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactory.java @@ -18,9 +18,9 @@ import java.io.OutputStream; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultWriter; -import org.openrdf.query.resultio.TupleQueryResultWriterFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriter; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterFactory; /** * A {@link TupleQueryResultWriterFactory} for writers of SPARQL/JSON query diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstruct.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstruct.java index ccb9cd64a2..7ed007dbc1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstruct.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstruct.java @@ -22,15 +22,15 @@ import java.util.Arrays; import java.util.Collection; -import org.openrdf.model.Statement; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RioSetting; -import org.openrdf.rio.WriterConfig; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RioSetting; +import org.eclipse.rdf4j.rio.WriterConfig; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstructFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstructFactory.java index 16fb74188e..bcece18933 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstructFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstructFactory.java @@ -19,10 +19,10 @@ import java.io.OutputStream; import java.io.Writer; -import org.openrdf.query.resultio.TupleQueryResultWriterFactory; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterFactory; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterFactory; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONParserBase.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONParserBase.java index 84e647bc62..bc92c16080 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONParserBase.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONParserBase.java @@ -23,13 +23,13 @@ import java.util.List; import java.util.Set; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.query.resultio.QueryResultParseException; -import org.openrdf.query.resultio.QueryResultParserBase; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.resultio.QueryResultParseException; +import org.eclipse.rdf4j.query.resultio.QueryResultParserBase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONWriterBase.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONWriterBase.java index 1abafbfd87..bfb59b74a2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONWriterBase.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONWriterBase.java @@ -27,19 +27,19 @@ import java.util.List; import java.util.Set; -import org.openrdf.model.BNode; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.resultio.BasicQueryWriterSettings; -import org.openrdf.query.resultio.QueryResultWriter; -import org.openrdf.query.resultio.QueryResultWriterBase; -import org.openrdf.rio.RioSetting; -import org.openrdf.rio.helpers.BasicWriterSettings; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.resultio.BasicQueryWriterSettings; +import org.eclipse.rdf4j.query.resultio.QueryResultWriter; +import org.eclipse.rdf4j.query.resultio.QueryResultWriterBase; +import org.eclipse.rdf4j.rio.RioSetting; +import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import com.bigdata.rdf.internal.XSD; import com.fasterxml.jackson.core.JsonFactory; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java index 6b0fc65a10..6244651540 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java @@ -16,20 +16,20 @@ import java.util.Stack; import org.apache.commons.io.input.BOMInputStream; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RioSetting; -import org.openrdf.rio.helpers.NTriplesParserSettings; -import org.openrdf.rio.helpers.RDFParserBase; -import org.openrdf.rio.ntriples.NTriplesUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RioSetting; +import org.eclipse.rdf4j.rio.helpers.NTriplesParserSettings; +import org.eclipse.rdf4j.rio.helpers.RDFParserBase; +import org.eclipse.rdf4j.rio.ntriples.NTriplesUtil; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataStatement; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java index 870f146c5b..6dcd2c97e7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserFactory.java @@ -5,9 +5,9 @@ */ package com.bigdata.rdf.rio.ntriples; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java index 9b48e1b5c0..68d6c3553a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java @@ -5,18 +5,18 @@ */ package com.bigdata.rdf.rio.turtle; -import info.aduna.text.ASCIIUtil; +import org.eclipse.rdf4j.common.text.ASCIIUtil; import java.io.IOException; -import org.openrdf.model.BNode; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.turtle.TurtleParser; -import org.openrdf.rio.turtle.TurtleUtil; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.turtle.TurtleParser; +import org.eclipse.rdf4j.rio.turtle.TurtleUtil; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java index a827acb6db..a6bd229690 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParserFactory.java @@ -5,10 +5,10 @@ */ package com.bigdata.rdf.rio.turtle; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.turtle.TurtleParser; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.turtle.TurtleParser; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriter.java index 11700d2aaf..f23dca7d3a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriter.java @@ -9,9 +9,9 @@ import java.io.OutputStream; import java.io.Writer; -import org.openrdf.model.BNode; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.turtle.TurtleWriter; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.turtle.TurtleWriter; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataStatement; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriterFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriterFactory.java index 6e64ff9849..ad3f3db5c6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriterFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriterFactory.java @@ -8,9 +8,9 @@ import java.io.OutputStream; import java.io.Writer; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterFactory; import com.bigdata.rdf.ServiceProviderHook; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java index 99f207962e..dc890a1927 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/BackchainAccessPath.java @@ -29,9 +29,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IPredicate; import com.bigdata.btree.IIndex; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java index dd5aaefac4..c08117b037 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java @@ -24,8 +24,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.axioms.Axioms; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java index 20069f411c..85154a08a5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/FastClosure.java @@ -3,7 +3,7 @@ import java.util.LinkedList; import java.util.List; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IConstant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java index 2266ae28c9..3cab48a171 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/MatchRule.java @@ -1,9 +1,9 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.BOp; import com.bigdata.bop.IConstant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure11.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure11.java index 4b6f891067..4ed8ccf20e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure11.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure11.java @@ -24,8 +24,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure13.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure13.java index 55b3fce4c7..90c87186dc 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure13.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure13.java @@ -24,8 +24,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java index 5638b033a4..f7e9d6fd9a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure3.java @@ -29,7 +29,7 @@ import java.util.Set; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstant; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure5.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure5.java index a3647e81a3..b01fc1cb81 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure5.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure5.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure6.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure6.java index ab04d3d0e7..71d506ec5b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure6.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure6.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure7.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure7.java index 8eda89a4ad..86bdca6f08 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure7.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure7.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure9.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure9.java index 5bbd1b6ec4..2ce070c54d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure9.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleFastClosure9.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentClass.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentClass.java index 09d34f7347..694406cf52 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentClass.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentClass.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentProperty.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentProperty.java index 17b9a5c177..b048fe77a8 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentProperty.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlEquivalentProperty.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlFunctionalProperty.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlFunctionalProperty.java index 9f163ee038..209dbc296b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlFunctionalProperty.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlFunctionalProperty.java @@ -27,8 +27,10 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.semarglproject.vocab.OWL; +import org.semarglproject.vocab.RDF; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; @@ -53,15 +55,18 @@ public class RuleOwlFunctionalProperty extends Rule { */ private static final long serialVersionUID = -6688762355076324400L; + + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + /** * @param vocab */ public RuleOwlFunctionalProperty(String relationName, Vocabulary vocab) { super( "owlFunctionalProperty", // - new SPOPredicate(relationName,var("b"), vocab.getConstant(OWL.SAMEAS), var("c")),// + new SPOPredicate(relationName,var("b"), vocab.getConstant(VALUE_FACTORY.createIRI(OWL.SAME_AS)), var("c")),// new SPOPredicate[] {// - new SPOPredicate(relationName,var("x"), vocab.getConstant(RDF.TYPE), vocab.getConstant(OWL.FUNCTIONALPROPERTY)),// + new SPOPredicate(relationName,var("x"), vocab.getConstant(VALUE_FACTORY.createIRI(RDF.TYPE)), vocab.getConstant(VALUE_FACTORY.createIRI(OWL.FUNCTIONAL_PROPERTY))),// new SPOPredicate(relationName,var("a"), var("x"), var("b")),// new SPOPredicate(relationName,var("a"), var("x"), var("c"))// }, diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlHasValue.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlHasValue.java index 19c964e503..673dd085c4 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlHasValue.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlHasValue.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -24,8 +24,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseFunctionalProperty.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseFunctionalProperty.java index 50a9d23b02..9b4ae46c9f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseFunctionalProperty.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseFunctionalProperty.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf1.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf1.java index 01443fb4e1..0aa302355c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf1.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf1.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf2.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf2.java index c8c74173a5..14469ffa41 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf2.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlInverseOf2.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; import com.bigdata.relation.rule.Rule; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1.java index b288e8fb56..747a40f241 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1b.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1b.java index 01fb05ff7e..e026d187a5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1b.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs1b.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs2.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs2.java index 47838e7d74..299f2406ea 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs2.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs2.java @@ -26,7 +26,7 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs3.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs3.java index 09816ca621..fa799bb7bb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs3.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSameAs3.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSymmetricProperty.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSymmetricProperty.java index 0434e88792..34d2a60da9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSymmetricProperty.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlSymmetricProperty.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty1.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty1.java index 3d83e138b8..f8ea72f3b7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty1.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty1.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty2.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty2.java index 4529792844..9c866f8f85 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty2.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleOwlTransitiveProperty2.java @@ -27,9 +27,9 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdf01.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdf01.java index 888ab1e9e2..3223423d0e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdf01.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdf01.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs02.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs02.java index 206ac2d468..1179ec0d14 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs02.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs02.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs03.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs03.java index 8cb5d0a8e3..ce24d93345 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs03.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs03.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04a.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04a.java index 5166ee94dd..863c5fba24 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04a.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04a.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04b.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04b.java index 97e4d1e9ce..e5b92c0381 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04b.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs04b.java @@ -27,8 +27,8 @@ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs05.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs05.java index d63df3481a..351ed45893 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs05.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs05.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs06.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs06.java index a5b4515db1..c7808c7fd5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs06.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs06.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs07.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs07.java index d0c826a4bd..9573f4f9bd 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs07.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs07.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs08.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs08.java index 5bf9fab206..a93f2aa927 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs08.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs08.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs09.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs09.java index 0c0ab4bc6c..674955bd96 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs09.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs09.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs10.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs10.java index 5ef4597c09..c02955503b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs10.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs10.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs11.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs11.java index e6e6ca517f..6cfd55cc0b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs11.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs11.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.bop.IConstraint; import com.bigdata.bop.constraint.Constraint; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs12.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs12.java index e5ebac24c7..e599915552 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs12.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs12.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs13.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs13.java index 359802c6f9..7c98a61fe7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs13.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/rules/RuleRdfs13.java @@ -23,8 +23,8 @@ */ package com.bigdata.rdf.rules; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.spo.SPOPredicate; import com.bigdata.rdf.vocab.Vocabulary; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTContainer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTContainer.java index 00a44988d3..6b121d9deb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTContainer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTContainer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Map; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DatasetNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DatasetNode.java index 21153c0864..15e0c9a370 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DatasetNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DatasetNode.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.Dataset; +import org.eclipse.rdf4j.query.Dataset; import com.bigdata.bop.BOp; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DropGraph.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DropGraph.java index 205161ac2d..600cfff329 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DropGraph.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/DropGraph.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Map; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionNode.java index e602437bd7..553d7cf764 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionNode.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.Map; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IValueExpression; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java index 9b3cfac7d9..49d205e180 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java @@ -5,11 +5,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.FN; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.FN; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContextBase; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/LoadGraph.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/LoadGraph.java index 28634b3349..5bc666f0ab 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/LoadGraph.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/LoadGraph.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,9 +29,9 @@ import java.util.Map; -import org.openrdf.model.URI; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.helpers.RDFParserBase; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.helpers.RDFParserBase; import com.bigdata.bop.BOp; import com.bigdata.rdf.rio.IRDFParserOptions; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java index 9aeac3b0fc..95784ebf81 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java index 27cd16d7ec..8be43fcaed 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java index e836c7e24c..7129c3e033 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java @@ -39,7 +39,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryFunctionNodeBase.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryFunctionNodeBase.java index 1f462c926b..7b482c7cc6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryFunctionNodeBase.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryFunctionNodeBase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Map; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/Update.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/Update.java index 08644d982e..19b43269da 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/Update.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/Update.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.IVariable; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeBindingsCollector.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeBindingsCollector.java index c0e0356a1e..a831780fde 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeBindingsCollector.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeBindingsCollector.java @@ -26,15 +26,15 @@ */ package com.bigdata.rdf.sparql.ast.cache; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; import com.bigdata.bop.IVariable; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCache.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCache.java index 2f920c02c8..5a80804c85 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCache.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCache.java @@ -5,14 +5,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.query.GraphQueryResult; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.query.GraphQueryResult; import com.bigdata.btree.keys.IKeyBuilder; import com.bigdata.htree.HTree; import com.bigdata.io.SerializerUtil; import com.bigdata.rdf.internal.IV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.store.AbstractTripleStore; /** @@ -25,7 +25,7 @@ * addressed for the {@link CacheConnectionImpl} for named solution sets. * * TODO Support hash partitioned and remove DESCRIBE cache instances. - * These will need access to a service that resolves {@link BigdataURI} + * These will need access to a service that resolves {@link BigdataIRI} * s to {@link IV}s efficiently. That service can be exposed using the * NSS or using jini/River. */ @@ -34,7 +34,7 @@ public class DescribeCache implements IDescribeCache { static private transient final Logger log = LogManager.getLogger(CacheConnectionImpl.class); /** - * The cache. The keys are {@link IV}s. The values are the {@link Graph} s + * The cache. The keys are {@link IV}s. The values are the {@link Model} s * describing those {@link IV}s. */ private HTree map; @@ -101,7 +101,7 @@ private byte[] iv2key(final IKeyBuilder keyBuilder, final IV iv) { * the sketch is to stream onto a buffer backed by temporary file, computing * the sketch as we go and then replay the stream into a compact * representation for the resource description. However, note that the API - * currently presumes that the {@link Graph} is transmitted as a unit. A + * currently presumes that the {@link Model} is transmitted as a unit. A * {@link GraphQueryResult} provides an iterator oriented view of a graph * more suitable to the transmission of large graphs and streaming graphs * over a network. @@ -119,7 +119,7 @@ private byte[] iv2key(final IKeyBuilder keyBuilder, final IV iv) { * storage explicitly, including explicitly deleting the backing raw record * for each cache entry when that cache entry is invalidated. */ - public void insert(final IV iv, final Graph g) { + public void insert(final IV iv, final Model g) { final byte[] key = iv2key(getKeyBuilder(), iv); @@ -135,7 +135,7 @@ public void insert(final IV iv, final Graph g) { } - public Graph lookup(final IV iv) { + public Model lookup(final IV iv) { final byte[] key = iv2key(getKeyBuilder(), iv); @@ -144,7 +144,7 @@ public Graph lookup(final IV iv) { if (val == null) return null; - final Graph x = (Graph) SerializerUtil.deserialize(val); + final Model x = (Model) SerializerUtil.deserialize(val); return x; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCacheUpdater.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCacheUpdater.java index 6d84a92c89..6452d43e81 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCacheUpdater.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/DescribeCacheUpdater.java @@ -1,6 +1,6 @@ package com.bigdata.rdf.sparql.ast.cache; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.util.HashMap; import java.util.Map; @@ -8,12 +8,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Resource; -import org.openrdf.model.Value; -import org.openrdf.model.impl.GraphImpl; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.rio.RDFWriter; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.GraphImpl; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.rio.RDFWriter; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataStatement; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/IDescribeCache.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/IDescribeCache.java index 42f008cfb1..66abbd1387 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/IDescribeCache.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/cache/IDescribeCache.java @@ -2,8 +2,8 @@ import java.util.Set; -import org.openrdf.model.Graph; -import org.openrdf.query.GraphQueryResult; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.query.GraphQueryResult; import com.bigdata.rdf.internal.IV; @@ -44,13 +44,13 @@ public interface IDescribeCache { * support a star-join against the DESCRIBE cache (leveraging * materialized joins). * - * TODO Offer a stream oriented response. For a single {@link Graph} + * TODO Offer a stream oriented response. For a single {@link Model} * , that could be a {@link GraphQueryResult}. For vectored lookups, * this might be a stream of binding sets (vectored lookups make * sense primarily in star joins, so this would really be the * signature for the star-join operator). */ - Graph lookup(final IV iv); + Model lookup(final IV iv); /** * Insert/update the cache entry for an {@link IV}. @@ -58,13 +58,13 @@ public interface IDescribeCache { * @param iv * The {@link IV}. * @param g - * The {@link Graph} that describes that {@link IV}. + * The {@link Model} that describes that {@link IV}. * * TODO Vector inserts. * * TODO We probably need to include the timestamp of the database * view from which the resource description was constructed. */ - void insert(final IV iv, final Graph g); + void insert(final IV iv, final Model g); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java index 8e0b117cdb..3ac412efbf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java @@ -33,8 +33,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.IPredicate; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java index 3e28ba6a8b..36f3a3c802 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java @@ -37,7 +37,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpEvaluationContext; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java index 0b2a135d2b..b11fe28f88 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java @@ -37,6 +37,7 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.UUID; @@ -45,28 +46,28 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.query.algebra.StatementPattern.Scope; -//import org.openrdf.query.impl.MutableTupleQueryResult; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParser.DatatypeHandling; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.RDFHandlerBase; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; +//import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; @@ -91,7 +92,7 @@ import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.rio.IRDFParserOptions; import com.bigdata.rdf.rio.RDFParserOptions; import com.bigdata.rdf.sail.BigdataSail; @@ -135,13 +136,13 @@ import cutthecrap.utils.striterators.ICloseableIterator; import cutthecrap.utils.striterators.Resolver; import cutthecrap.utils.striterators.Striterator; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** * Class handles SPARQL update query plan generation. * * @author Bryan Thompson - * @version $Id$ + * @version $ */ public class AST2BOpUpdate extends AST2BOpUtility { @@ -162,6 +163,9 @@ public class AST2BOpUpdate extends AST2BOpUtility { * evaluation. */ private final static boolean runOnQueryEngine = false; + + private static final Set rdfFormats = RDFParserRegistry.getInstance() + .getKeys(); /** * @@ -1198,10 +1202,10 @@ private static PipelineOp convertAddGraph(PipelineOp left, if (runOnQueryEngine) throw new UnsupportedOperationException(); - final BigdataURI sourceGraph = (BigdataURI) (op.getSourceGraph() == null ? null + final BigdataIRI sourceGraph = (BigdataIRI) (op.getSourceGraph() == null ? null : op.getSourceGraph().getValue()); - final BigdataURI targetGraph = (BigdataURI) (op.getTargetGraph() == null ? null + final BigdataIRI targetGraph = (BigdataIRI) (op.getTargetGraph() == null ? null : op.getTargetGraph().getValue()); copyStatements(// @@ -1224,8 +1228,8 @@ private static PipelineOp convertAddGraph(PipelineOp left, * if we just ignored the SILENT keyword. */ private static void copyStatements(final AST2BOpUpdateContext context, - final boolean silent, final BigdataURI sourceGraph, - final BigdataURI targetGraph) throws RepositoryException { + final boolean silent, final BigdataIRI sourceGraph, + final BigdataIRI targetGraph) throws RepositoryException { if (log.isDebugEnabled()) log.debug("sourceGraph=" + sourceGraph + ", targetGraph=" @@ -1270,10 +1274,10 @@ private static PipelineOp convertMoveGraph(PipelineOp left, if (runOnQueryEngine) throw new UnsupportedOperationException(); - final BigdataURI sourceGraph = (BigdataURI) (op.getSourceGraph() == null ? context.f + final BigdataIRI sourceGraph = (BigdataIRI) (op.getSourceGraph() == null ? context.f .asValue(BD.NULL_GRAPH) : op.getSourceGraph().getValue()); - final BigdataURI targetGraph = (BigdataURI) (op.getTargetGraph() == null ? context.f + final BigdataIRI targetGraph = (BigdataIRI) (op.getTargetGraph() == null ? context.f .asValue(BD.NULL_GRAPH) : op.getTargetGraph().getValue()); if (log.isDebugEnabled()) @@ -1311,10 +1315,10 @@ private static PipelineOp convertCopyGraph(PipelineOp left, if (runOnQueryEngine) throw new UnsupportedOperationException(); - final BigdataURI sourceGraph = (BigdataURI) (op.getSourceGraph() == null ? context.f + final BigdataIRI sourceGraph = (BigdataIRI) (op.getSourceGraph() == null ? context.f .asValue(BD.NULL_GRAPH) : op.getSourceGraph().getValue()); - final BigdataURI targetGraph = (BigdataURI) (op.getTargetGraph() == null ? context.f + final BigdataIRI targetGraph = (BigdataIRI) (op.getTargetGraph() == null ? context.f .asValue(BD.NULL_GRAPH) : op.getTargetGraph().getValue()); if (log.isDebugEnabled()) @@ -1357,7 +1361,7 @@ private static PipelineOp convertLoadGraph(PipelineOp left, final URL sourceURL = new URL(urlStr); - final BigdataURI defaultContext = (BigdataURI) (op + final BigdataIRI defaultContext = (BigdataIRI) (op .getTargetGraph() == null ? null : op.getTargetGraph() .getValue()); @@ -1491,22 +1495,22 @@ public static RDFFormat rdfFormatForFile(final String fileName) { * Try to get the RDFFormat from the URL's file path. */ - RDFFormat fmt = RDFFormat.forFileName(fileName); + Optional fmt = RDFFormat.matchFileName(fileName, rdfFormats); - if (fmt == null && fileName.endsWith(".zip")) { - fmt = RDFFormat.forFileName(fileName.substring(0, fileName.length() - 4)); + if (fmt.isEmpty() && fileName.endsWith(".zip")) { + fmt = RDFFormat.matchFileName(fileName.substring(0, fileName.length() - 4), rdfFormats); } - if (fmt == null && fileName.endsWith(".gz")) { - fmt = RDFFormat.forFileName(fileName.substring(0, fileName.length() - 3)); + if (fmt.isEmpty() && fileName.endsWith(".gz")) { + fmt = RDFFormat.matchFileName(fileName.substring(0, fileName.length() - 3), rdfFormats); } - if (fmt == null) { + if (fmt.isEmpty()) { // Default format. - fmt = RDFFormat.RDFXML; + return RDFFormat.RDFXML; } - return fmt; + return fmt.get(); } /** @@ -1527,13 +1531,13 @@ public static RDFFormat rdfFormatForFile(final String fileName) { * the Sail and is therefore easier to place into service. */ private static void doLoad(final BigdataSailConnection conn, - final URL sourceURL, final URI defaultContext, + final URL sourceURL, final IRI defaultContext, final IRDFParserOptions parserOptions, final AtomicLong nmodified, final LoadGraph op) throws IOException, RDFParseException, RDFHandlerException { // Use the default context if one was given and otherwise - // the URI from which the data are being read. + // the IRI from which the data are being read. final Resource defactoContext = defaultContext == null ? new URIImpl( sourceURL.toExternalForm()) : defaultContext; @@ -1567,25 +1571,25 @@ private static void doLoad(final BigdataSailConnection conn, * * UpdateServlet fails to parse MIMEType when doing conneg. */ - RDFFormat format = RDFFormat.forMIMEType(new MiniMime(contentType) - .getMimeType()); + Optional format = RDFFormat.matchMIMEType(new MiniMime(contentType) + .getMimeType(), rdfFormats); - if (format == null) { + if (format.isEmpty()) { - format = rdfFormatForFile(n); + format = Optional.of(rdfFormatForFile(n)); } - if (format == null) + if (format.isEmpty()) throw new UnknownContentTypeException(contentType); - final RDFParserFactory rdfParserFactory = RDFParserRegistry - .getInstance().get(format); + final Optional rdfParserFactory = RDFParserRegistry + .getInstance().get(format.get()); - if (rdfParserFactory == null) + if (rdfParserFactory.isEmpty()) throw new UnknownContentTypeException(contentType); - final RDFParser rdfParser = rdfParserFactory + final RDFParser rdfParser = rdfParserFactory.get() .getParser(); rdfParser.setValueFactory(conn.getTripleStore().getValueFactory()); @@ -1775,8 +1779,8 @@ private static PipelineOp convertClearOrDropGraph(PipelineOp left, final TermNode targetGraphNode = op.getTargetGraph(); - final BigdataURI targetGraph = targetGraphNode == null ? null - : (BigdataURI) targetGraphNode.getValue(); + final BigdataIRI targetGraph = targetGraphNode == null ? null + : (BigdataIRI) targetGraphNode.getValue(); clearGraph(op.isSilent(), op.getTargetSolutionSet(), targetGraph, op.getScope(), op.isAllGraphs(), op.isAllSolutionSets(), @@ -1799,7 +1803,7 @@ private static PipelineOp convertClearOrDropGraph(PipelineOp left, * @throws RepositoryException * @throws SailException */ - private static final void clearOneGraph(final URI targetGraph, // + private static final void clearOneGraph(final IRI targetGraph, // final AST2BOpUpdateContext context// ) throws RepositoryException, SailException { @@ -1840,7 +1844,7 @@ private static final void clearOneGraph(final URI targetGraph, // private static void clearGraph(// final boolean silent,// final String solutionSet,// - final URI targetGraph, // + final IRI targetGraph, // final Scope scope,// final boolean allGraphs,// final boolean allSolutionSets,// @@ -2078,7 +2082,7 @@ private static PipelineOp convertCreateGraph(final PipelineOp left, } else { - final BigdataURI c = (BigdataURI) ((CreateGraph) op) + final BigdataIRI c = (BigdataIRI) ((CreateGraph) op) .getTargetGraph().getValue(); if (log.isDebugEnabled()) @@ -2207,7 +2211,7 @@ private static void addOrRemoveStatement(final BigdataSailConnection conn, final Resource s = (Resource) spo.getSubject(); - final URI p = (URI) spo.getPredicate(); + final IRI p = (IRI) spo.getPredicate(); final Value o = (Value) spo.getObject(); @@ -2276,13 +2280,13 @@ private static void addOrRemoveStatementData(final BigdataSailConnection conn, // final Resource s = (Resource) spo.s().getValue(); // -// final URI p = (URI) spo.p().getValue(); +// final IRI p = (IRI) spo.p().getValue(); // // final Value o = (Value) spo.o().getValue(); final Resource s = stmt.getSubject(); - final URI p = stmt.getPredicate(); + final IRI p = stmt.getPredicate(); final Value o = stmt.getObject(); @@ -2501,7 +2505,7 @@ static private void executeUpdate(final PipelineOp left, * if the graph does not exist and/or is empty. */ static private void assertGraphNotEmpty(final AST2BOpUpdateContext context, - final BigdataURI sourceGraph) { + final BigdataIRI sourceGraph) { if (sourceGraph == null || sourceGraph.equals(BD.NULL_GRAPH)) { @@ -2550,7 +2554,7 @@ static private void assertGraphNotEmpty(final AST2BOpUpdateContext context, * exception) */ static private void assertGraphExists(final AST2BOpUpdateContext context, - final BigdataURI c) { + final BigdataIRI c) { if (c.getIV() != null && context.conn diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdateContext.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdateContext.java index 91db0cc5e2..4d892858d6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdateContext.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdateContext.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,14 +29,14 @@ import java.util.concurrent.atomic.AtomicLong; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.bop.IBindingSet; import com.bigdata.journal.ITx; import com.bigdata.rdf.internal.IVCache; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sail.BigdataSail; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; @@ -137,7 +137,7 @@ public long getTimestamp() { * be set (which is always true for the vocabulary). */ @SuppressWarnings("unchecked") - public BigdataURI getNullGraph() { + public BigdataIRI getNullGraph() { if (nullGraph == null) { @@ -177,7 +177,7 @@ public void setQueryBindingSet(final QueryBindingSet qbs) { } - private BigdataURI nullGraph = null; + private BigdataIRI nullGraph = null; public void setDataset(Dataset dataset) { this.dataset = dataset; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java index bf5ef2efc7..6d605f1269 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContextBase; @@ -114,7 +114,7 @@ import com.bigdata.rdf.internal.impl.literal.XSDBooleanIV; import com.bigdata.rdf.lexicon.LexiconRelation; import com.bigdata.rdf.model.BigdataLiteral; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.ASTBase; import com.bigdata.rdf.sparql.ast.ASTContainer; import com.bigdata.rdf.sparql.ast.ASTUtil; @@ -256,7 +256,7 @@ static PipelineOp convert(final AST2BOpContext ctx, * (i.e., the bindingSets input to this method) is having the special * semantics of "globally scoped vars". We need to record and treat * them separately in some places. See also the discussion at - * https://groups.google.com/forum/#!topic/sesame-devel/Di_ZLtTVuZA. + * https://groups.google.com/forum/#!topic/rdf4j-devel/Di_ZLtTVuZA. * * Also note that, unless the solution set stats (which might be * adjusted by optimizers as the input binding set is modified), @@ -1045,7 +1045,7 @@ static private PipelineOp addServiceCall(PipelineOp left, final Set> varsToMockResolve = new HashSet>(); if(serviceRef instanceof IConstant) { - final BigdataURI serviceURI = ServiceCallUtility + final BigdataIRI serviceURI = ServiceCallUtility .getConstantServiceURI(serviceRef); final ServiceCall serviceCall = ServiceRegistry.getInstance() diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java index 0824584081..a44911e8f0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.sparql.ast.eval; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -38,14 +38,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern.Scope; -import org.openrdf.query.impl.EmptyBindingSet; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.impl.EmptyBindingSet; import com.bigdata.bop.BOp; import com.bigdata.bop.IPredicate; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTDeferredIVResolution.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTDeferredIVResolution.java index 5fd084fa8a..e412b285e7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTDeferredIVResolution.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTDeferredIVResolution.java @@ -10,22 +10,23 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern.Scope; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.impl.DatasetImpl; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.impl.DatasetImpl; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpBase; @@ -41,7 +42,7 @@ import com.bigdata.rdf.internal.impl.AbstractIV; import com.bigdata.rdf.internal.impl.TermId; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sail.sparql.ast.ASTDatasetClause; @@ -509,7 +510,7 @@ private void resolveDataset(final AbstractTripleStore store, final Map language = ((Literal) v).getLanguage(); final BigdataValue resolved; - if (language != null) { - resolved = vf.createLiteral(label, language); + if (language.isPresent()) { + resolved = vf.createLiteral(label, language.get()); } else { resolved = vf.createLiteral(label, dataType); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java index ab10ee58a9..b37e7af721 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java @@ -40,19 +40,19 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.impl.GraphQueryResultImpl; -import org.openrdf.query.impl.TupleQueryResultImpl; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.impl.GraphQueryResultImpl; +import org.eclipse.rdf4j.query.impl.TupleQueryResultImpl; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; @@ -93,7 +93,7 @@ import com.bigdata.striterator.IChunkedOrderedIterator; import cutthecrap.utils.striterators.ICloseableIterator; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** * Helper class for evaluating SPARQL queries. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTFulltextSearchOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTFulltextSearchOptimizer.java index 2083c72321..5b4709c42d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTFulltextSearchOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTFulltextSearchOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.sparql.ast.service.ServiceNode; import com.bigdata.service.fts.FTS; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTGeoSpatialSearchOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTGeoSpatialSearchOptimizer.java index 8624a36100..a4e8ca5ab6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTGeoSpatialSearchOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTGeoSpatialSearchOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.rdf.sparql.ast.service.ServiceNode; import com.bigdata.service.fts.FTS; @@ -46,11 +46,11 @@ */ public class ASTGeoSpatialSearchOptimizer extends ASTSearchOptimizerBase { - static public final Set searchUris; + static public final Set searchUris; static { - final Set set = new LinkedHashSet(); + final Set set = new LinkedHashSet(); set.add(GeoSpatial.SEARCH); set.add(GeoSpatial.SEARCH_DATATYPE); @@ -81,7 +81,7 @@ public class ASTGeoSpatialSearchOptimizer extends ASTSearchOptimizerBase { } @Override - protected Set getSearchUris() { + protected Set getSearchUris() { return searchUris; } @@ -91,7 +91,7 @@ protected String getNamespace() { } @Override - protected URI getSearchPredicate() { + protected IRI getSearchPredicate() { return GeoSpatial.SEARCH; } } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchInSearchOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchInSearchOptimizer.java index d407fc34bd..0ccf0a9d69 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchInSearchOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchInSearchOptimizer.java @@ -29,7 +29,7 @@ import java.util.Map; -import org.openrdf.model.Literal; +import org.eclipse.rdf4j.model.Literal; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java index 53a181d6f0..36764db88c 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.rdf.sparql.ast.service.ServiceNode; import com.bigdata.rdf.store.BDS; @@ -60,11 +60,11 @@ */ public class ASTSearchOptimizer extends ASTSearchOptimizerBase { - static final Set searchUris; + static final Set searchUris; static { - final Set set = new LinkedHashSet(); + final Set set = new LinkedHashSet(); set.add(BDS.SEARCH); set.add(BDS.RELEVANCE); @@ -85,7 +85,7 @@ public class ASTSearchOptimizer extends ASTSearchOptimizerBase { } @Override - protected Set getSearchUris() { + protected Set getSearchUris() { return searchUris; } @@ -95,7 +95,7 @@ protected String getNamespace() { } @Override - protected URI getSearchPredicate() { + protected IRI getSearchPredicate() { return BDS.SEARCH; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizerBase.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizerBase.java index ed7343dfc8..c7846d83b7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizerBase.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizerBase.java @@ -33,15 +33,15 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IVariable; import com.bigdata.rdf.internal.VTE; import com.bigdata.rdf.internal.impl.TermId; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.QueryNodeWithBindingSet; import com.bigdata.rdf.sparql.ast.ConstantNode; import com.bigdata.rdf.sparql.ast.DatasetNode; @@ -87,7 +87,7 @@ public abstract class ASTSearchOptimizerBase implements IASTOptimizer { /** * The known search URIs. */ - private Set searchUrisInternal; + private Set searchUrisInternal; /** * The known search URIs. @@ -97,7 +97,7 @@ public abstract class ASTSearchOptimizerBase implements IASTOptimizer { /** * The known search URIs. */ - private URI searchPredicate; + private IRI searchPredicate; protected ASTSearchOptimizerBase() { searchUrisInternal = getSearchUris(); @@ -108,7 +108,7 @@ protected ASTSearchOptimizerBase() { /** * Get the search URIs fields. */ - abstract protected Set getSearchUris(); + abstract protected Set getSearchUris(); /** * Get the namespace variables. @@ -118,7 +118,7 @@ protected ASTSearchOptimizerBase() { /** * Get the search predicate variables. */ - abstract protected URI getSearchPredicate(); + abstract protected IRI getSearchPredicate(); @SuppressWarnings("unchecked") @@ -181,7 +181,7 @@ private void extractSearches(// final GroupNodeBase group) { // lazily allocate iff we find some search predicates in this group. - Map, Map> tmp = null; + Map, Map> tmp = null; { @@ -202,27 +202,27 @@ private void extractSearches(// /** * This test only allows a binding for the predicate to - * be a URI. + * be a IRI. * * @see ClassCastException when binding non-uri values to + * > ClassCastException when binding non-iri values to * a variable that occurs in predicate position. */ - if (p.isConstant() && p.getValue() instanceof URI) { + if (p.isConstant() && p.getValue() instanceof IRI) { - final URI uri = (URI) ((ConstantNode) p).getValue(); + final IRI iri = (IRI) ((ConstantNode) p).getValue(); - if (uri != null // Must be a known value. - && uri.stringValue().startsWith(namespace)) { + if (iri != null // Must be a known value. + && iri.stringValue().startsWith(namespace)) { /* * Some search predicate. */ - if (!searchUrisInternal.contains(uri)) + if (!searchUrisInternal.contains(iri)) throw new RuntimeException( - "Unknown search predicate: " + uri); + "Unknown search predicate: " + iri); final TermNode s = sp.s(); @@ -236,19 +236,19 @@ private void extractSearches(// // Lazily allocate map. if (tmp == null) { - tmp = new LinkedHashMap, Map>(); + tmp = new LinkedHashMap, Map>(); } // Lazily allocate set for that searchVar. - Map statementPatterns = tmp + Map statementPatterns = tmp .get(searchVar); if (statementPatterns == null) { tmp.put(searchVar, - statementPatterns = new LinkedHashMap()); + statementPatterns = new LinkedHashMap()); } // Add search predicate to set for that searchVar. - statementPatterns.put(uri, sp); + statementPatterns.put(iri, sp); } @@ -273,12 +273,12 @@ private void extractSearches(// if (tmp != null) { - for (Map.Entry, Map> e : tmp + for (Map.Entry, Map> e : tmp .entrySet()) { final IVariable searchVar = e.getKey(); - final Map statementPatterns = e + final Map statementPatterns = e .getValue(); /* @@ -445,7 +445,7 @@ private ServiceNode createServiceNode(final AST2BOpContext ctx, final QueryBase queryBase, final GroupNodeBase group, IVariable searchVar, - final Map statementPatterns) { + final Map statementPatterns) { final JoinGroupNode groupNode = new JoinGroupNode(); @@ -456,8 +456,8 @@ private ServiceNode createServiceNode(final AST2BOpContext ctx, } @SuppressWarnings("unchecked") - final TermId iv = (TermId) TermId - .mockIV(VTE.URI); + final TermId iv = (TermId) TermId + .mockIV(VTE.IRI); iv.setValue(ctx.db.getValueFactory().asValue(searchPredicate)); @@ -475,7 +475,7 @@ private ServiceNode createServiceNode(final AST2BOpContext ctx, */ private void removeSearchPredicates( final GroupNodeBase group, - final Map statementPatterns) { + final Map statementPatterns) { for(StatementPatternNode sp : statementPatterns.values()) { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/CBD.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/CBD.java index ed2ee207d8..abc57d2aa1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/CBD.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/CBD.java @@ -26,7 +26,7 @@ */ package com.bigdata.rdf.sparql.ast.eval; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.util.LinkedHashSet; import java.util.Map; @@ -34,9 +34,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.evaluation.iterator.CollectionIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.iterator.CollectionIteration; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.bindingSet.ListBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DataSetSummary.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DataSetSummary.java index 70eb98aa57..114bce31a3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DataSetSummary.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DataSetSummary.java @@ -6,8 +6,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.openrdf.model.URI; -import org.openrdf.query.Dataset; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.Dataset; import com.bigdata.bop.BOpContextBase; import com.bigdata.bop.Constant; @@ -17,7 +17,7 @@ import com.bigdata.bop.fed.FederatedQueryEngine; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.store.IRawTripleStore; import com.bigdata.relation.IRelation; import com.bigdata.relation.accesspath.AccessPath; @@ -49,9 +49,9 @@ public static Set toInternalValues(final Set graphs) { IV iv = null; - if (uri != null && uri instanceof BigdataURI) { + if (uri != null && uri instanceof BigdataIRI) { - final BigdataURI bURI = (BigdataURI) uri; + final BigdataIRI bURI = (BigdataIRI) uri; iv = bURI.getIV(); @@ -107,7 +107,7 @@ public static Set toInternalValues(final Set graphs) { * @param graphs * The set of named graphs in the SPARQL DATASET (optional). A * runtime exception will be thrown during evaluation of the if - * the {@link URI}s are not {@link BigdataURI}s. If + * the {@link URI}s are not {@link BigdataIRI}s. If * graphs := null, then the set of named graphs is * understood to be ALL graphs in the quad store. * @param update diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/GeoSpatialServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/GeoSpatialServiceFactory.java index 9bf080c4ca..6ca385973a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/GeoSpatialServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/GeoSpatialServiceFactory.java @@ -45,9 +45,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContextBase; @@ -78,7 +78,7 @@ import com.bigdata.rdf.internal.impl.TermId; import com.bigdata.rdf.internal.impl.extensions.GeoSpatialLiteralExtension; import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sparql.ast.ConstantNode; @@ -178,7 +178,7 @@ public BigdataServiceCall create(final ServiceCallCreateParams createParams) { /* * Validate the geospatial predicates for a given search variable. */ - final Map, Map> map = verifyGraphPattern( + final Map, Map> map = verifyGraphPattern( store, serviceNode.getGraphPattern()); if (map == null) @@ -188,12 +188,12 @@ public BigdataServiceCall create(final ServiceCallCreateParams createParams) { throw new RuntimeException( "Multiple geospatial service requests may not be combined."); - final Map.Entry, Map> e = map + final Map.Entry, Map> e = map .entrySet().iterator().next(); final IVariable searchVar = e.getKey(); - final Map statementPatterns = e.getValue(); + final Map statementPatterns = e.getValue(); validateSearch(searchVar, statementPatterns); @@ -275,12 +275,12 @@ private static Properties getStoreProperties(AbstractTripleStore store) { * will detect both the absence of any search and the presence of more than * one search and throw an exception. */ - private Map, Map> verifyGraphPattern( + private Map, Map> verifyGraphPattern( final AbstractTripleStore database, final GroupNodeBase group) { // lazily allocate iff we find some search predicates in this group. - Map, Map> tmp = null; + Map, Map> tmp = null; final int arity = group.arity(); @@ -304,7 +304,7 @@ private Map, Map> verifyGraphPattern( throw new RuntimeException("Expecting geospatial predicate: " + sp); - final URI uri = (URI) ((ConstantNode) p).getValue(); + final IRI uri = (IRI) ((ConstantNode) p).getValue(); if (!uri.stringValue().startsWith(GeoSpatial.NAMESPACE)) throw new RuntimeException("Expecting search predicate: " + sp); @@ -327,19 +327,19 @@ private Map, Map> verifyGraphPattern( // Lazily allocate map. if (tmp == null) { - tmp = new LinkedHashMap, Map>(); + tmp = new LinkedHashMap, Map>(); } // Lazily allocate set for that searchVar. - Map statementPatterns = tmp + Map statementPatterns = tmp .get(searchVar); if (statementPatterns == null) { tmp.put( searchVar, - statementPatterns = new LinkedHashMap()); + statementPatterns = new LinkedHashMap()); } @@ -360,13 +360,13 @@ private Map, Map> verifyGraphPattern( * for a given searchVar. */ private void validateSearch(final IVariable searchVar, - final Map statementPatterns) { + final Map statementPatterns) { - final Set uris = new LinkedHashSet(); + final Set uris = new LinkedHashSet(); for (StatementPatternNode sp : statementPatterns.values()) { - final URI uri = (URI) (sp.p()).getValue(); + final IRI uri = (IRI) (sp.p()).getValue(); if (!uris.add(uri)) throw new RuntimeException( @@ -401,10 +401,10 @@ private void assertObjectIsURI(final StatementPatternNode sp) { final TermNode o = sp.o(); - if (o instanceof URI) { + if (o instanceof IRI) { throw new IllegalArgumentException( - "Object is not a URI: " + sp); + "Object is not a IRI: " + sp); } @@ -415,7 +415,7 @@ private void assertObjectIsUriOrVariable(final StatementPatternNode sp) { final TermNode o = sp.o(); boolean isNotUri= !o.isConstant() - || !(((ConstantNode) o).getValue() instanceof URI); + || !(((ConstantNode) o).getValue() instanceof IRI); boolean isNotVariable = !o.isVariable(); if (isNotUri && isNotVariable) { @@ -486,7 +486,7 @@ private static class GeoSpatialServiceCall implements BigdataServiceCall { public GeoSpatialServiceCall(final IVariable searchVar, - final Map sps, + final Map sps, final IServiceOptions serviceOptions, final GeoSpatialDefaults dflts, final AbstractTripleStore kb, final int maxParallel, final int numTasks, @@ -716,7 +716,7 @@ protected List getSubTasks() { stats.accessPathRangeCount.add(totalPointsInRange); - // set up datatype configuration for the datatype URI + // set up datatype configuration for the datatype IRI final GeoSpatialDatatypeConfiguration datatypeConfig = geoSpatialConfig.getConfigurationForDatatype(query.getSearchDatatype()); if (datatypeConfig==null) { @@ -819,7 +819,7 @@ protected GeoSpatialServiceCallSubRangeTask getSubTask( */ final GeoSpatialFilterBase filter; - // set up datatype configuration for the datatype URI + // set up datatype configuration for the datatype IRI final GeoSpatialDatatypeConfiguration datatypeConfig = query.getDatatypeConfig(); final GeoSpatialLiteralExtension litExt = new GeoSpatialLiteralExtension(kb.getLexiconRelation(), datatypeConfig); @@ -872,14 +872,14 @@ protected GeoSpatialServiceCallSubRangeTask getSubTask( final BigdataValue ctx = ctxTermNode==null ? null : ctxTermNode.getValue(); - if (ctx!=null && !(ctx instanceof BigdataURI)) { + if (ctx!=null && !(ctx instanceof BigdataIRI)) { throw new IllegalArgumentException( - "Context in GeoSpatial search must be a URI"); + "Context in GeoSpatial search must be a IRI"); } // register context check in the filter filter.addContextCheck( - keyOrder.getPositionInIndex(SPOKeyOrder.C), (BigdataURI)ctx); + keyOrder.getPositionInIndex(SPOKeyOrder.C), (BigdataIRI)ctx); } @@ -937,7 +937,7 @@ protected AccessPath getAccessPath( final Object[] lowerBorderComponents, final Object[] upperBorderComponents, final IGeoSpatialQuery query) { - // set up datatype configuration and literal extension object for the datatype URI + // set up datatype configuration and literal extension object for the datatype IRI final GeoSpatialDatatypeConfiguration datatypeConfig = query.getDatatypeConfig(); final GeoSpatialLiteralExtension litExt = new GeoSpatialLiteralExtension(kb.getLexiconRelation(), datatypeConfig); @@ -966,8 +966,8 @@ protected AccessPath getAccessPath( * exit point for the service (see null check below). */ IPredicate pred = (IPredicate) kb.getPredicate( - (URI) s.getValue(), /* subject */ - p==null ? null : (URI)p.getValue(), /* predicate */ + (IRI) s.getValue(), /* subject */ + p==null ? null : (IRI)p.getValue(), /* predicate */ o.getValue(), /* object */ null, /* context */ null, /* filter */ @@ -1566,7 +1566,7 @@ protected IBindingSet resolve(final Object obj) { new Constant( DummyConstantNode.toDummyIV( vf.createLiteral(literalSerializer.fromComponents(componentArr), - litExt.getDatatypeConfig().getUri())))); + litExt.getDatatypeConfig().getIri())))); } @@ -1775,7 +1775,7 @@ public abstract static class GeoSpatialFilterBase extends TupleFilter { // value of the constrained context (only used in quads mode if // geo:context predicate is used) - BigdataURI context = null; + BigdataIRI context = null; // counters objects GeoSpatialCounters geoSpatialCounters; @@ -1792,7 +1792,7 @@ public GeoSpatialFilterBase( // sets member variables that imply an additional context check public void addContextCheck( - final Integer contextPos, final BigdataURI context) { + final Integer contextPos, final BigdataIRI context) { this.contextPos = contextPos; this.context = context; @@ -2015,7 +2015,7 @@ public Set> getRequiredBound(final ServiceNode serviceNode) { final Set> requiredBound = new HashSet>(); for (StatementPatternNode sp : getStatementPatterns(serviceNode)) { - final URI predicate = (URI) (sp.p()).getValue(); + final IRI predicate = (IRI) (sp.p()).getValue(); final IVariableOrConstant object = sp.o().getValueExpression(); if (object instanceof IVariable) { @@ -2083,7 +2083,7 @@ public static class GeoSpatialServiceCallConfiguration { public GeoSpatialServiceCallConfiguration( final GeoSpatialDefaults defaults, final GeoSpatialConfig geoSpatialConfig, - final IVariable searchVar, final Map sps) { + final IVariable searchVar, final Map sps) { this.geoSpatialConfig = geoSpatialConfig; this.defaults = defaults; @@ -2262,7 +2262,7 @@ public GeoSpatialServiceCallConfiguration( */ public GeoSpatialQuery toGeoSpatialQuery(final IBindingSet bs) { - final URI searchDatatypeUri = resolveSearchDatatype( + final IRI searchDatatypeUri = resolveSearchDatatype( this.searchDatatype, bs); final GeoFunction searchFunction = resolveAsGeoFunction( this.searchFunction, bs); @@ -2594,10 +2594,10 @@ Object[] resolveAsLongDoubleArr(final TermNode termNode, final ValueType[] value return objArr; } - URI resolveSearchDatatype(final TermNode searchDatatype, final IBindingSet bs) { + IRI resolveSearchDatatype(final TermNode searchDatatype, final IBindingSet bs) { if (searchDatatype==null) { - final URI datatype = geoSpatialConfig.getDefaultDatatype(); + final IRI datatype = geoSpatialConfig.getDefaultDatatype(); if (datatype==null) { throw new GeoSpatialSearchException( @@ -2610,7 +2610,7 @@ URI resolveSearchDatatype(final TermNode searchDatatype, final IBindingSet bs) { if (searchDatatype.isConstant()) { - URI uri = (URI) searchDatatype.getValue(); + IRI uri = (IRI) searchDatatype.getValue(); if (uri==null) { @@ -2640,7 +2640,7 @@ URI resolveSearchDatatype(final TermNode searchDatatype, final IBindingSet bs) { } TermId cAsTerm = (TermId) c.get(); - return (URI)cAsTerm.getValue(); + return (IRI)cAsTerm.getValue(); } else { throw new GeoSpatialSearchException( diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/MutableTupleQueryResult.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/MutableTupleQueryResult.java index eeb3e8a80a..64421b3011 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/MutableTupleQueryResult.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/MutableTupleQueryResult.java @@ -16,8 +16,8 @@ */ package com.bigdata.rdf.sparql.ast.eval; -import info.aduna.iteration.Iteration; -import info.aduna.iteration.Iterations; +import org.eclipse.rdf4j.common.iteration.Iteration; +import org.eclipse.rdf4j.common.iteration.Iterations; import java.util.ArrayList; import java.util.Arrays; @@ -28,9 +28,9 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; /** * An implementation of the {@link TupleQueryResult} interface that stores the diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SampleServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SampleServiceFactory.java index fe5712cd3d..045a2a6d16 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SampleServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SampleServiceFactory.java @@ -35,10 +35,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContextBase; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java index 786d2e89ee..52c0c92a1d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java @@ -39,8 +39,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java index e71b7ce0ba..687c2773f3 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java @@ -37,8 +37,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ServiceParams.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ServiceParams.java index 838548bd58..a14ce70d22 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ServiceParams.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ServiceParams.java @@ -32,9 +32,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.IVariable; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java index f295d038d2..31d4119bfa 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java @@ -37,8 +37,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ValuesServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ValuesServiceFactory.java index bb587c5763..601392e9a2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ValuesServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ValuesServiceFactory.java @@ -35,10 +35,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContextBase; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintScope.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintScope.java index 060b00e563..fcfe417cf9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintScope.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintScope.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,8 +27,8 @@ package com.bigdata.rdf.sparql.ast.hints; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.sparql.ast.JoinGroupNode; import com.bigdata.rdf.sparql.ast.NamedSubqueryRoot; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTALPServiceOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTALPServiceOptimizer.java index 85e7ec6ec4..869ff61dcb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTALPServiceOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTALPServiceOptimizer.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTDescribeOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTDescribeOptimizer.java index 5bfe2831ee..9ad33190fb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTDescribeOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTDescribeOptimizer.java @@ -30,10 +30,10 @@ import java.util.Collection; import java.util.LinkedHashSet; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.IBindingSet; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.sparql.ast.AssignmentNode; import com.bigdata.rdf.sparql.ast.ConstantNode; @@ -233,7 +233,7 @@ public QueryNodeWithBindingSet optimize( } - final BigdataURI rdfSubject; + final BigdataIRI rdfSubject; if (describeMode.isForward() && describeMode.isReifiedStatements()) { /* * We will need to look for the rdf:subject property, so resolve @@ -246,7 +246,7 @@ public QueryNodeWithBindingSet optimize( final AbstractTripleStore db = context.getAbstractTripleStore(); - final BigdataURI tmp = db.getValueFactory().asValue(RDF.SUBJECT); + final BigdataIRI tmp = db.getValueFactory().asValue(RDF.SUBJECT); db.getLexiconRelation().addTerms(new BigdataValue[] { tmp }, 1/* numTerms */, true/* readOnly */); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFastRangeCountOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFastRangeCountOptimizer.java index 8b526974e9..f299818e78 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFastRangeCountOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFastRangeCountOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFilterNormalizationOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFilterNormalizationOptimizer.java index 61acad825b..907c13531f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFilterNormalizationOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFilterNormalizationOptimizer.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTGraphGroupOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTGraphGroupOptimizer.java index d7c6cef1bd..5be32d6630 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTGraphGroupOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTGraphGroupOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,10 +27,10 @@ package com.bigdata.rdf.sparql.ast.optimizers; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.IBindingSet; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.QueryNodeWithBindingSet; import com.bigdata.rdf.sparql.ast.DatasetNode; import com.bigdata.rdf.sparql.ast.FilterNode; @@ -236,7 +236,7 @@ private void visitGroups( */ assertGraphInNamedDataset( - (BigdataURI) ((TermNode) innerGraphContext).getValue(), + (BigdataIRI) ((TermNode) innerGraphContext).getValue(), dataSet); } @@ -463,7 +463,7 @@ private void assertSameURI(final TermNode context, * @param dataSet * The dataset. */ - private void assertGraphInNamedDataset(final BigdataURI uri, + private void assertGraphInNamedDataset(final BigdataIRI uri, final DatasetNode dataSet) { if (dataSet == null) { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java index 3ad062fa86..a85a7381cf 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,7 +31,7 @@ import java.util.LinkedList; import java.util.List; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTPropertyPathOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTPropertyPathOptimizer.java index 185d5b4f23..49a5197455 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTPropertyPathOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTPropertyPathOptimizer.java @@ -33,7 +33,7 @@ import java.util.Properties; import java.util.UUID; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java index 6de80a14e3..0a19870f63 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTQueryHintOptimizer.java @@ -35,14 +35,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IValueExpression; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.sparql.ast.ASTBase; import com.bigdata.rdf.sparql.ast.ConstantNode; @@ -531,7 +531,7 @@ private boolean isQueryHint(final StatementPatternNode sp) { if(!(p instanceof URI)) return false; - final BigdataURI u = (BigdataURI) p; + final BigdataIRI u = (BigdataIRI) p; final String str = u.stringValue(); @@ -568,10 +568,10 @@ private QueryHintScope getScope(final TermNode t) { final BigdataValue v = ((ConstantNode) t).getValue(); - if (!(v instanceof BigdataURI)) + if (!(v instanceof BigdataIRI)) throw new RuntimeException("Query hint scope is not a URI."); - final BigdataURI u = (BigdataURI) v; + final BigdataIRI u = (BigdataIRI) v; return QueryHintScope.valueOf(u); @@ -595,10 +595,10 @@ private String getName(final TermNode t) { final BigdataValue v = ((ConstantNode) t).getValue(); - if (!(v instanceof BigdataURI)) + if (!(v instanceof BigdataIRI)) throw new RuntimeException("Predicate position of query hint is not a URI."); - final BigdataURI u = (BigdataURI) v; + final BigdataIRI u = (BigdataIRI) v; final String name = u.getLocalName(); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java index 7a11d21d31..76e0e27fb1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java @@ -32,8 +32,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.query.algebra.Compare.CompareOp; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.algebra.Compare.CompareOp; import com.bigdata.bop.BOpContextBase; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSimpleOptionalOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSimpleOptionalOptimizer.java index 8844b47fe4..26e9192e99 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSimpleOptionalOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTSimpleOptionalOptimizer.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -42,7 +42,7 @@ import com.bigdata.rdf.internal.constraints.INeedsMaterialization; import com.bigdata.rdf.internal.constraints.INeedsMaterialization.Requirement; import com.bigdata.rdf.internal.constraints.TrueBOp; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sparql.ast.ComputedMaterializationRequirement; import com.bigdata.rdf.sparql.ast.FilterNode; import com.bigdata.rdf.sparql.ast.GraphPatternGroup; @@ -192,7 +192,7 @@ private void collectOptionalGroups( } - final BigdataURI serviceURI = ServiceCallUtility + final BigdataIRI serviceURI = ServiceCallUtility .getConstantServiceURI(serviceRef); if (!BDS.SEARCH.equals(serviceURI)) { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticBindingsOptimizer.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticBindingsOptimizer.java index c62b9400e8..fdb2d9b1f2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticBindingsOptimizer.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticBindingsOptimizer.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpContext; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/DefaultOptimizerList.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/DefaultOptimizerList.java index 19dd2df1f5..209dc3c6bb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/DefaultOptimizerList.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/DefaultOptimizerList.java @@ -27,13 +27,13 @@ package com.bigdata.rdf.sparql.ast.optimizers; -import org.openrdf.query.algebra.evaluation.impl.CompareOptimizer; -import org.openrdf.query.algebra.evaluation.impl.ConjunctiveConstraintSplitter; -import org.openrdf.query.algebra.evaluation.impl.DisjunctiveConstraintOptimizer; -import org.openrdf.query.algebra.evaluation.impl.FilterOptimizer; -import org.openrdf.query.algebra.evaluation.impl.IterativeEvaluationOptimizer; -import org.openrdf.query.algebra.evaluation.impl.QueryModelNormalizer; -import org.openrdf.query.algebra.evaluation.impl.SameTermFilterOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.CompareOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ConjunctiveConstraintSplitter; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.DisjunctiveConstraintOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.FilterOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.IterativeEvaluationOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.QueryModelNormalizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.SameTermFilterOptimizer; import com.bigdata.rdf.sparql.ast.FunctionRegistry; import com.bigdata.rdf.sparql.ast.QueryHints; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ExternalServiceCall.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ExternalServiceCall.java index 2a889d7239..12b5382a75 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ExternalServiceCall.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ExternalServiceCall.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,8 +27,8 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IRemoteSparqlQueryBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IRemoteSparqlQueryBuilder.java index 61213e1701..bd10b52171 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IRemoteSparqlQueryBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IRemoteSparqlQueryBuilder.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Interface for objects which can construct a valid SPARQL query for execution diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IServiceOptions.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IServiceOptions.java index 575d34907b..d97aebc6db 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IServiceOptions.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IServiceOptions.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,8 +27,8 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.model.Value; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.IBindingSet; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/OpenrdfNativeServiceOptions.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/OpenrdfNativeServiceOptions.java index ee85b75975..51e1b7c874 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/OpenrdfNativeServiceOptions.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/OpenrdfNativeServiceOptions.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCall.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCall.java index 4f942826f1..ed08d28d8d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCall.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCall.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * Service invocation interface for an REMOTE SPARQL service. Data interchange diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java index 8ef78de7e3..69998ffa8a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,9 +30,9 @@ import java.util.UUID; import org.eclipse.jetty.client.HttpClient; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; import com.bigdata.rdf.sail.Sesame2BigdataIterator; import com.bigdata.rdf.sail.webapp.client.ConnectOptions; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java index 42c1439e0a..e6d0b12602 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql10QueryBuilder.java @@ -34,11 +34,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.EmptyBindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.EmptyBindingSet; import com.bigdata.bop.IVariable; import com.bigdata.rdf.sail.webapp.client.AST2SPARQLUtil; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11DraftQueryBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11DraftQueryBuilder.java index 7b289cd968..0f40a3a288 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11DraftQueryBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11DraftQueryBuilder.java @@ -33,10 +33,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.IVariable; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java index 3d908043ba..0c633fd73b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparql11QueryBuilder.java @@ -34,10 +34,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.IVariable; import com.bigdata.rdf.sail.webapp.client.AST2SPARQLUtil; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparqlBuilderFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparqlBuilderFactory.java index 93fd45899d..644f49b01d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparqlBuilderFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteSparqlBuilderFactory.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,10 +30,10 @@ import java.util.HashSet; import java.util.Set; -import org.openrdf.model.BNode; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java index 97e07f8d89..85d5deaa86 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCall.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,7 +27,7 @@ package com.bigdata.rdf.sparql.ast.service; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.IBindingSet; import com.bigdata.relation.accesspath.IBindingSetAccessPath; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallCreateParams.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallCreateParams.java index a79ac52ea6..da4abafcab 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallCreateParams.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallCreateParams.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import org.apache.http.conn.ClientConnectionManager; import org.eclipse.jetty.client.HttpClient; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.join.BaseJoinStats; import com.bigdata.rdf.store.AbstractTripleStore; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallUtility.java index 965db59e77..9f99b785f7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceCallUtility.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,10 +31,10 @@ import java.util.Map; import java.util.Set; -import org.openrdf.model.URI; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; @@ -47,7 +47,7 @@ import com.bigdata.rdf.internal.IVCache; import com.bigdata.rdf.internal.NotMaterializedException; import com.bigdata.rdf.lexicon.LexiconRelation; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.sail.BigdataValueReplacer; import com.bigdata.rdf.store.AbstractTripleStore; @@ -80,7 +80,7 @@ public class ServiceCallUtility { * if the service reference evaluates to an {@link IV} which is * not materialized. */ - static public BigdataURI getConstantServiceURI( + static public BigdataIRI getConstantServiceURI( final IVariableOrConstant serviceRef) { if (serviceRef.isVar()) { @@ -98,7 +98,7 @@ static public BigdataURI getConstantServiceURI( if (!serviceRefIV.hasValue()) throw new NotMaterializedException(ERR_NOT_MATERIALIZED); - final BigdataURI serviceURI = (BigdataURI) serviceRefIV.getValue(); + final BigdataIRI serviceURI = (BigdataIRI) serviceRefIV.getValue(); return serviceURI; @@ -121,7 +121,7 @@ static public BigdataURI getConstantServiceURI( * if the service reference evaluates to an {@link IV} which is * not materialized. */ - static public BigdataURI getServiceURI( + static public BigdataIRI getServiceURI( final IVariableOrConstant serviceRef, final IBindingSet bset) { // Evaluate the serviceRef expression. @@ -137,7 +137,7 @@ static public BigdataURI getServiceURI( if (!serviceRefIV.hasValue()) throw new NotMaterializedException(ERR_NOT_MATERIALIZED); - final BigdataURI serviceURI = (BigdataURI) serviceRefIV.getValue(); + final BigdataIRI serviceURI = (BigdataIRI) serviceRefIV.getValue(); return serviceURI; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceNode.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceNode.java index 72bdb1b7c5..25b2f4033b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceNode.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceNode.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.IConstant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceRegistry.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceRegistry.java index 72bbdf1d7a..880f814b5e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceRegistry.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/ServiceRegistry.java @@ -35,8 +35,8 @@ import org.apache.http.conn.ClientConnectionManager; import org.eclipse.jetty.client.HttpClient; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.bop.join.BaseJoinStats; import com.bigdata.rdf.graph.impl.bd.GASService; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java index e14a1c8756..0b3c04a354 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/SimpleStoredQueryService.java @@ -24,8 +24,8 @@ */ package com.bigdata.rdf.sparql.ast.service.storedquery; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQueryResult; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; import com.bigdata.rdf.sail.BigdataSailTupleQuery; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java index b9e3ed5336..cbb3ddd434 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/storedquery/StoredQueryService.java @@ -28,9 +28,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java index b5a7b3197c..a67cd4a678 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java @@ -28,7 +28,7 @@ package com.bigdata.rdf.spo; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.bop.IElement; import com.bigdata.rdf.inf.Justification; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java index 8c4da61ac5..c0f7dbb086 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java @@ -7,10 +7,10 @@ import java.util.Arrays; import java.util.HashSet; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.internal.IV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; /** * "IN" filter for the context position based on a sorted long[] of the @@ -61,7 +61,7 @@ public InGraphBinarySearchFilter(final Iterable graphs) { for (URI uri : graphs) { - final IV termId = ((BigdataURI) uri).getIV(); + final IV termId = ((BigdataIRI) uri).getIV(); if (termId != null) { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java index 7b41bdcff5..6b6cf5d845 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java @@ -23,10 +23,10 @@ */ package com.bigdata.rdf.spo; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.IConstant; import com.bigdata.bop.IPredicate; @@ -40,7 +40,7 @@ import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataStatementImpl; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.StatementEnum; import com.bigdata.rdf.store.AbstractTripleStore; @@ -396,7 +396,7 @@ public SPO(final IPredicate predicate) { * @param o * @param type */ - public SPO(final BigdataResource s, final BigdataURI p, + public SPO(final BigdataResource s, final BigdataIRI p, final BigdataValue o, final StatementEnum type) { this(s.getIV(), p.getIV(), o.getIV(), type); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java index 1e21fbcf96..e5e6569a77 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java @@ -47,16 +47,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.rio.rdfxml.RDFXMLParser; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.rio.rdfxml.RDFXMLParser; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; @@ -113,7 +113,7 @@ import com.bigdata.rdf.lexicon.TermIdEncoder; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; @@ -3188,7 +3188,7 @@ public BigdataStatement asStatement(final ISPO spo) { return getValueFactory().createStatement(// (BigdataResource) terms.get(spo.s()),// - (BigdataURI) terms.get(spo.p()),// + (BigdataIRI) terms.get(spo.p()),// (BigdataValue) terms.get(spo.o()),// (BigdataResource) (c != null ? terms.get(c) : null),// spo.getStatementType(),// @@ -3248,7 +3248,7 @@ final public IAccessPath getAccessPath(final Resource s, final URI p, final BigdataResource _s = valueFactory == null ? null : valueFactory .asValue(s); - final BigdataURI _p = valueFactory == null ? null : valueFactory + final BigdataIRI _p = valueFactory == null ? null : valueFactory .asValue(p); final BigdataValue _o = valueFactory == null ? null : valueFactory @@ -3375,7 +3375,7 @@ final public IPredicate getPredicate(final Resource s, final URI p, final BigdataResource _s = valueFactory == null ? null : valueFactory .asValue(s); - final BigdataURI _p = valueFactory == null ? null : valueFactory + final BigdataIRI _p = valueFactory == null ? null : valueFactory .asValue(p); final BigdataValue _o = valueFactory == null ? null : valueFactory diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java index 4e3ac39216..caf9d0e9d7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BD.java @@ -28,11 +28,11 @@ package com.bigdata.rdf.store; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.SESAME; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.SESAME; import com.bigdata.rdf.sparql.ast.cache.DescribeServiceFactory; import com.bigdata.rdf.sparql.ast.eval.ServiceParams; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java index e3f527c9a4..f61065338d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java @@ -28,8 +28,9 @@ package com.bigdata.rdf.store; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.sparql.ast.eval.SliceServiceFactory; @@ -91,7 +92,7 @@ public interface BDS { * Note: The context position should be unbound when using statement * identifiers. */ - final URI SEARCH = new URIImpl(NAMESPACE + "search"); + final IRI SEARCH = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "search"); /** * Magic predicate used to query for free text search metadata, reporting @@ -116,7 +117,7 @@ public interface BDS { * @see #MIN_RELEVANCE * @see #MAX_RELEVANCE */ - final URI RELEVANCE = new URIImpl(NAMESPACE + "relevance"); + final IRI RELEVANCE = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "relevance"); /** * Magic predicate used to query for free text search metadata, reporting @@ -140,7 +141,7 @@ public interface BDS { * @see #MIN_RANK * @see #MAX_RANK */ - final URI RANK = new URIImpl(NAMESPACE + "rank"); + final IRI RANK = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "rank"); /** * Magic predicate used to limit the maximum rank of the free text search @@ -166,7 +167,7 @@ public interface BDS { * feed the next "page" of free text results by changing the values for the * {@link #MIN_RANK} AND {@link #MAX_RANK} query hints. */ - final URI MAX_RANK = new URIImpl(NAMESPACE + "maxRank"); + final IRI MAX_RANK = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "maxRank"); /** * The default for {@link #MAX_RANK}. @@ -191,7 +192,7 @@ public interface BDS { * * The default is {@value #DEFAULT_MIN_RANK}. */ - final URI MIN_RANK = new URIImpl(NAMESPACE + "minRank"); + final IRI MIN_RANK = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "minRank"); /** * The default for {@link #MIN_RANK} is 1, full text search results will @@ -219,7 +220,7 @@ public interface BDS { * specify a minimum relevance of ZERO (0.0) as this can drag in way too * many unrelated results. The default is {@value #DEFAULT_MIN_RELEVANCE}. */ - final URI MIN_RELEVANCE = new URIImpl(NAMESPACE + "minRelevance"); + final IRI MIN_RELEVANCE = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "minRelevance"); final double DEFAULT_MIN_RELEVANCE = 0.0d; @@ -244,7 +245,7 @@ public interface BDS { * many unrelated results. The default maximum relevance is * {@value #DEFAULT_MAX_RELEVANCE}. */ - final URI MAX_RELEVANCE = new URIImpl(NAMESPACE + "maxRelevance"); + final IRI MAX_RELEVANCE = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "maxRelevance"); /** * The default value for {@link #MAX_RELEVANCE} unless overridden. @@ -269,7 +270,7 @@ public interface BDS { * * */ - final URI MATCH_ALL_TERMS = new URIImpl(NAMESPACE + "matchAllTerms"); + final IRI MATCH_ALL_TERMS = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "matchAllTerms"); final boolean DEFAULT_MATCH_ALL_TERMS = false; @@ -292,7 +293,7 @@ public interface BDS { * This operation will be rather expensive as it will require materializing * all the hits to check their values. */ - final URI MATCH_EXACT = new URIImpl(NAMESPACE + "matchExact"); + final IRI MATCH_EXACT = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "matchExact"); final boolean DEFAULT_MATCH_EXACT = false; @@ -315,7 +316,7 @@ public interface BDS { * This operation will be rather expensive as it will require materializing * all the hits to check their values. */ - final URI MATCH_REGEX = new URIImpl(NAMESPACE + "matchRegex"); + final IRI MATCH_REGEX = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "matchRegex"); final String DEFAULT_MATCH_REGEX = null; @@ -361,7 +362,7 @@ public interface BDS { * prefixMatch does not work in full text search */ @Deprecated - final URI PREFIX_MATCH = new URIImpl(NAMESPACE + "prefixMatch"); + final IRI PREFIX_MATCH = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "prefixMatch"); /** * @deprecated This option is now invoked using a wildcard. @@ -390,7 +391,7 @@ public interface BDS { * BZLG-1548, BLZG-563. */ @Deprecated - final URI SUBJECT_SEARCH = new URIImpl(NAMESPACE + "subjectSearch"); + final IRI SUBJECT_SEARCH = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "subjectSearch"); @Deprecated final boolean DEFAULT_SUBJECT_SEARCH = false; @@ -399,7 +400,7 @@ public interface BDS { * Magic predicate used for the "search in search" service. Also serves as * the identifier for the service itself. */ - final URI SEARCH_IN_SEARCH = new URIImpl(NAMESPACE + "searchInSearch"); + final IRI SEARCH_IN_SEARCH = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "searchInSearch"); /** * Magic predicate used to query for free text search metadata to set a @@ -420,7 +421,7 @@ public interface BDS { *

* Timeout specified in milliseconds. */ - final URI SEARCH_TIMEOUT = new URIImpl(NAMESPACE + "searchTimeout"); + final IRI SEARCH_TIMEOUT = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "searchTimeout"); /** * The default timeout for a free text search (milliseconds). @@ -434,6 +435,6 @@ public interface BDS { * the hits into an array. This is only possible if matchExact == false * and matchRegex == null. */ - final URI RANGE_COUNT = new URIImpl(NAMESPACE + "rangeCount"); + final IRI RANGE_COUNT = SimpleValueFactory.getInstance().createIRI(NAMESPACE, "rangeCount"); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java index ce8aec891c..2320ebc3b0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataOpenRDFBindingSetsResolverator.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataOpenRDFBindingSetsResolverator.java index c3dfbbc2da..30be0e6884 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataOpenRDFBindingSetsResolverator.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataOpenRDFBindingSetsResolverator.java @@ -35,9 +35,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java index afe61fc75b..f023417485 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataSolutionResolverator.java @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.Constant; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java index 269836bf57..11f90a706a 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataStatementIteratorImpl.java @@ -8,7 +8,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.impl.bnode.SidIV; @@ -16,7 +16,7 @@ import com.bigdata.rdf.model.BigdataBNodeImpl; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.spo.ISPO; @@ -184,7 +184,7 @@ protected BigdataStatement[] resolveChunk(final ISPO[] chunk) { * fetched the current chunk. */ final BigdataResource s = (BigdataResource) resolve(terms, spo.s()); - final BigdataURI p = (BigdataURI) resolve(terms, spo.p()); + final BigdataIRI p = (BigdataIRI) resolve(terms, spo.p()); // try { // p = (BigdataURI) resolve(terms, spo.p()); // } catch (ClassCastException ex) { @@ -202,8 +202,8 @@ protected BigdataStatement[] resolveChunk(final ISPO[] chunk) { * BigdataSolutionResolverator. */ final BigdataResource tmp = (BigdataResource) resolve(terms, _c); - if (tmp instanceof BigdataURI - && ((BigdataURI) tmp).equals(BD.NULL_GRAPH)) { + if (tmp instanceof BigdataIRI + && ((BigdataIRI) tmp).equals(BD.NULL_GRAPH)) { /* * Strip off the "nullGraph" context. */ diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataTriplePattern.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataTriplePattern.java index 8681fb8771..80c02e9c98 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataTriplePattern.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataTriplePattern.java @@ -24,9 +24,9 @@ */ package com.bigdata.rdf.store; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; /** * A simple class that represents a triple (or quad) pattern. diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java index 7810b948bb..a365eda828 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataValueIteratorImpl.java @@ -54,7 +54,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson. import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java index b422d5c28f..0e1699ba78 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java @@ -51,8 +51,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParseException; import com.bigdata.Banner; import com.bigdata.counters.CounterSet; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java index aabfb62816..4f79dc9927 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/IRawTripleStore.java @@ -27,7 +27,7 @@ package com.bigdata.rdf.store; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.lexicon.LexiconRelation; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java index c76157ffc7..bba4b1d59d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/ITripleStore.java @@ -27,10 +27,10 @@ package com.bigdata.rdf.store; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataStatementImpl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java index a3ef88dd15..0caaf093e7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java @@ -36,7 +36,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; +import org.eclipse.rdf4j.model.Statement; import com.bigdata.journal.Journal; import com.bigdata.journal.TimestampUtility; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/task/AbstractApiTask.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/task/AbstractApiTask.java index f1eac4d5d1..c70c91f10e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/task/AbstractApiTask.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/task/AbstractApiTask.java @@ -28,8 +28,8 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicReference; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.counters.CAT; import com.bigdata.journal.IConcurrencyManager; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/util/VocabBuilder.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/util/VocabBuilder.java index 75f6d2bf35..b593be9be1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/util/VocabBuilder.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/util/VocabBuilder.java @@ -42,16 +42,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; import com.bigdata.rdf.ServiceProviderHook; import com.bigdata.rdf.rio.IRDFParserOptions; @@ -343,8 +343,8 @@ public static void main(final String[] args) { System.out.println("import java.util.Arrays;"); System.out.println("import java.util.Collections;"); System.out.println("import java.util.Iterator;"); - System.out.println("import org.openrdf.model.URI;"); - System.out.println("import org.openrdf.model.impl.URIImpl;"); + System.out.println("import org.eclipse.rdf4j.model.URI;"); + System.out.println("import org.eclipse.rdf4j.model.impl.URIImpl;"); System.out.println("import com.bigdata.rdf.vocab.VocabularyDecl;"); System.out.println("public class "+className+" implements VocabularyDecl {"); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java index fc230e24c7..1b41d6efd6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabulary.java @@ -39,8 +39,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.Constant; import com.bigdata.bop.IConstant; @@ -48,7 +48,7 @@ import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV; import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.model.BigdataValueFactoryImpl; @@ -214,7 +214,7 @@ final protected void addDecl(final VocabularyDecl decl) { // * @throws IllegalArgumentException // * if the value is null. // */ -// final protected void add(final URI value) { +// final protected void add(final IRI value) { // // if (value == null) // throw new IllegalArgumentException(); @@ -231,7 +231,7 @@ private void addAllDecls() { for (VocabularyDecl decl : decls) { - final Iterator itr = decl.values(); + final Iterator itr = decl.values(); while (itr.hasNext()) { @@ -298,12 +298,12 @@ private void generateIVs() { if (i <= 255) { // Use a byte for the 1st 256 declared vocabulary items. - iv = new VocabURIByteIV((byte) i); + iv = new VocabURIByteIV((byte) i); } else { // Use a short for the next 64k declared vocabulary items. - iv = new VocabURIShortIV((short) i); + iv = new VocabURIShortIV((short) i); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabularyDecl.java index efab81c1a4..46d73a8184 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/BaseVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -28,30 +28,31 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; /** * Basic {@link VocabularyDecl} implementation. */ public class BaseVocabularyDecl implements VocabularyDecl { - private final URI[] uris; + private final IRI[] iris; /** - * Construct a decl from an array of URIs or URI Strings. Any object types - * other than URI or String will cause an IllegalArgumentException. + * Construct a decl from an array of URIs or IRI Strings. Any object types + * other than IRI or String will cause an IllegalArgumentException. */ public BaseVocabularyDecl(final Object... uris) { if (uris == null) { - this.uris = new URI[0]; + this.iris = new IRI[0]; } else { - this.uris = new URI[uris.length]; + this.iris = new IRI[uris.length]; for (int i = 0; i < uris.length; i++) { - if (uris[i] instanceof URI) { - this.uris[i] = (URI) uris[i]; + if (uris[i] instanceof IRI) { + this.iris[i] = (IRI) uris[i]; } else if (uris[i] instanceof String) { - this.uris[i] = new URIImpl((String) uris[i]); + this.iris[i] = SimpleValueFactory.getInstance().createIRI((String) uris[i]); } else { throw new IllegalArgumentException("URIs or Strings only: " + uris[i]); } @@ -63,8 +64,8 @@ public BaseVocabularyDecl(final Object... uris) { * Return an iterator which will visit the declared values. The iterator * must not support removal. */ - public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + public Iterator values() { + return Collections.unmodifiableList(Arrays.asList(iris)).iterator(); } } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/RDFSVocabulary.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/RDFSVocabulary.java index 8e86d726c8..72b423df28 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/RDFSVocabulary.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/RDFSVocabulary.java @@ -27,11 +27,11 @@ package com.bigdata.rdf.vocab; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import com.bigdata.rdf.store.AbstractTripleStore; import com.bigdata.rdf.vocab.decls.DCAllVocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java index 7966302db7..522c6945e5 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/Vocabulary.java @@ -29,7 +29,7 @@ import java.util.Iterator; -import org.openrdf.model.Value; +import org.eclipse.rdf4j.model.Value; import com.bigdata.bop.IConstant; import com.bigdata.rdf.internal.IV; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/VocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/VocabularyDecl.java index 4ed67e7af8..627d4ee865 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/VocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/VocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Iterator; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV; import com.bigdata.rdf.store.AbstractTripleStore; @@ -59,6 +59,6 @@ public interface VocabularyDecl { * Return an iterator which will visit the declared values. The iterator * must not support removal. */ - public Iterator values(); + public Iterator values(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/core/BigdataCoreVocabulary_v20151210.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/core/BigdataCoreVocabulary_v20151210.java index 2228555fb8..ebdb440346 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/core/BigdataCoreVocabulary_v20151210.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/core/BigdataCoreVocabulary_v20151210.java @@ -24,7 +24,7 @@ package com.bigdata.rdf.vocab.core; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.sail.RDRHistory; import com.bigdata.rdf.store.AbstractTripleStore; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/BSBMVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/BSBMVocabularyDecl.java index 36480ab2d8..e062724e18 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/BSBMVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/BSBMVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,9 +30,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -58,30 +60,32 @@ public class BSBMVocabularyDecl implements VocabularyDecl { public static final String INSTANCES = "http://www4.wiwiss.fu-berlin.de/bizer/bsbm/v01/instances/"; - public static final URI USD = new URIImpl(VOCABULARY + "USD"); - - static private final URI[] uris = new URI[]{// - // namespace for instance data. - new URIImpl(INSTANCES),// - // namespace for vocabulary - new URIImpl(VOCABULARY),// - new URIImpl(VOCABULARY + "reviewDate"),// - new URIImpl(VOCABULARY + "reviewFor"),// - new URIImpl(VOCABULARY + "ProductType"),// - new URIImpl(VOCABULARY + "rating1"),// - new URIImpl(VOCABULARY + "rating2"),// - new URIImpl(VOCABULARY + "rating3"),// - new URIImpl(VOCABULARY + "rating4"),// - USD,// - }; + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + + public static final IRI USD = VALUE_FACTORY.createIRI(VOCABULARY, "USD"); + + static private final List iris = List.of( // + // namespace for instance data. + VALUE_FACTORY.createIRI(INSTANCES), // + // namespace for vocabulary + VALUE_FACTORY.createIRI(VOCABULARY), // + VALUE_FACTORY.createIRI(VOCABULARY, "reviewDate"), // + VALUE_FACTORY.createIRI(VOCABULARY, "reviewFor"), // + VALUE_FACTORY.createIRI(VOCABULARY, "ProductType"), // + VALUE_FACTORY.createIRI(VOCABULARY, "rating1"), // + VALUE_FACTORY.createIRI(VOCABULARY, "rating2"), // + VALUE_FACTORY.createIRI(VOCABULARY, "rating3"), // + VALUE_FACTORY.createIRI(VOCABULARY, "rating4"), // + USD// + ); public BSBMVocabularyDecl() { } - - public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); - + public Iterator values() { + + return iris.iterator(); + } } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCAllVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCAllVocabularyDecl.java index 09f1d09b1b..5c379fd1c7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCAllVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCAllVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.Iterator; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.URI; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCElementsVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCElementsVocabularyDecl.java index b292f97bf8..42f8888910 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCElementsVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCElementsVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,8 +31,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCTermsVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCTermsVocabularyDecl.java index 2ab6f85fae..93df8f03e1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCTermsVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/DCTermsVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,12 +27,12 @@ package com.bigdata.rdf.vocab.decls; -import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; /** * Dublin Core terms. @@ -44,28 +44,30 @@ */ public class DCTermsVocabularyDecl { + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + public static final String NAMESPACE = "http://purl.org/dc/terms/"; - public static final URI description = new URIImpl(NAMESPACE + "description"); - public static final URI hasVersion = new URIImpl(NAMESPACE + "hasVersion"); - public static final URI issued = new URIImpl(NAMESPACE + "issued"); - public static final URI modified = new URIImpl(NAMESPACE + "modified"); - public static final URI publisher = new URIImpl(NAMESPACE + "publisher"); - public static final URI reviewer = new URIImpl(NAMESPACE + "reviewer"); - public static final URI Review = new URIImpl(NAMESPACE + "Review"); - public static final URI text = new URIImpl(NAMESPACE + "text"); - public static final URI title = new URIImpl(NAMESPACE + "title"); - - static private final URI[] uris = new URI[]{ - new URIImpl(NAMESPACE),// + public static final IRI description = VALUE_FACTORY.createIRI(NAMESPACE, "description"); + public static final IRI hasVersion = VALUE_FACTORY.createIRI(NAMESPACE, "hasVersion"); + public static final IRI issued = VALUE_FACTORY.createIRI(NAMESPACE, "issued"); + public static final IRI modified = VALUE_FACTORY.createIRI(NAMESPACE, "modified"); + public static final IRI publisher = VALUE_FACTORY.createIRI(NAMESPACE, "publisher"); + public static final IRI reviewer = VALUE_FACTORY.createIRI(NAMESPACE, "reviewer"); + public static final IRI Review = VALUE_FACTORY.createIRI(NAMESPACE, "Review"); + public static final IRI text = VALUE_FACTORY.createIRI(NAMESPACE, "text"); + public static final IRI title = VALUE_FACTORY.createIRI(NAMESPACE, "title"); + + static private final List iris = List.of( + VALUE_FACTORY.createIRI(NAMESPACE), // description, hasVersion, issued, modified, publisher, reviewer, - Review, text, title, }; + Review, text, title); public DCTermsVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/FOAFVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/FOAFVocabularyDecl.java index ee4fcbf3ea..d699ab2eea 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/FOAFVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/FOAFVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,8 +31,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/GeoSpatialVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/GeoSpatialVocabularyDecl.java index b9ee07cf98..a41906a1e9 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/GeoSpatialVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/GeoSpatialVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,8 +31,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; import com.bigdata.service.geospatial.GeoSpatial; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/LUBMVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/LUBMVocabularyDecl.java index 56ec0ef8ef..c945a52ed2 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/LUBMVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/LUBMVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,8 +31,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OPVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OPVocabularyDecl.java index ec467aba86..357dec785e 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OPVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OPVocabularyDecl.java @@ -4,8 +4,8 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OWLVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OWLVocabularyDecl.java index d8a0186b50..5027385045 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OWLVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/OWLVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,9 +31,9 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.OWL; import com.bigdata.rdf.vocab.VocabularyDecl; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFSVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFSVocabularyDecl.java index e57c0bd9f5..635a10a8d6 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFSVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFSVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,10 +30,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDFS; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -47,8 +49,8 @@ */ public class RDFSVocabularyDecl implements VocabularyDecl { - static private final URI[] uris = new URI[]{ - new URIImpl(RDFS.NAMESPACE),// + static private final List iris = List.of( + SimpleValueFactory.getInstance().createIRI(RDFS.NAMESPACE),// RDFS.CLASS,// RDFS.COMMENT,// RDFS.CONTAINER,// @@ -63,15 +65,15 @@ public class RDFSVocabularyDecl implements VocabularyDecl { RDFS.RESOURCE,// RDFS.SEEALSO,// RDFS.SUBCLASSOF,// - RDFS.SUBPROPERTYOF,// - }; + RDFS.SUBPROPERTYOF// + ); public RDFSVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFVocabularyDecl.java index ca464f1497..c41a3bd38d 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/RDFVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,10 +30,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -47,8 +49,8 @@ */ public class RDFVocabularyDecl implements VocabularyDecl { - static private final URI[] uris = new URI[]{ - new URIImpl(RDF.NAMESPACE), + static private final List iris = List.of( + SimpleValueFactory.getInstance().createIRI(RDF.NAMESPACE), RDF.ALT, // RDF.BAG, // RDF.FIRST, // @@ -64,15 +66,15 @@ public class RDFVocabularyDecl implements VocabularyDecl { RDF.SUBJECT, // RDF.TYPE, // RDF.VALUE, // - RDF.XMLLITERAL, // - }; + RDF.XMLLITERAL // + ); public RDFVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SKOSVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SKOSVocabularyDecl.java index 3977f7c261..ae2e8e13e7 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SKOSVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SKOSVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,9 +30,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -47,42 +50,44 @@ */ public class SKOSVocabularyDecl implements VocabularyDecl { + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + public static final String NAMESPACE = "http://www.w3.org/2004/02/skos/core#"; - public static final URI Collection = new URIImpl(NAMESPACE+"Collection"); - public static final URI Concept = new URIImpl(NAMESPACE+"Concept"); - public static final URI ConceptScheme = new URIImpl(NAMESPACE+"ConceptScheme"); - public static final URI OrderedCollection = new URIImpl(NAMESPACE+"OrderedCollection"); - public static final URI altLabel = new URIImpl(NAMESPACE+"altLabel"); - public static final URI broadMatch = new URIImpl(NAMESPACE+"broadMatch"); - public static final URI broader = new URIImpl(NAMESPACE+"broader"); - public static final URI broaderTransitive = new URIImpl(NAMESPACE+"broaderTransitive"); - public static final URI changeNote = new URIImpl(NAMESPACE+"changeNote"); - public static final URI closeMatch = new URIImpl(NAMESPACE+"closeMatch"); - public static final URI definition = new URIImpl(NAMESPACE+"definition"); - public static final URI editorialNote = new URIImpl(NAMESPACE+"editorialNote"); - public static final URI exactMatch = new URIImpl(NAMESPACE+"exactMatch"); - public static final URI example = new URIImpl(NAMESPACE+"example"); - public static final URI hasTopConcept = new URIImpl(NAMESPACE+"hasTopConcept"); - public static final URI hiddenLabel = new URIImpl(NAMESPACE+"hiddenLabel"); - public static final URI historyNote = new URIImpl(NAMESPACE+"historyNote"); - public static final URI inScheme = new URIImpl(NAMESPACE+"inScheme"); - public static final URI mappingRelation = new URIImpl(NAMESPACE+"mappingRelation"); - public static final URI member = new URIImpl(NAMESPACE+"member"); - public static final URI memberList = new URIImpl(NAMESPACE+"memberList"); - public static final URI narrowMatch = new URIImpl(NAMESPACE+"narrowMatch"); - public static final URI narrow = new URIImpl(NAMESPACE+"narrow"); - public static final URI narrowTransitive = new URIImpl(NAMESPACE+"narrowTransitive"); - public static final URI notation = new URIImpl(NAMESPACE+"notation"); - public static final URI note = new URIImpl(NAMESPACE+"note"); - public static final URI prefLabel = new URIImpl(NAMESPACE+"prefLabel"); - public static final URI related = new URIImpl(NAMESPACE+"related"); - public static final URI relatedMatch = new URIImpl(NAMESPACE+"relatedMatch"); - public static final URI scopeNote = new URIImpl(NAMESPACE+"scopeNote"); - public static final URI semanticRelation= new URIImpl(NAMESPACE+"semanticRelation"); - public static final URI topConceptOf = new URIImpl(NAMESPACE+"topConceptOf"); + public static final IRI Collection = VALUE_FACTORY.createIRI(NAMESPACE, "Collection"); + public static final IRI Concept = VALUE_FACTORY.createIRI(NAMESPACE, "Concept"); + public static final IRI ConceptScheme = VALUE_FACTORY.createIRI(NAMESPACE, "ConceptScheme"); + public static final IRI OrderedCollection = VALUE_FACTORY.createIRI(NAMESPACE, "OrderedCollection"); + public static final IRI altLabel = VALUE_FACTORY.createIRI(NAMESPACE, "altLabel"); + public static final IRI broadMatch = VALUE_FACTORY.createIRI(NAMESPACE, "broadMatch"); + public static final IRI broader = VALUE_FACTORY.createIRI(NAMESPACE, "broader"); + public static final IRI broaderTransitive = VALUE_FACTORY.createIRI(NAMESPACE, "broaderTransitive"); + public static final IRI changeNote = VALUE_FACTORY.createIRI(NAMESPACE, "changeNote"); + public static final IRI closeMatch = VALUE_FACTORY.createIRI(NAMESPACE, "closeMatch"); + public static final IRI definition = VALUE_FACTORY.createIRI(NAMESPACE, "definition"); + public static final IRI editorialNote = VALUE_FACTORY.createIRI(NAMESPACE, "editorialNote"); + public static final IRI exactMatch = VALUE_FACTORY.createIRI(NAMESPACE, "exactMatch"); + public static final IRI example = VALUE_FACTORY.createIRI(NAMESPACE, "example"); + public static final IRI hasTopConcept = VALUE_FACTORY.createIRI(NAMESPACE, "hasTopConcept"); + public static final IRI hiddenLabel = VALUE_FACTORY.createIRI(NAMESPACE, "hiddenLabel"); + public static final IRI historyNote = VALUE_FACTORY.createIRI(NAMESPACE, "historyNote"); + public static final IRI inScheme = VALUE_FACTORY.createIRI(NAMESPACE, "inScheme"); + public static final IRI mappingRelation = VALUE_FACTORY.createIRI(NAMESPACE, "mappingRelation"); + public static final IRI member = VALUE_FACTORY.createIRI(NAMESPACE, "member"); + public static final IRI memberList = VALUE_FACTORY.createIRI(NAMESPACE, "memberList"); + public static final IRI narrowMatch = VALUE_FACTORY.createIRI(NAMESPACE, "narrowMatch"); + public static final IRI narrow = VALUE_FACTORY.createIRI(NAMESPACE, "narrow"); + public static final IRI narrowTransitive = VALUE_FACTORY.createIRI(NAMESPACE, "narrowTransitive"); + public static final IRI notation = VALUE_FACTORY.createIRI(NAMESPACE, "notation"); + public static final IRI note = VALUE_FACTORY.createIRI(NAMESPACE, "note"); + public static final IRI prefLabel = VALUE_FACTORY.createIRI(NAMESPACE, "prefLabel"); + public static final IRI related = VALUE_FACTORY.createIRI(NAMESPACE, "related"); + public static final IRI relatedMatch = VALUE_FACTORY.createIRI(NAMESPACE, "relatedMatch"); + public static final IRI scopeNote = VALUE_FACTORY.createIRI(NAMESPACE, "scopeNote"); + public static final IRI semanticRelation= VALUE_FACTORY.createIRI(NAMESPACE, "semanticRelation"); + public static final IRI topConceptOf = VALUE_FACTORY.createIRI(NAMESPACE, "topConceptOf"); - static private final URI[] uris = new URI[] { - new URIImpl(NAMESPACE),// + static private final List iris =List.of( + VALUE_FACTORY.createIRI(NAMESPACE),// Collection, Concept, ConceptScheme, OrderedCollection, altLabel, broadMatch, broader, broaderTransitive, changeNote, closeMatch, definition, editorialNote, exactMatch, example, hasTopConcept, @@ -90,14 +95,14 @@ public class SKOSVocabularyDecl implements VocabularyDecl { memberList, narrowMatch, narrow, narrowTransitive, notation, note, prefLabel, related, relatedMatch, scopeNote, semanticRelation, topConceptOf// - }; + ); public SKOSVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SesameVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SesameVocabularyDecl.java index eb1d9787a7..f610e3de1b 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SesameVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/SesameVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,10 +30,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.SESAME; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.SESAME; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -47,19 +49,19 @@ */ public class SesameVocabularyDecl implements VocabularyDecl { - static private final URI[] uris = new URI[]{ - new URIImpl(SESAME.NAMESPACE),// + static private final List iris = List.of( + SimpleValueFactory.getInstance().createIRI(SESAME.NAMESPACE),// SESAME.DIRECTSUBCLASSOF,// SESAME.DIRECTSUBPROPERTYOF,// - SESAME.DIRECTTYPE,// - }; + SESAME.DIRECTTYPE// + ); public SesameVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/VoidVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/VoidVocabularyDecl.java index 26bcab9f89..813b43aafb 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/VoidVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/VoidVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -30,9 +30,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; +import java.util.List; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.bigdata.rdf.vocab.VocabularyDecl; @@ -49,49 +50,51 @@ */ public class VoidVocabularyDecl implements VocabularyDecl { + private static final SimpleValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + public static final String NAMESPACE = "http://rdfs.org/ns/void#"; // Classes. - public static final URI // - Dataset = new URIImpl(NAMESPACE + "Dataset"),// - DatasetDescription = new URIImpl(NAMESPACE + "DatasetDescription"),// - Linkset = new URIImpl(NAMESPACE + "Linkset"),// - TechnicalFeature = new URIImpl(NAMESPACE + "TechnicalFeature")// + public static final IRI // + Dataset = VALUE_FACTORY.createIRI(NAMESPACE, "Dataset"),// + DatasetDescription = VALUE_FACTORY.createIRI(NAMESPACE, "DatasetDescription"),// + Linkset = VALUE_FACTORY.createIRI(NAMESPACE, "Linkset"),// + TechnicalFeature = VALUE_FACTORY.createIRI(NAMESPACE, "TechnicalFeature")// ; // Properties. - public static final URI // - class_ = new URIImpl(NAMESPACE+"class"),// - classPartition = new URIImpl(NAMESPACE+"classPartition"),// - classes = new URIImpl(NAMESPACE+"classes"),// - dataDump = new URIImpl(NAMESPACE+"dataDump"),// - distinctObjects = new URIImpl(NAMESPACE+"distinctObjects"),// - distinctSubjects = new URIImpl(NAMESPACE+"distinctSubjects"),// - documents = new URIImpl(NAMESPACE+"documents"),// - entities = new URIImpl(NAMESPACE+"entities"),// - exampleResource = new URIImpl(NAMESPACE+"exampleResource"),// - feature = new URIImpl(NAMESPACE+"feature"),// - inDataset = new URIImpl(NAMESPACE+"inDataset"),// - linkPredicate = new URIImpl(NAMESPACE+"linkPredicate"),// - objectsTarget = new URIImpl(NAMESPACE+"objectsTarget"),// - openSearchDescription = new URIImpl(NAMESPACE+"openSearchDescription"),// - properties = new URIImpl(NAMESPACE+"properties"),// - property = new URIImpl(NAMESPACE+"property"),// - propertyPartition = new URIImpl(NAMESPACE+"propertyPartition"),// - rootResource = new URIImpl(NAMESPACE+"rootResource"),// - sparqlEndpoint = new URIImpl(NAMESPACE+"sparqlEndpoint"),// - subjectsTarget = new URIImpl(NAMESPACE+"subjectsTarget"),// - subset = new URIImpl(NAMESPACE+"subset"),// - target = new URIImpl(NAMESPACE+"target"),// - triples = new URIImpl(NAMESPACE+"triples"),// - uriLookupEndpoint = new URIImpl(NAMESPACE+"uriLookupEndpoint"),// - uriRegexPattern = new URIImpl(NAMESPACE+"uriRegexPattern"),// - uriSpace = new URIImpl(NAMESPACE+"uriSpace"),// - vocabulary = new URIImpl(NAMESPACE+"vocabulary")// + public static final IRI // + class_ = VALUE_FACTORY.createIRI(NAMESPACE, "class"),// + classPartition = VALUE_FACTORY.createIRI(NAMESPACE, "classPartition"),// + classes = VALUE_FACTORY.createIRI(NAMESPACE, "classes"),// + dataDump = VALUE_FACTORY.createIRI(NAMESPACE, "dataDump"),// + distinctObjects = VALUE_FACTORY.createIRI(NAMESPACE, "distinctObjects"),// + distinctSubjects = VALUE_FACTORY.createIRI(NAMESPACE, "distinctSubjects"),// + documents = VALUE_FACTORY.createIRI(NAMESPACE, "documents"),// + entities = VALUE_FACTORY.createIRI(NAMESPACE, "entities"),// + exampleResource = VALUE_FACTORY.createIRI(NAMESPACE, "exampleResource"),// + feature = VALUE_FACTORY.createIRI(NAMESPACE, "feature"),// + inDataset = VALUE_FACTORY.createIRI(NAMESPACE, "inDataset"),// + linkPredicate = VALUE_FACTORY.createIRI(NAMESPACE, "linkPredicate"),// + objectsTarget = VALUE_FACTORY.createIRI(NAMESPACE, "objectsTarget"),// + openSearchDescription = VALUE_FACTORY.createIRI(NAMESPACE, "openSearchDescription"),// + properties = VALUE_FACTORY.createIRI(NAMESPACE, "properties"),// + property = VALUE_FACTORY.createIRI(NAMESPACE, "property"),// + propertyPartition = VALUE_FACTORY.createIRI(NAMESPACE, "propertyPartition"),// + rootResource = VALUE_FACTORY.createIRI(NAMESPACE, "rootResource"),// + sparqlEndpoint = VALUE_FACTORY.createIRI(NAMESPACE, "sparqlEndpoint"),// + subjectsTarget = VALUE_FACTORY.createIRI(NAMESPACE, "subjectsTarget"),// + subset = VALUE_FACTORY.createIRI(NAMESPACE, "subset"),// + target = VALUE_FACTORY.createIRI(NAMESPACE, "target"),// + triples = VALUE_FACTORY.createIRI(NAMESPACE, "triples"),// + uriLookupEndpoint = VALUE_FACTORY.createIRI(NAMESPACE, "uriLookupEndpoint"),// + uriRegexPattern = VALUE_FACTORY.createIRI(NAMESPACE, "uriRegexPattern"),// + uriSpace = VALUE_FACTORY.createIRI(NAMESPACE, "uriSpace"),// + vocabulary = VALUE_FACTORY.createIRI(NAMESPACE, "vocabulary")// ; - static private final URI[] uris = new URI[]{ - new URIImpl(NAMESPACE), + static private final List iris = List.of( + VALUE_FACTORY.createIRI(NAMESPACE), // classes Dataset, DatasetDescription, @@ -104,14 +107,14 @@ public class VoidVocabularyDecl implements VocabularyDecl { properties, property, propertyPartition, rootResource, sparqlEndpoint, subjectsTarget, subset, target, triples, uriLookupEndpoint, uriRegexPattern, uriSpace, vocabulary// - }; + ); public VoidVocabularyDecl() { } - public Iterator values() { + public Iterator values() { - return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); + return iris.iterator(); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/XMLSchemaVocabularyDecl.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/XMLSchemaVocabularyDecl.java index 47ebbc5ba7..7063fd0e15 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/XMLSchemaVocabularyDecl.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/rdf/vocab/decls/XMLSchemaVocabularyDecl.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -31,74 +31,75 @@ import java.util.Collections; import java.util.Iterator; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.XSD; import com.bigdata.rdf.vocab.VocabularyDecl; /** - * Vocabulary and namespace for {@link XMLSchema}. + * Vocabulary and namespace for {@link XSD}. * - * @see http://www.w3.org/2001/XMLSchema# + * @see http://www.w3.org/2001/XSD# * * @author Bryan Thompson * @version $Id$ */ public class XMLSchemaVocabularyDecl implements VocabularyDecl { - static private final URI[] uris = new URI[]{ - new URIImpl(XMLSchema.NAMESPACE), // - XMLSchema.ANYURI, // - XMLSchema.BASE64BINARY, // - XMLSchema.BOOLEAN, // - XMLSchema.BYTE, // - XMLSchema.DATE, // - XMLSchema.DATETIME, // - XMLSchema.DECIMAL, // - XMLSchema.DOUBLE, // - XMLSchema.DURATION, // - XMLSchema.ENTITIES, // - XMLSchema.ENTITY, // - XMLSchema.FLOAT, // - XMLSchema.GDAY, // - XMLSchema.GMONTH, // - XMLSchema.GMONTHDAY, // - XMLSchema.GYEAR, // - XMLSchema.GYEARMONTH, // - XMLSchema.HEXBINARY, // - XMLSchema.ID, // - XMLSchema.IDREF, // - XMLSchema.IDREFS, // - XMLSchema.INT, // - XMLSchema.INTEGER, // - XMLSchema.LANGUAGE, // - XMLSchema.LONG, // - XMLSchema.NAME, // - XMLSchema.NCNAME, // - XMLSchema.NEGATIVE_INTEGER, // - XMLSchema.NMTOKEN, // - XMLSchema.NMTOKENS, // - XMLSchema.NON_NEGATIVE_INTEGER, // - XMLSchema.NON_POSITIVE_INTEGER, // - XMLSchema.NORMALIZEDSTRING, // - XMLSchema.NOTATION, // - XMLSchema.POSITIVE_INTEGER, // - XMLSchema.QNAME, // - XMLSchema.SHORT, // - XMLSchema.STRING, // - XMLSchema.TIME, // - XMLSchema.TOKEN, // - XMLSchema.UNSIGNED_BYTE, // - XMLSchema.UNSIGNED_INT, // - XMLSchema.UNSIGNED_LONG, // - XMLSchema.UNSIGNED_SHORT, // + static private final IRI[] uris = new IRI[]{ + SimpleValueFactory.getInstance().createIRI(XSD.NAMESPACE), // + XSD.ANYURI, // + XSD.BASE64BINARY, // + XSD.BOOLEAN, // + XSD.BYTE, // + XSD.DATE, // + XSD.DATETIME, // + XSD.DECIMAL, // + XSD.DOUBLE, // + XSD.DURATION, // + XSD.ENTITIES, // + XSD.ENTITY, // + XSD.FLOAT, // + XSD.GDAY, // + XSD.GMONTH, // + XSD.GMONTHDAY, // + XSD.GYEAR, // + XSD.GYEARMONTH, // + XSD.HEXBINARY, // + XSD.ID, // + XSD.IDREF, // + XSD.IDREFS, // + XSD.INT, // + XSD.INTEGER, // + XSD.LANGUAGE, // + XSD.LONG, // + XSD.NAME, // + XSD.NCNAME, // + XSD.NEGATIVE_INTEGER, // + XSD.NMTOKEN, // + XSD.NMTOKENS, // + XSD.NON_NEGATIVE_INTEGER, // + XSD.NON_POSITIVE_INTEGER, // + XSD.NORMALIZEDSTRING, // + XSD.NOTATION, // + XSD.POSITIVE_INTEGER, // + XSD.QNAME, // + XSD.SHORT, // + XSD.STRING, // + XSD.TIME, // + XSD.TOKEN, // + XSD.UNSIGNED_BYTE, // + XSD.UNSIGNED_INT, // + XSD.UNSIGNED_LONG, // + XSD.UNSIGNED_SHORT, // }; public XMLSchemaVocabularyDecl() { } - public Iterator values() { + public Iterator values() { return Collections.unmodifiableList(Arrays.asList(uris)).iterator(); diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FTS.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FTS.java index 0de37eaf07..c7eafb1e87 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FTS.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FTS.java @@ -24,8 +24,8 @@ */ package com.bigdata.service.fts; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.store.BDS; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FulltextSearchServiceFactory.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FulltextSearchServiceFactory.java index 0fee8239f1..c33a82faf1 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FulltextSearchServiceFactory.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/fts/FulltextSearchServiceFactory.java @@ -39,8 +39,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.URI; import com.bigdata.bop.BOp; import com.bigdata.bop.Constant; diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatial.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatial.java index 8f8db70ac5..f2a59c7302 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatial.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatial.java @@ -26,8 +26,9 @@ */ package com.bigdata.service.geospatial; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import com.bigdata.rdf.internal.gis.ICoordinate.UNITS; @@ -131,6 +132,8 @@ public interface Options { * META DECLARATIONS * ************************************************************************************************/ + static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); + /** * The namespace used for magic search predicates. */ @@ -139,7 +142,7 @@ public interface Options { // do not use anymore -- need to be retained because it is linked by old vocabulary class @Deprecated - final URI DEFAULT_DATATYPE= new URIImpl(NAMESPACE + "geoSpatialLiteral"); + final IRI DEFAULT_DATATYPE= VALUE_FACTORY.createIRI(NAMESPACE, "geoSpatialLiteral"); /** @@ -149,8 +152,8 @@ public interface Options { final String GEOSPATIAL_LITERAL_V1_LAT_LON = GEOSPATIAL_LITERAL_PREFIX_V1 + "lat-lon"; final String GEOSPATIAL_LITERAL_V1_LAT_LON_TIME = GEOSPATIAL_LITERAL_PREFIX_V1 + "lat-lon-time"; - final URI DEFAULT_DATATYPE_LAT_LON = new URIImpl(GEOSPATIAL_LITERAL_V1_LAT_LON); - final URI DEFAULT_DATATYPE_LAT_LON_TIME = new URIImpl(GEOSPATIAL_LITERAL_V1_LAT_LON_TIME); + final IRI DEFAULT_DATATYPE_LAT_LON = VALUE_FACTORY.createIRI(GEOSPATIAL_LITERAL_V1_LAT_LON); + final IRI DEFAULT_DATATYPE_LAT_LON_TIME = VALUE_FACTORY.createIRI(GEOSPATIAL_LITERAL_V1_LAT_LON_TIME); /************************************************************************************************ @@ -160,128 +163,128 @@ public interface Options { /** * The name of the search function, pointing to a {@link GeoFunction}. */ - final URI SEARCH = new URIImpl(NAMESPACE + "search"); + final IRI SEARCH = VALUE_FACTORY.createIRI(NAMESPACE, "search"); /** * The datatype for literals we're interested in. If not specified, defaults * to DEFAULT_DATATYPE. */ - final URI SEARCH_DATATYPE = new URIImpl(NAMESPACE + "searchDatatype"); + final IRI SEARCH_DATATYPE = VALUE_FACTORY.createIRI(NAMESPACE, "searchDatatype"); /** * Pointer to the predicate used in scanned triples. */ - final URI PREDICATE = new URIImpl(NAMESPACE + "predicate"); + final IRI PREDICATE = VALUE_FACTORY.createIRI(NAMESPACE, "predicate"); /** * Pointer to the context used in scanned triples. */ - final URI CONTEXT = new URIImpl(NAMESPACE + "context"); + final IRI CONTEXT = VALUE_FACTORY.createIRI(NAMESPACE, "context"); /** * In case of a {@link GeoFunction#IN_CIRCLE} query only: center point of the bounding circle. */ - final URI SPATIAL_CIRCLE_CENTER = new URIImpl(NAMESPACE + "spatialCircleCenter"); + final IRI SPATIAL_CIRCLE_CENTER = VALUE_FACTORY.createIRI(NAMESPACE, "spatialCircleCenter"); /** * In case of a {@link GeoFunction#IN_CIRCLE} query only: radius of the bounding circle, * specified in SPATIAL_UNIT. */ - final URI SPATIAL_CIRCLE_RADIUS = new URIImpl(NAMESPACE + "spatialCircleRadius"); + final IRI SPATIAL_CIRCLE_RADIUS = VALUE_FACTORY.createIRI(NAMESPACE, "spatialCircleRadius"); /** * In case of a {@link GeoFunction#IN_RECTANGLE} query only: south west border point of the bounding rectangle. */ - final URI SPATIAL_RECTANGLE_SOUTH_WEST = new URIImpl(NAMESPACE + "spatialRectangleSouthWest"); + final IRI SPATIAL_RECTANGLE_SOUTH_WEST = VALUE_FACTORY.createIRI(NAMESPACE, "spatialRectangleSouthWest"); /** * In case of a {@link GeoFunction#IN_RECTANGLE} query only: north east border point of the bounding rectangle. */ - final URI SPATIAL_RECTANGLE_NORTH_EAST = new URIImpl(NAMESPACE + "spatialRectangleNorthEast"); + final IRI SPATIAL_RECTANGLE_NORTH_EAST = VALUE_FACTORY.createIRI(NAMESPACE, "spatialRectangleNorthEast"); /** * The spatial unit used for distances specified in the geospatial search request. */ - final URI SPATIAL_UNIT = new URIImpl(NAMESPACE + "spatialUnit"); + final IRI SPATIAL_UNIT = VALUE_FACTORY.createIRI(NAMESPACE, "spatialUnit"); /** * Output variable, supported for "inCircle" query type only. If specified, the variable will, * for each solution, be bound to its distance towards the geospatial circle center. */ - final URI DISTANCE_VALUE = new URIImpl(NAMESPACE + "distanceValue"); + final IRI DISTANCE_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "distanceValue"); /** * Start time of the time interval to scan for. */ - final URI TIME_START = new URIImpl(NAMESPACE + "timeStart"); + final IRI TIME_START = VALUE_FACTORY.createIRI(NAMESPACE, "timeStart"); /** * End time of the time interval to scan for. */ - final URI TIME_END = new URIImpl(NAMESPACE + "timeEnd"); + final IRI TIME_END = VALUE_FACTORY.createIRI(NAMESPACE, "timeEnd"); /** * End time of the time interval to scan for. */ - final URI COORD_SYSTEM = new URIImpl(NAMESPACE + "coordSystem"); + final IRI COORD_SYSTEM = VALUE_FACTORY.createIRI(NAMESPACE, "coordSystem"); /** * #-separated list of custom fields to be queries, e.g. myField1#myField2 */ - final URI CUSTOM_FIELDS = new URIImpl(NAMESPACE + "customFields"); + final IRI CUSTOM_FIELDS = VALUE_FACTORY.createIRI(NAMESPACE, "customFields"); /** * Lower bounds for custom fields, e.g. 10#20 */ - final URI CUSTOM_FIELDS_LOWER_BOUNDS = new URIImpl(NAMESPACE + "customFieldsLowerBounds"); + final IRI CUSTOM_FIELDS_LOWER_BOUNDS = VALUE_FACTORY.createIRI(NAMESPACE, "customFieldsLowerBounds"); /** * Upper bounds for custom fields, e.g. 11#5000 */ - final URI CUSTOM_FIELDS_UPPER_BOUNDS = new URIImpl(NAMESPACE + "customFieldsUpperBounds"); + final IRI CUSTOM_FIELDS_UPPER_BOUNDS = VALUE_FACTORY.createIRI(NAMESPACE, "customFieldsUpperBounds"); /** * Output variable; if set, this variable is bound to the locations component of the search result. */ - final URI LOCATION_VALUE = new URIImpl(NAMESPACE + "locationValue"); + final IRI LOCATION_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "locationValue"); /** * Output variable; if set, this variable is bound to the time component of the search result. */ - final URI TIME_VALUE = new URIImpl(NAMESPACE + "timeValue"); + final IRI TIME_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "timeValue"); /** * Output variable; if set, this variable is bound to the literal component "as is". */ - final URI LITERAL_VALUE = new URIImpl(NAMESPACE + "literalValue"); + final IRI LITERAL_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "literalValue"); /** * Output variable; if set, this variable is bound to the latitude component of the search result. */ - final URI LAT_VALUE = new URIImpl(NAMESPACE + "latValue"); + final IRI LAT_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "latValue"); /** * Output variable; if set, this variable is bound to the longitude component of the search result. */ - final URI LON_VALUE = new URIImpl(NAMESPACE + "lonValue"); + final IRI LON_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "lonValue"); /** * Output variable; if set, this variable is bound to the longitude component of the search result. */ - final URI COORD_SYSTEM_VALUE = new URIImpl(NAMESPACE + "coordSystemValue"); + final IRI COORD_SYSTEM_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "coordSystemValue"); /** * Output variable; if set, this variable is bound to the values for the custom fields, * separated by CUSTOM_FIELDS_SEPARATOR (in case there are multiple custom fields) */ - final URI CUSTOM_FIELDS_VALUES = new URIImpl(NAMESPACE + "customFieldsValues"); + final IRI CUSTOM_FIELDS_VALUES = VALUE_FACTORY.createIRI(NAMESPACE, "customFieldsValues"); /** * Output variable; if set, this variable is bound to a combined representation of the * locations + time component of the search result, separated through the CUSTOM_FIELDS_SEPARATOR. */ - final URI LOCATION_AND_TIME_VALUE = new URIImpl(NAMESPACE + "locationAndTimeValue"); + final IRI LOCATION_AND_TIME_VALUE = VALUE_FACTORY.createIRI(NAMESPACE, "locationAndTimeValue"); } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialConfig.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialConfig.java index 1a120ff3c0..d9a3cb6cbc 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialConfig.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialConfig.java @@ -37,8 +37,8 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.impl.extensions.InvalidGeoSpatialDatatypeConfigurationError; @@ -68,7 +68,7 @@ public class GeoSpatialConfig implements Serializable { // the default datatype for querying - private URI defaultDatatype; + private IRI defaultDatatype; public GeoSpatialConfig(final List geoSpatialDatatypeConfigs, final String defaultDatatype) { @@ -81,12 +81,12 @@ public GeoSpatialConfig(final List geoSpatialDatatypeConfigs, final Stri this.defaultDatatype = new URIImpl(defaultDatatype); } catch (Exception e) { throw new InvalidGeoSpatialDatatypeConfigurationError( - "Invalid default datatype (" + defaultDatatype + ") does not represent a URI."); + "Invalid default datatype (" + defaultDatatype + ") does not represent a IRI."); } boolean isRegistered = false; for (final GeoSpatialDatatypeConfiguration config : datatypeConfigs) { - isRegistered |= config.getUri().equals(this.defaultDatatype); + isRegistered |= config.getIri().equals(this.defaultDatatype); } if (!isRegistered) { @@ -144,13 +144,13 @@ private void initDatatypes(List geoSpatialDatatypeConfigs) { } // validate that there are no duplicate URIs used for the datatypeConfigs - final Set uris = new HashSet(); + final Set uris = new HashSet(); for (int i=0; i geoSpatialDatatypeConfigs) { } } - public GeoSpatialDatatypeConfiguration getConfigurationForDatatype(URI datatypeUri) { + public GeoSpatialDatatypeConfiguration getConfigurationForDatatype(IRI datatypeUri) { for (int i=0; i getDatatypeConfigs() { return datatypeConfigs; } - public URI getDefaultDatatype() { + public IRI getDefaultDatatype() { return defaultDatatype; } diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialDatatypeConfiguration.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialDatatypeConfiguration.java index fc253f23e9..2229ee4115 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialDatatypeConfiguration.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/GeoSpatialDatatypeConfiguration.java @@ -40,8 +40,9 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.internal.impl.extensions.InvalidGeoSpatialDatatypeConfigurationError; import com.bigdata.service.geospatial.GeoSpatialDatatypeFieldConfiguration.ServiceMapping; @@ -61,8 +62,8 @@ public class GeoSpatialDatatypeConfiguration implements Serializable { final static private transient Logger log = LogManager.getLogger(GeoSpatialDatatypeConfiguration.class); - // URI of the datatype, e.g. - private final URI uri; + // IRI of the datatype, e.g. + private final IRI iri; private final IGeoSpatialLiteralSerializer literalSerializer; @@ -78,21 +79,21 @@ public class GeoSpatialDatatypeConfiguration implements Serializable { /** - * Constructor, setting up a {@link GeoSpatialDatatypeConfiguration} given a uri and a + * Constructor, setting up a {@link GeoSpatialDatatypeConfiguration} given a iri and a * JSON array defining the fields as input. Throws an {@link InvalidGeoSpatialDatatypeConfigurationError} - * if the uri is null or empty or in case the JSON array does not describe a set of + * if the iri is null or empty or in case the JSON array does not describe a set of * valid fields. */ public GeoSpatialDatatypeConfiguration( final String uriStr, final String literalSerializerClass, final JSONArray fieldsJson) { if (uriStr==null || uriStr.isEmpty()) - throw new InvalidGeoSpatialDatatypeConfigurationError("URI parameter must not be null or empty"); + throw new InvalidGeoSpatialDatatypeConfigurationError("IRI parameter must not be null or empty"); try { - this.uri = new URIImpl(uriStr); + this.iri = SimpleValueFactory.getInstance().createIRI(uriStr); } catch (Exception e) { - throw new InvalidGeoSpatialDatatypeConfigurationError("Invalid URI in geospatial datatype config: " + uriStr); + throw new InvalidGeoSpatialDatatypeConfigurationError("Invalid IRI in geospatial datatype config: " + uriStr); } if (literalSerializerClass==null || literalSerializerClass.isEmpty()) { @@ -156,7 +157,7 @@ public GeoSpatialDatatypeConfiguration( // validate that there is at least one field defined for the geospatial datatype if (fields.isEmpty()) { throw new InvalidGeoSpatialDatatypeConfigurationError( - "Geospatial datatype config for datatype " + uri + " must have at least one field, but has none."); + "Geospatial datatype config for datatype " + iri + " must have at least one field, but has none."); } // validate that there are no duplicate service mappings used for the fields @@ -191,7 +192,7 @@ public GeoSpatialDatatypeConfiguration( /** * Alternative constructor (to ease writing test cases) * - * @param uri + * @param iri * @param fields */ public GeoSpatialDatatypeConfiguration( @@ -199,7 +200,7 @@ public GeoSpatialDatatypeConfiguration( final List fields) { if (uriString==null || uriString.isEmpty()) { - throw new InvalidGeoSpatialDatatypeConfigurationError("URI string must not be null or empty."); + throw new InvalidGeoSpatialDatatypeConfigurationError("IRI string must not be null or empty."); } if (literalSerializer==null) { @@ -210,15 +211,15 @@ public GeoSpatialDatatypeConfiguration( throw new InvalidGeoSpatialDatatypeConfigurationError("Fields must not be null."); } - this.uri = new URIImpl(uriString); + this.iri = SimpleValueFactory.getInstance().createIRI(uriString); this.literalSerializer = literalSerializer; this.fields = fields; initDerivedMembers(); } - public URI getUri() { - return uri; + public IRI getIri() { + return iri; } public IGeoSpatialLiteralSerializer getLiteralSerializer() { diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/IGeoSpatialQuery.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/IGeoSpatialQuery.java index e7ce96f5bb..c94c8394b0 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/IGeoSpatialQuery.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/IGeoSpatialQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IConstant; @@ -58,7 +58,7 @@ public interface IGeoSpatialQuery { /** * @return the datatype of literals we're searching for */ - public URI getSearchDatatype(); + public IRI getSearchDatatype(); /** * @return the constant representing the search subject @@ -241,4 +241,4 @@ public LowerAndUpperValue(final Object lowerValue, final Object upperValue) { this.upperValue = upperValue; } } -} +} diff --git a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/impl/GeoSpatialQuery.java b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/impl/GeoSpatialQuery.java index 4951df2788..e19287223f 100644 --- a/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/impl/GeoSpatialQuery.java +++ b/bigdata-core/bigdata-rdf/src/java/com/bigdata/service/geospatial/impl/GeoSpatialQuery.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IConstant; @@ -67,7 +67,7 @@ public class GeoSpatialQuery implements IGeoSpatialQuery { // passed in as parameters private final GeoSpatialConfig geoSpatialConfig; private final GeoFunction searchFunction; - private final URI searchDatatype; + private final IRI searchDatatype; private final IConstant subject; private final TermNode predicate; private final TermNode context; @@ -103,7 +103,7 @@ public class GeoSpatialQuery implements IGeoSpatialQuery { * Constructor */ public GeoSpatialQuery(final GeoSpatialConfig geoSpatialConfig, - final GeoFunction searchFunction, final URI searchDatatype, + final GeoFunction searchFunction, final IRI searchDatatype, final IConstant subject, final TermNode predicate, final TermNode context, final PointLatLon spatialCircleCenter, final Double spatialCircleRadius, @@ -167,7 +167,7 @@ public GeoSpatialQuery(final GeoSpatialConfig geoSpatialConfig, */ private GeoSpatialQuery(final GeoSpatialConfig geoSpatialConfig, final GeoFunction searchFunction, - final URI searchDatatype, + final IRI searchDatatype, final IConstant subject, final TermNode predicate, final TermNode context, final PointLatLon spatialCircleCenter, final Double spatialCircleRadius, @@ -241,7 +241,7 @@ public GeoFunction getSearchFunction() { } @Override - public URI getSearchDatatype() { + public IRI getSearchDatatype() { return searchDatatype; } diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2Sesame2BindingSetIterator.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2Sesame2BindingSetIterator.java index 86070a1fb9..c4f3d52499 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2Sesame2BindingSetIterator.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2Sesame2BindingSetIterator.java @@ -23,7 +23,7 @@ */ package com.bigdata.rdf.sail; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import java.util.Iterator; import java.util.Map; @@ -31,11 +31,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryInterruptedException; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryInterruptedException; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IConstant; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2SesameIteration.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2SesameIteration.java index a0c97276be..4f28206b3a 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2SesameIteration.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Bigdata2SesameIteration.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import cutthecrap.utils.striterators.ICloseableIterator; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedBooleanQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedBooleanQuery.java index 01cd53dae8..384f62f915 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedBooleanQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedBooleanQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,8 +27,8 @@ package com.bigdata.rdf.sail; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedBooleanQuery; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedBooleanQuery; /** * diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedGraphQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedGraphQuery.java index 5b6418b4c6..d9ea259b68 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedGraphQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedGraphQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,8 +29,8 @@ import java.util.Map; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedGraphQuery; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedGraphQuery; /** * diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedTupleQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedTupleQuery.java index 71fea57640..81f3dff9fe 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedTupleQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataParsedTupleQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,8 +27,8 @@ package com.bigdata.rdf.sail; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedTupleQuery; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedTupleQuery; /** * diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java index 5d24fbfc81..6189311d65 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java @@ -78,30 +78,30 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007 import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.IsolationLevel; -import org.openrdf.IsolationLevels; -import org.openrdf.OpenRDFUtil; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.NamespaceImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.NotifyingSailConnection; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailConnectionListener; -import org.openrdf.sail.SailException; -import org.openrdf.sail.UnknownSailTransactionStateException; -import org.openrdf.sail.UpdateContext; +import org.eclipse.rdf4j.IsolationLevel; +import org.eclipse.rdf4j.IsolationLevels; +import org.eclipse.rdf4j.OpenRDFUtil; +import org.eclipse.rdf4j.model.Namespace; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ContextStatementImpl; +import org.eclipse.rdf4j.model.impl.NamespaceImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.NotifyingSailConnection; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailConnectionListener; +import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.UnknownSailTransactionStateException; +import org.eclipse.rdf4j.sail.UpdateContext; import com.bigdata.bop.engine.QueryEngine; import com.bigdata.bop.fed.QueryEngineFactory; @@ -168,7 +168,7 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007 import cutthecrap.utils.striterators.Expander; import cutthecrap.utils.striterators.Striterator; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** *

@@ -4836,7 +4836,7 @@ public void fireEvent(final SPARQLUpdateEvent e) { * * (non-Javadoc) * - * @see org.openrdf.sail.SailConnection#begin() + * @see org.eclipse.rdf4j.sail.SailConnection#begin() */ /** @@ -4900,7 +4900,7 @@ public void prepare() throws SailException { * * (non-Javadoc) * - * @see org.openrdf.sail.SailConnection#startUpdate(org.openrdf.sail. + * @see org.eclipse.rdf4j.sail.SailConnection#startUpdate(org.eclipse.rdf4j.sail. * UpdateContext) */ diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailBooleanQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailBooleanQuery.java index 7c81dac215..2253aa6a5f 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailBooleanQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailBooleanQuery.java @@ -2,10 +2,10 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.repository.sail.SailBooleanQuery; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.repository.sail.SailBooleanQuery; import com.bigdata.rdf.sparql.ast.ASTContainer; import com.bigdata.rdf.sparql.ast.BindingsClause; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailGraphQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailGraphQuery.java index 07d0147dff..9d35acc3ea 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailGraphQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailGraphQuery.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.GraphQueryResult; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.repository.sail.SailGraphQuery; +import org.eclipse.rdf4j.query.GraphQueryResult; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.repository.sail.SailGraphQuery; import com.bigdata.rdf.sparql.ast.ASTContainer; import com.bigdata.rdf.sparql.ast.BindingsClause; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java index 06ae9c1438..c9a9673367 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailHelper.java @@ -15,7 +15,7 @@ import java.util.Properties; import java.util.TreeMap; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.btree.IIndex; import com.bigdata.btree.IndexMetadata; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java index 6476e0be74..0fcb1e7b13 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepository.java @@ -26,9 +26,9 @@ import java.io.IOException; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.sail.SailException; /** * Blazegraph specific {@link SailRepository} implementation class. diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java index c9de57f59c..85ef335e08 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailRepositoryConnection.java @@ -26,17 +26,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.Update; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailQuery; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailQuery; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.journal.ITx; import com.bigdata.journal.TimestampUtility; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailTupleQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailTupleQuery.java index 131deff931..bce4ee0cd2 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailTupleQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailTupleQuery.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.repository.sail.SailTupleQuery; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.repository.sail.SailTupleQuery; import com.bigdata.rdf.sparql.ast.ASTContainer; import com.bigdata.rdf.sparql.ast.BindingsClause; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailUpdate.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailUpdate.java index 2e4a34d625..2e49fdcb2b 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailUpdate.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailUpdate.java @@ -1,5 +1,5 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -23,10 +23,10 @@ package com.bigdata.rdf.sail; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.parser.ParsedUpdate; -import org.openrdf.repository.sail.SailUpdate; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.parser.ParsedUpdate; +import org.eclipse.rdf4j.repository.sail.SailUpdate; import com.bigdata.rdf.sparql.ast.ASTContainer; import com.bigdata.rdf.sparql.ast.eval.ASTEvalHelper; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataValueReplacer.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataValueReplacer.java index d4414b6574..568ffa11a5 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataValueReplacer.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataValueReplacer.java @@ -33,14 +33,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.impl.BindingImpl; -import org.openrdf.query.impl.DatasetImpl; -import org.openrdf.query.impl.MapBindingSet; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.impl.BindingImpl; +import org.eclipse.rdf4j.query.impl.DatasetImpl; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.internal.VTE; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/ExportKB.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/ExportKB.java index b39e388444..8eddb9ad27 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/ExportKB.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/ExportKB.java @@ -46,13 +46,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterRegistry; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.Banner; import com.bigdata.journal.IIndexManager; @@ -64,7 +64,7 @@ import com.bigdata.relation.locator.ILocatableResource; import com.bigdata.sparse.ITPS; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; /** * Utility class for exporting the configuration properties and data associated diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/QueryEvaluationIterator.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/QueryEvaluationIterator.java index 573ee88fe7..a129fb87d3 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/QueryEvaluationIterator.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/QueryEvaluationIterator.java @@ -2,10 +2,10 @@ import java.util.NoSuchElementException; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.sail.SailException; /** * Class exists to align exceptions thrown by Sesame 2 query evaluation with diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/RDRHistory.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/RDRHistory.java index 4059084a4a..e5287ddfe0 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/RDRHistory.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/RDRHistory.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.changesets.ChangeAction; import com.bigdata.rdf.changesets.IChangeLog; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/SailBase.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/SailBase.java index b65963f064..bbad9b1739 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/SailBase.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/SailBase.java @@ -14,9 +14,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; /** * SailBase is an abstract Sail implementation that takes care of common sail @@ -46,7 +46,7 @@ public abstract class SailBase implements Sail { // Note: the following variable and method are package protected so that they // can be removed when open connections no longer block other connections and // they can be closed silently (just like in JDBC). - static final String DEBUG_PROP = "org.openrdf.repository.debug"; + static final String DEBUG_PROP = "org.eclipse.rdf4j.repository.debug"; protected static boolean debugEnabled() { try { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Sesame2BigdataIterator.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Sesame2BigdataIterator.java index 13732aeb75..f0b89ad073 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Sesame2BigdataIterator.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/Sesame2BigdataIterator.java @@ -1,6 +1,6 @@ /* -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; -import info.aduna.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import cutthecrap.utils.striterators.ICloseableIterator; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java index f3aaf453c9..f5d2963077 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlClient.java @@ -51,16 +51,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.impl.GraphImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.TupleQueryResultHandlerBase; -import org.openrdf.query.resultio.TupleQueryResultParser; -import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLParserFactory; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.StatementCollector; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.impl.GraphImpl; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerBase; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser; +import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLParserFactory; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.StatementCollector; import com.bigdata.counters.CAT; import com.bigdata.journal.TemporaryStore; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/RunQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/RunQuery.java index f689e921fd..4ab642a301 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/RunQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/RunQuery.java @@ -11,10 +11,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.repository.sail.SailTupleQuery; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.repository.sail.SailTupleQuery; import com.bigdata.journal.Journal; import com.bigdata.rdf.sail.BigdataSail; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataConfigSchema.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataConfigSchema.java index 6fa167a4b8..2d14c95e51 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataConfigSchema.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataConfigSchema.java @@ -1,8 +1,8 @@ package com.bigdata.rdf.sail.config; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; /** * Defines constants for the schema which is used by diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryConfig.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryConfig.java index 6863ad9c9d..fa3655f4a6 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryConfig.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryConfig.java @@ -7,13 +7,13 @@ import java.io.IOException; import java.util.Properties; -import org.openrdf.model.Graph; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.util.GraphUtil; -import org.openrdf.model.util.GraphUtilException; -import org.openrdf.repository.config.RepositoryConfigException; -import org.openrdf.repository.config.RepositoryImplConfigBase; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.util.GraphUtil; +import org.eclipse.rdf4j.model.util.GraphUtilException; +import org.eclipse.rdf4j.repository.config.RepositoryConfigException; +import org.eclipse.rdf4j.repository.config.RepositoryImplConfigBase; public class BigdataRepositoryConfig extends RepositoryImplConfigBase { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryFactory.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryFactory.java index 99eaa20104..20ff5f8188 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryFactory.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataRepositoryFactory.java @@ -2,10 +2,10 @@ import java.util.Properties; -import org.openrdf.repository.Repository; -import org.openrdf.repository.config.RepositoryConfigException; -import org.openrdf.repository.config.RepositoryFactory; -import org.openrdf.repository.config.RepositoryImplConfig; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.config.RepositoryConfigException; +import org.eclipse.rdf4j.repository.config.RepositoryFactory; +import org.eclipse.rdf4j.repository.config.RepositoryImplConfig; import com.bigdata.rdf.sail.BigdataSail; import com.bigdata.rdf.sail.BigdataSailRepository; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailConfig.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailConfig.java index 96f50ce2ae..7f039606ba 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailConfig.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailConfig.java @@ -6,13 +6,13 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Properties; -import org.openrdf.model.Graph; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.util.GraphUtil; -import org.openrdf.model.util.GraphUtilException; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailImplConfigBase; +import org.eclipse.rdf4j.model.Graph; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.util.GraphUtil; +import org.eclipse.rdf4j.model.util.GraphUtilException; +import org.eclipse.rdf4j.sail.config.SailConfigException; +import org.eclipse.rdf4j.sail.config.SailImplConfigBase; public class BigdataSailConfig extends SailImplConfigBase { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailFactory.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailFactory.java index fb84306e01..6cfc9ebc04 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailFactory.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/config/BigdataSailFactory.java @@ -2,10 +2,10 @@ import java.util.Properties; -import org.openrdf.sail.Sail; -import org.openrdf.sail.config.SailConfigException; -import org.openrdf.sail.config.SailFactory; -import org.openrdf.sail.config.SailImplConfig; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.config.SailConfigException; +import org.eclipse.rdf4j.sail.config.SailFactory; +import org.eclipse.rdf4j.sail.config.SailImplConfig; import com.bigdata.rdf.sail.BigdataSail; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTDeferredIVResolutionInitializer.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTDeferredIVResolutionInitializer.java index 8c1d09a820..f1c11e546f 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTDeferredIVResolutionInitializer.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTDeferredIVResolutionInitializer.java @@ -45,12 +45,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.bigdata.bop.IValueExpression; import com.bigdata.rdf.internal.DTE; @@ -160,7 +160,7 @@ public ASTDeferredIVResolutionInitializer() { * {@link ASTRDFValue} nodes (including blank nodes iff we are in a told * bnodes mode). The {@link ASTRDFValue}s are collected in a {@link Map} * which associates each one with a {@link BigdataValue} object which is set - * using {@link ASTRDFValue#setRDFValue(org.openrdf.model.Value)}. The + * using {@link ASTRDFValue#setRDFValue(org.eclipse.rdf4j.model.Value)}. The * {@link BigdataValue}s will be resolved later (in ASTDeferredIVResolution) * in a batch against the database, obtaining their {@link IVs}. * Until then {@link BigdataValue}s in the parse tree have unresolved diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java index 0f15743763..f805cf83f2 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java @@ -5,9 +5,9 @@ */ package com.bigdata.rdf.sail.sparql; -import info.aduna.net.ParsedURI; +import org.eclipse.rdf4j.common.net.ParsedURI; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.bigdata.rdf.sail.sparql.ast.ASTBaseDecl; import com.bigdata.rdf.sail.sparql.ast.ASTDeleteData; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java index 57368d2cc1..4e08509078 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLParser.java @@ -37,16 +37,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.parser.ParsedOperation; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.ParsedUpdate; -import org.openrdf.query.parser.QueryParser; -import org.openrdf.query.parser.QueryParserUtil; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.parser.ParsedOperation; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.ParsedUpdate; +import org.eclipse.rdf4j.query.parser.QueryParser; +import org.eclipse.rdf4j.query.parser.QueryParserUtil; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.bigdata.bop.BOpUtility; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java index 2c8de4e6d5..7c00ffb984 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTContext.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -35,8 +35,8 @@ import java.util.Map; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java index ec43551976..f1c0001290 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataASTVisitorBase.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -34,7 +34,7 @@ package com.bigdata.rdf.sail.sparql; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataValue; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java index ea4230b66d..68a99c179a 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java @@ -43,7 +43,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.IBindingSet; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java index f0c783c461..13d6658735 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedQuery.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,10 +27,10 @@ package com.bigdata.rdf.sail.sparql; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.QueryParser; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.QueryParser; import com.bigdata.rdf.sparql.ast.ASTContainer; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java index 9cdcfe23ad..8c393cd619 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataParsedUpdate.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -27,10 +27,10 @@ package com.bigdata.rdf.sail.sparql; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedUpdate; -import org.openrdf.query.parser.QueryParser; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedUpdate; +import org.eclipse.rdf4j.query.parser.QueryParser; import com.bigdata.rdf.sparql.ast.ASTContainer; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java index c687294167..2d0fbf522e 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.bigdata.rdf.sail.sparql.ast.ASTBasicGraphPattern; import com.bigdata.rdf.sail.sparql.ast.ASTBlankNode; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java index 05195d698a..103e6c9421 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPattern.java @@ -34,8 +34,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java index e530dff225..6bb38046be 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java @@ -40,7 +40,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; import com.bigdata.bop.IBindingSet; import com.bigdata.bop.IVariable; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java index 2e41fa6184..50bfa166bb 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/NegatedPropertySet.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; -import org.openrdf.query.algebra.StatementPattern.Scope; -import org.openrdf.query.algebra.ValueExpr; -import org.openrdf.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.query.algebra.ValueExpr; +import org.eclipse.rdf4j.query.algebra.Var; /** * A negated property set is a SPARQL construction of the form {?X !(uri|^uri) diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java index 9415538dfc..d51d065340 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java @@ -17,15 +17,15 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.vocabulary.DC; -import org.openrdf.model.vocabulary.FN; -import org.openrdf.model.vocabulary.FOAF; -import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.model.vocabulary.SESAME; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.model.vocabulary.DC; +import org.eclipse.rdf4j.model.vocabulary.FN; +import org.eclipse.rdf4j.model.vocabulary.FOAF; +import org.eclipse.rdf4j.model.vocabulary.OWL; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.SESAME; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.bigdata.rdf.graph.impl.bd.GASService; import com.bigdata.rdf.internal.XSD; @@ -88,7 +88,7 @@ public static interface Options { static { defaultDecls.put("rdf", RDF.NAMESPACE); defaultDecls.put("rdfs", RDFS.NAMESPACE); - defaultDecls.put("sesame", SESAME.NAMESPACE); + defaultDecls.put("rdf4j", SESAME.NAMESPACE); defaultDecls.put("owl", OWL.NAMESPACE); defaultDecls.put("xsd", XMLSchema.NAMESPACE); defaultDecls.put("fn", FN.NAMESPACE); @@ -138,7 +138,7 @@ public static Map process(ASTOperationContainer qc) // insert some default prefixes (if not explicitly defined in the query) // insertDefaultPrefix(prefixMap, "rdf", RDF.NAMESPACE); // insertDefaultPrefix(prefixMap, "rdfs", RDFS.NAMESPACE); -// insertDefaultPrefix(prefixMap, "sesame", SESAME.NAMESPACE); +// insertDefaultPrefix(prefixMap, "rdf4j", SESAME.NAMESPACE); // insertDefaultPrefix(prefixMap, "owl", OWL.NAMESPACE); // insertDefaultPrefix(prefixMap, "xsd", XMLSchema.NAMESPACE); // insertDefaultPrefix(prefixMap, "fn", FN.NAMESPACE); @@ -302,8 +302,8 @@ private String checkForWellKnownNamespacePrefix(final String prefix) { prefixMap.put("fn", namespace = FN.NAMESPACE); } else if (prefix.equals("owl")) { prefixMap.put("owl", namespace = OWL.NAMESPACE); - } else if (prefix.equals("sesame")) { - prefixMap.put("sesame", namespace = SESAME.NAMESPACE); + } else if (prefix.equals("rdf4j")) { + prefixMap.put("rdf4j", namespace = SESAME.NAMESPACE); } else if (prefix.equals("gas")) { prefixMap.put("gas", namespace = GASService.Options.NAMESPACE); } else { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java index b8e3e9514c..c79c70f92f 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PropertySetElem.java @@ -5,7 +5,7 @@ */ package com.bigdata.rdf.sail.sparql; -import org.openrdf.query.algebra.ValueConstant; +import org.eclipse.rdf4j.query.algebra.ValueConstant; /** diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLStarUpdateDataBlockParser.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLStarUpdateDataBlockParser.java index e8619f3ee6..8b4ba90acd 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLStarUpdateDataBlockParser.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLStarUpdateDataBlockParser.java @@ -24,14 +24,14 @@ import java.util.Map; import java.util.Map.Entry; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.repository.sail.helpers.SPARQLUpdateDataBlockParser; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.helpers.StatementCollector; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.repository.sail.helpers.SPARQLUpdateDataBlockParser; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.helpers.StatementCollector; import com.bigdata.rdf.model.BigdataStatement; import com.bigdata.rdf.model.BigdataValueFactory; @@ -185,7 +185,7 @@ private Value parseStmtValue() throws IOException, RDFParseException /** * Overriding setBaseURI to keep base URI value for SPARQL* parsing as - * org.openrdf.rio.helpers.RDFParserBase.baseURI is a private field + * org.eclipse.rdf4j.rio.helpers.RDFParserBase.baseURI is a private field */ @Override protected void setBaseURI(String uri) { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java index 5076d7dfbf..6e01245158 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/SPARQLUtil.java @@ -5,7 +5,7 @@ */ package com.bigdata.rdf.sail.sparql; -import info.aduna.text.StringUtil; +import org.eclipse.rdf4j.common.text.StringUtil; /** * SPARQL-related utility methods. diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java index 3e36c4ad50..3b9f3ebf56 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/StringEscapesProcessor.java @@ -5,7 +5,7 @@ */ package com.bigdata.rdf.sail.sparql; -import org.openrdf.query.MalformedQueryException; +import org.eclipse.rdf4j.query.MalformedQueryException; import com.bigdata.rdf.sail.sparql.ast.ASTOperationContainer; import com.bigdata.rdf.sail.sparql.ast.ASTString; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java index 26827deef9..98138edf7b 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/TriplePatternExprBuilder.java @@ -32,11 +32,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Literal; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java index 6088c071b5..5448fdfacf 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java @@ -38,22 +38,22 @@ import java.util.LinkedList; import java.util.List; -import org.openrdf.model.BNode; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.StatementPattern.Scope; -import org.openrdf.repository.sail.helpers.SPARQLUpdateDataBlockParser; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.rio.helpers.BasicParserSettings; -import org.openrdf.rio.helpers.StatementCollector; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope; +import org.eclipse.rdf4j.repository.sail.helpers.SPARQLUpdateDataBlockParser; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.rio.helpers.BasicParserSettings; +import org.eclipse.rdf4j.rio.helpers.StatementCollector; import com.bigdata.bop.BOpUtility; import com.bigdata.rdf.internal.IV; import com.bigdata.rdf.model.BigdataBNode; import com.bigdata.rdf.model.BigdataResource; import com.bigdata.rdf.model.BigdataStatement; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.StatementEnum; import com.bigdata.rdf.sail.sparql.ast.ASTAdd; @@ -902,7 +902,7 @@ private BigdataStatement[] doQuadsData(final ASTUpdate node, final Object data, final BigdataStatement spo = context.valueFactory.createStatement(// (BigdataResource) s, // - (BigdataURI) sp.p().getValue(), // + (BigdataIRI) sp.p().getValue(), // (BigdataValue) o,// (BigdataResource) (sp.c() != null ? sp.c().getValue(): null),// StatementEnum.Explicit// diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java index 0d441229af..bd0a8cf4af 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java @@ -37,13 +37,13 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.openrdf.model.URI; -import org.openrdf.model.vocabulary.FN; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.vocabulary.FN; import com.bigdata.bop.aggregate.AggregateBase; import com.bigdata.bop.rdf.aggregate.GROUP_CONCAT; import com.bigdata.rdf.internal.constraints.IriBOp; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.sail.sparql.ast.ASTAbs; import com.bigdata.rdf.sail.sparql.ast.ASTAggregate; import com.bigdata.rdf.sail.sparql.ast.ASTAnd; @@ -467,7 +467,7 @@ final public FunctionNode visit(ASTFunctionCall node, Object data) final ConstantNode uriNode = (ConstantNode) node.jjtGetChild(0) .jjtAccept(this, null); - final BigdataURI functionURI = (BigdataURI) uriNode.getValue(); + final BigdataIRI functionURI = (BigdataIRI) uriNode.getValue(); final int nargs = node.jjtGetNumChildren() - 1; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java index d5a2867e60..3fe547e52d 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java @@ -22,7 +22,7 @@ */ package com.bigdata.rdf.sail.webapp; -import info.aduna.xml.XMLWriter; +import org.eclipse.rdf4j.common.xml.XMLWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -56,25 +56,25 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.Dataset; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.impl.AbstractOperation; -import org.openrdf.query.impl.AbstractQuery; -import org.openrdf.query.impl.DatasetImpl; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.BooleanQueryResultWriter; -import org.openrdf.query.resultio.BooleanQueryResultWriterRegistry; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultWriter; -import org.openrdf.query.resultio.TupleQueryResultWriterRegistry; -import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter; -import org.openrdf.repository.sail.SailQuery; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.impl.AbstractOperation; +import org.eclipse.rdf4j.query.impl.AbstractQuery; +import org.eclipse.rdf4j.query.impl.DatasetImpl; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultWriter; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultWriterRegistry; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriter; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterRegistry; +import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter; +import org.eclipse.rdf4j.repository.sail.SailQuery; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import com.bigdata.BigdataStatics; import com.bigdata.bop.engine.IRunningQuery; @@ -119,7 +119,7 @@ import com.bigdata.util.DaemonThreadFactory; import com.bigdata.util.concurrent.ThreadPoolExecutorBaseStatisticsTask; -import info.aduna.xml.XMLWriter; +import org.eclipse.rdf4j.common.xml.XMLWriter; /** * Class encapsulates state shared by {@link QueryServlet}(s) for the same diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java index 0118a99908..2195c7a16f 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java @@ -42,23 +42,24 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Properties; import javax.servlet.Servlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openrdf.model.Graph; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterFactory; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterFactory; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -555,7 +556,7 @@ static protected void buildAndCommitBooleanResponse( * @param resp */ static public void sendGraph(final HttpServletRequest req, - final HttpServletResponse resp, final Graph g) throws IOException { + final HttpServletResponse resp, final Model g) throws IOException { /* * CONNEG for the MIME type. */ @@ -572,10 +573,10 @@ static public void sendGraph(final HttpServletRequest req, if (format == null) format = RDFFormat.RDFXML; - RDFWriterFactory writerFactory = RDFWriterRegistry.getInstance().get( + Optional writerFactory = RDFWriterRegistry.getInstance().get( format); - if (writerFactory == null) { + if (writerFactory.isEmpty()) { log.debug("No writer for format: format={}, Accept=\"{}\"", format, acceptStr); @@ -601,7 +602,7 @@ static public void sendGraph(final HttpServletRequest req, final OutputStream os = resp.getOutputStream(); try { - final RDFWriter writer = writerFactory.getWriter(os); + final RDFWriter writer = writerFactory.get().getWriter(os); writer.startRDF(); final Iterator itr = g.iterator(); while (itr.hasNext()) { @@ -650,7 +651,7 @@ static protected void sendProperties(final HttpServletRequest req, final OutputStream os = resp.getOutputStream(); try { final PropertiesWriter writer = PropertiesWriterRegistry - .getInstance().get(format).getWriter(os); + .getInstance().get(format).get().getWriter(os); writer.write(properties); os.flush(); } finally { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java index ff0ce821c0..b096323651 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataServlet.java @@ -41,7 +41,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; +import org.eclipse.rdf4j.model.Resource; import com.bigdata.ha.HAStatusEnum; import com.bigdata.journal.AbstractJournal; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java index f491ef7d5c..35f0deb457 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java @@ -34,9 +34,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.query.resultio.BooleanQueryResultFormat; -import org.openrdf.query.resultio.TupleQueryResultFormat; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat; +import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.counters.format.CounterSetFormat; import com.bigdata.rdf.properties.PropertiesFormat; @@ -58,7 +58,7 @@ public class ConnegUtil { } // static { - // // Work-around for sesame not handling ask and json (see trac 704 and + // // Work-around for rdf4j not handling ask and json (see trac 704 and // 714) // // if @@ -66,7 +66,7 @@ public class ConnegUtil { // { // // This should fire once trac 714 is fixed, and we have upgraded, at this // point the whole static block should be deleted. - // log.warn("Workaround for sesame 2.6 BooleanQueryResultFormat defect no longer needed", + // log.warn("Workaround for rdf4j 2.6 BooleanQueryResultFormat defect no longer needed", // new RuntimeException("location of issue")); // } else { // final BooleanQueryResultFormat askJsonFormat = diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DataLoaderServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DataLoaderServlet.java index 16dccb0760..da3dd00294 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DataLoaderServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DataLoaderServlet.java @@ -36,7 +36,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFFormat; import com.bigdata.journal.ITx; import com.bigdata.rdf.inf.ClosureStats; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DatasetNotFoundException.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DatasetNotFoundException.java index 24a3f64dd9..873e55b200 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DatasetNotFoundException.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DatasetNotFoundException.java @@ -22,7 +22,7 @@ */ package com.bigdata.rdf.sail.webapp; -import org.openrdf.repository.RepositoryException; +import org.eclipse.rdf4j.repository.RepositoryException; /** * Exception thrown when a named data set is addressed and does not exist. diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java index 8f6b5aac51..c58ff7dd44 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DeleteServlet.java @@ -37,18 +37,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.RDFHandlerBase; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.journal.ITx; import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection; @@ -981,7 +981,7 @@ private void doDeleteWithAccessPath(final HttpServletRequest req, final Resource[] c; try { s = EncodeDecodeValue.decodeResource(req.getParameter("s")); - p = EncodeDecodeValue.decodeURI(req.getParameter("p")); + p = EncodeDecodeValue.decodeIRI(req.getParameter("p")); o = EncodeDecodeValue.decodeValue(req.getParameter("o")); c = decodeContexts(req, "c"); // c = EncodeDecodeValue.decodeContexts(req.getParameterValues("c")); diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DescribeCacheServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DescribeCacheServlet.java index e1a7a691e0..14df009a76 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DescribeCacheServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/DescribeCacheServlet.java @@ -34,18 +34,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.impl.GraphImpl; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import com.bigdata.bop.engine.QueryEngine; import com.bigdata.bop.fed.QueryEngineFactory; import com.bigdata.rdf.internal.IV; -import com.bigdata.rdf.model.BigdataURI; +import com.bigdata.rdf.model.BigdataIRI; import com.bigdata.rdf.model.BigdataValue; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.sparql.ast.cache.CacheConnectionFactory; @@ -87,7 +87,7 @@ * * TODO Take advantage of the known materialization performed by a DESCRIBE * query when running queries (materialized star-join). Also, store IVs in the - * Graph as well as Values. We need both to do efficient star-joins (enter by IV + * Model as well as Values. We need both to do efficient star-joins (enter by IV * and have IV on output). * * TODO Hash partitioned DESCRIBE fabric. The partitioned map is easy enough and @@ -144,8 +144,8 @@ protected void doGet(final HttpServletRequest req, * * 2. Else, if the request is a SPARQL DESCRIBE, then extract the URIs * to be described and attach them as request attributes (on a set). - * A single Graph will be returned in this case. The client will have - * to inspect the Graph to decide which URIs were found and which were + * A single Model will be returned in this case. The client will have + * to inspect the Model to decide which URIs were found and which were * not. * * 3. Check the request attribute for a set of URIs to be DESCRIBEd. @@ -222,7 +222,7 @@ protected void doGet(final HttpServletRequest req, /* * Ensure that URIs are BigdatURIs for this namespace. */ - final Set internalURIs = new LinkedHashSet(); + final Set internalURIs = new LinkedHashSet(); { final BigdataValueFactory valueFactory = tripleStore @@ -262,14 +262,14 @@ protected void doGet(final HttpServletRequest req, * * TODO Support SKETCH (VoID request) option here. */ - Graph g = null; + Model g = null; { - for (BigdataURI uri : internalURIs) { + for (BigdataIRI uri : internalURIs) { final IV iv = uri.getIV(); - final Graph x = describeCache.lookup(iv); + final Model x = describeCache.lookup(iv); if (x != null && g == null) { @@ -281,7 +281,7 @@ protected void doGet(final HttpServletRequest req, } else { // Collect the DESCRIBE of all graphs. - g = new GraphImpl(); + g = new LinkedHashModel(); // Combine the resource descriptions together. g.addAll(x); @@ -362,7 +362,7 @@ protected void doGet(final HttpServletRequest req, final OutputStream os = resp.getOutputStream(); final RDFWriter w = RDFWriterRegistry.getInstance().get(format) - .getWriter(os); + .get().getWriter(os); w.startRDF(); diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java index ea67b24ff2..edc343ed14 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java @@ -37,16 +37,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParser; -import org.openrdf.rio.RDFParserFactory; -import org.openrdf.rio.RDFParserRegistry; -import org.openrdf.rio.helpers.RDFHandlerBase; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParser; +import org.eclipse.rdf4j.rio.RDFParserFactory; +import org.eclipse.rdf4j.rio.RDFParserRegistry; +import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase; +import org.eclipse.rdf4j.sail.SailException; import com.bigdata.journal.ITx; import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java index 83e80c3cea..7fdbbf12ac 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java @@ -30,6 +30,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.regex.Matcher; @@ -44,10 +45,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.BNode; -import org.openrdf.model.Graph; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.model.impl.ValueFactoryImpl; import com.bigdata.btree.IndexMetadata; import com.bigdata.journal.IIndexManager; @@ -341,10 +342,10 @@ private void doPrepareProperties(final HttpServletRequest req, if (log.isInfoEnabled()) log.info("Format=" + format); - final PropertiesParserFactory parserFactory = PropertiesParserRegistry + final Optional parserFactory = PropertiesParserRegistry .getInstance().get(format); - if (parserFactory == null) { + if (parserFactory.isEmpty()) { buildAndCommitResponse(resp, HTTP_INTERNALERROR, MIME_TEXT_PLAIN, "Parser factory not found: Content-Type=" @@ -358,7 +359,7 @@ private void doPrepareProperties(final HttpServletRequest req, * There is a request body, so let's try and parse it. */ - final PropertiesParser parser = parserFactory.getParser(); + final PropertiesParser parser = parserFactory.get().getParser(); // The given Properties. given = parser.parse(req.getInputStream()); @@ -552,10 +553,10 @@ private void doCreateNamespace(final HttpServletRequest req, if (log.isInfoEnabled()) log.info("Format=" + format); - final PropertiesParserFactory parserFactory = PropertiesParserRegistry + final Optional parserFactory = PropertiesParserRegistry .getInstance().get(format); - if (parserFactory == null) { + if (parserFactory.isEmpty()) { buildAndCommitResponse(resp, HTTP_INTERNALERROR, MIME_TEXT_PLAIN, "Parser factory not found: Content-Type=" @@ -569,7 +570,7 @@ private void doCreateNamespace(final HttpServletRequest req, * There is a request body, so let's try and parse it. */ - final PropertiesParser parser = parserFactory.getParser(); + final PropertiesParser parser = parserFactory.get().getParser(); // The given Properties. props = parser.parse(req.getInputStream()); @@ -744,7 +745,7 @@ private void doDescribeNamespaces(final HttpServletRequest req, try { - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); if (describeDefaultNamespace) { @@ -787,10 +788,10 @@ private void doDescribeNamespaces(final HttpServletRequest req, } /** - * Describe a namespace into the supplied Graph object. + * Describe a namespace into the supplied Model object. */ private void describeNamespaceTx(final HttpServletRequest req, - final Graph g, final String namespace, + final Model g, final String namespace, final boolean describeEachNamedGraph, final long tx) throws IOException { diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java index b95e909c83..27cee77da3 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java @@ -33,6 +33,7 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Map; +import java.util.Optional; import java.util.TreeMap; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -48,16 +49,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.Graph; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.impl.LinkedHashModel; -import org.openrdf.repository.RepositoryResult; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFWriter; -import org.openrdf.rio.RDFWriterRegistry; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.impl.LinkedHashModel; +import org.eclipse.rdf4j.repository.RepositoryResult; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFWriter; +import org.eclipse.rdf4j.rio.RDFWriterRegistry; import com.bigdata.bop.BOp; import com.bigdata.bop.BOpUtility; @@ -376,7 +377,7 @@ private void doServiceDescription(final HttpServletRequest req, * TODO Resolve the SD class name and ctor via a configuration * property for extensible descriptions. */ - final Graph g = new LinkedHashModel(); + final Model g = new LinkedHashModel(); { final SD sd = new SD(g, tripleStore, serviceURI); @@ -1428,12 +1429,12 @@ private void doEstCard(final HttpServletRequest req, final boolean exact = getBooleanValue(req, "exact", false/* default */); final Resource s; - final URI p; + final IRI p; final Value o; final Resource[] c; try { s = EncodeDecodeValue.decodeResource(req.getParameter("s")); - p = EncodeDecodeValue.decodeURI(req.getParameter("p")); + p = EncodeDecodeValue.decodeIRI(req.getParameter("p")); o = EncodeDecodeValue.decodeValue(req.getParameter("o")); c = decodeContexts(req, "c"); // c = EncodeDecodeValue.decodeContexts(req.getParameterValues("c")); @@ -1474,14 +1475,14 @@ private static class EstCardTask extends AbstractRestApiTask { private final boolean exact; private final Resource s; - private final URI p; + private final IRI p; private final Value o; private final Resource[] c; public EstCardTask(final HttpServletRequest req, final HttpServletResponse resp, final String namespace, final long timestamp, final boolean exact, - final Resource s, final URI p, + final Resource s, final IRI p, final Value o, final Resource[] c) { super(req, resp, namespace, timestamp); @@ -1563,12 +1564,12 @@ private void doHasStmt(final HttpServletRequest req, final boolean includeInferred = getBooleanValue(req, INCLUDE_INFERRED, true/* default */); final Resource s; - final URI p; + final IRI p; final Value o; final Resource[] c; try { s = EncodeDecodeValue.decodeResource(req.getParameter("s")); - p = EncodeDecodeValue.decodeURI(req.getParameter("p")); + p = EncodeDecodeValue.decodeIRI(req.getParameter("p")); o = EncodeDecodeValue.decodeValue(req.getParameter("o")); c = decodeContexts(req, "c"); // c = EncodeDecodeValue.decodeContexts(req.getParameterValues("c")); @@ -1610,14 +1611,14 @@ private static class HasStmtTask extends AbstractRestApiTask { private final boolean includeInferred; private final Resource s; - private final URI p; + private final IRI p; private final Value o; private final Resource[] c; public HasStmtTask(final HttpServletRequest req, final HttpServletResponse resp, final String namespace, final long timestamp, final boolean includeInferred, - final Resource s, final URI p, final Value o, final Resource[] c) { + final Resource s, final IRI p, final Value o, final Resource[] c) { super(req, resp, namespace, timestamp); @@ -1686,13 +1687,13 @@ private void doGetStmts(final HttpServletRequest req, final boolean includeInferred = getBooleanValue(req, INCLUDE_INFERRED, true/* default */); final Resource s; - final URI p; + final IRI p; final Value o; final Resource[] c; final Enumeration mimeTypes; try { s = EncodeDecodeValue.decodeResource(req.getParameter("s")); - p = EncodeDecodeValue.decodeURI(req.getParameter("p")); + p = EncodeDecodeValue.decodeIRI(req.getParameter("p")); o = EncodeDecodeValue.decodeValue(req.getParameter("o")); c = decodeContexts(req, "c"); mimeTypes = req.getHeaders(ConnectOptions.ACCEPT_HEADER); @@ -1733,14 +1734,14 @@ private static class GetStmtsTask extends AbstractRestApiTask { private final Enumeration mimeTypes; private final boolean includeInferred; private final Resource s; - private final URI p; + private final IRI p; private final Value o; private final Resource[] c; public GetStmtsTask(final HttpServletRequest req, final HttpServletResponse resp, final String namespace, final long timestamp, final boolean includeInferred, - final Resource s, final URI p, final Value o, final Resource[] c, Enumeration mimeTypes) { + final Resource s, final IRI p, final Value o, final Resource[] c, Enumeration mimeTypes) { super(req, resp, namespace, timestamp); @@ -1768,13 +1769,13 @@ public Void call() throws Exception { conn = getQueryConnection(); String mimeType = null; - RDFFormat format = null; + Optional format = Optional.empty(); if (mimeTypes!=null) { mimeTypesLoop: while(mimeTypes.hasMoreElements()) { for (String mt:mimeTypes.nextElement().split(",")) { mt = mt.trim(); - RDFFormat fmt = RDFWriterRegistry.getInstance() + Optional fmt = RDFWriterRegistry.getInstance() .getFileFormatForMIMEType(mt); if (conn.getTripleStore().isQuads() && (mt.equals(RDFFormat.NQUADS.getDefaultMIMEType()) || mt.equals(RDFFormat.TURTLE.getDefaultMIMEType())) || !conn.getTripleStore().isQuads() && fmt != null) { mimeType = mt; @@ -1797,8 +1798,8 @@ public Void call() throws Exception { final OutputStream os = resp.getOutputStream(); - final RDFWriter w = RDFWriterRegistry.getInstance().get(format) - .getWriter(os); + final RDFWriter w = RDFWriterRegistry.getInstance().get(format.get()) + .get().getWriter(os); RepositoryResult stmts = null; @@ -1874,12 +1875,12 @@ private void doShardReport(final HttpServletRequest req, final boolean doRangeCount = true; final Resource s; - final URI p; + final IRI p; final Value o; final Resource c; try { s = EncodeDecodeValue.decodeResource(req.getParameter("s")); - p = EncodeDecodeValue.decodeURI(req.getParameter("p")); + p = EncodeDecodeValue.decodeIRI(req.getParameter("p")); o = EncodeDecodeValue.decodeValue(req.getParameter("o")); c = EncodeDecodeValue.decodeResource(req.getParameter("c")); } catch (IllegalArgumentException ex) { @@ -1915,14 +1916,14 @@ private void doShardReport(final HttpServletRequest req, private static class ShardsTask extends AbstractRestApiTask { private final Resource s; - private final URI p; + private final IRI p; private final Value o; private final Resource c; private final boolean doRangeCount; public ShardsTask(final HttpServletRequest req, final HttpServletResponse resp, final String namespace, - final long timestamp, final Resource s, final URI p, + final long timestamp, final Resource s, final IRI p, final Value o, final Resource c, final boolean doRangeCount) { super(req, resp, namespace, timestamp); diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java index 60fe07f21d..9fdc210aca 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java @@ -32,8 +32,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.openrdf.model.URI; -import org.openrdf.model.impl.URIImpl; +import org.eclipse.rdf4j.model.URI; +import org.eclipse.rdf4j.model.impl.URIImpl; import com.bigdata.rdf.sail.webapp.client.MiniMime; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RestApiGetContextsTask.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RestApiGetContextsTask.java index 8e8c6b5c4a..f6f515c19c 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RestApiGetContextsTask.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RestApiGetContextsTask.java @@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openrdf.model.Resource; -import org.openrdf.repository.RepositoryResult; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.repository.RepositoryResult; import com.bigdata.rdf.sail.BigdataSailRepositoryConnection; import com.bigdata.rdf.sail.webapp.XMLBuilder.Node; diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java index bb8e8ddb4e..13a3694fa6 100644 --- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java +++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java @@ -1,6 +1,6 @@ /** -Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. +Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016. All rights reserved. Contact: SYSTAP, LLC DBA Blazegraph @@ -29,12 +29,13 @@ import java.util.Properties; -import org.openrdf.model.BNode; -import org.openrdf.model.Graph; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.BNode; +import org.eclipse.rdf4j.model.Model; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.impl.URIImpl; +import org.eclipse.rdf4j.model.vocabulary.RDF; import com.bigdata.ha.HAGlue; import com.bigdata.ha.QuorumService; @@ -66,30 +67,31 @@ public class SD { static public final String NS = "http://www.w3.org/ns/sparql-service-description#"; + + private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); - static public final URI Service = new URIImpl(NS + "Service"); + static public final IRI Service = VALUE_FACTORY.createIRI(NS, "Service"); - static public final URI endpoint = new URIImpl(NS + "endpoint"); + static public final IRI endpoint = VALUE_FACTORY.createIRI(NS, "endpoint"); /** * 

      * 
      *
*/ - static public final URI supportedLanguage = new URIImpl(NS - + "supportedLanguage"); + static public final IRI supportedLanguage = VALUE_FACTORY.createIRI(NS, "supportedLanguage"); - static public final URI SPARQL10Query = new URIImpl(NS + "SPARQL10Query"); + static public final IRI SPARQL10Query = VALUE_FACTORY.createIRI(NS, "SPARQL10Query"); - static public final URI SPARQL11Query = new URIImpl(NS + "SPARQL11Query"); + static public final IRI SPARQL11Query = VALUE_FACTORY.createIRI(NS, "SPARQL11Query"); - static public final URI SPARQL11Update = new URIImpl(NS + "SPARQL11Update"); + static public final IRI SPARQL11Update = VALUE_FACTORY.createIRI(NS, "SPARQL11Update"); /** * Relates an instance of {@link #Service} to a format that is supported for * serializing query results. URIs for commonly used serialization formats * are defined by Unique URIs for File Formats. For formats that do not have - * an existing URI, the + * an existing IRI, the * media_type and preferred_suffix * properties defined in that document SHOULD be used to describe the @@ -102,7 +104,7 @@ public class SD { // * // * // * - static public final URI resultFormat = new URIImpl(NS + "resultFormat"); + static public final IRI resultFormat = VALUE_FACTORY.createIRI(NS, "resultFormat"); /** * Relates an instance of sd:Service to a format that is supported for @@ -111,7 +113,7 @@ public class SD { * clauses (see also sd:DereferencesURIs below). *

* URIs for commonly used serialization formats are defined by Unique URIs - * for File Formats. For formats that do not have an existing URI, the media_type and preferred_suffix * properties defined in that document SHOULD be used to describe the @@ -120,19 +122,19 @@ public class SD { * @see Unique URIs for File * Formats */ - static public final URI inputFormat = new URIImpl(NS + "inputFormat"); + static public final IRI inputFormat = VALUE_FACTORY.createIRI(NS, "inputFormat"); /** * 

      * 
      *
*/ - static public final URI feature = new URIImpl(NS + "feature"); - static public final URI DereferencesURIs = new URIImpl(NS + "DereferencesURIs"); - static public final URI UnionDefaultGraph = new URIImpl(NS + "UnionDefaultGraph"); - static public final URI RequiresDataset = new URIImpl(NS + "RequiresDataset"); - static public final URI EmptyGraphs = new URIImpl(NS + "EmptyGraphs"); - static public final URI BasicFederatedQuery = new URIImpl(NS + "BasicFederatedQuery"); + static public final IRI feature = VALUE_FACTORY.createIRI(NS, "feature"); + static public final IRI DereferencesURIs = VALUE_FACTORY.createIRI(NS, "DereferencesURIs"); + static public final IRI UnionDefaultGraph = VALUE_FACTORY.createIRI(NS, "UnionDefaultGraph"); + static public final IRI RequiresDataset = VALUE_FACTORY.createIRI(NS, "RequiresDataset"); + static public final IRI EmptyGraphs = VALUE_FACTORY.createIRI(NS, "EmptyGraphs"); + static public final IRI BasicFederatedQuery = VALUE_FACTORY.createIRI(NS, "BasicFederatedQuery"); /** * The namespace for the bigdata specific features. @@ -142,27 +144,23 @@ public class SD { /* * KB modes. */ - static public final URI ModeTriples = new URIImpl(BDFNS + "KB/Mode/Triples"); - static public final URI ModeQuads = new URIImpl(BDFNS + "KB/Mode/Quads"); - static public final URI ModeSids = new URIImpl(BDFNS + "KB/Mode/Sids"); + static public final IRI ModeTriples = VALUE_FACTORY.createIRI(BDFNS, "KB/Mode/Triples"); + static public final IRI ModeQuads = VALUE_FACTORY.createIRI(BDFNS, "KB/Mode/Quads"); + static public final IRI ModeSids = VALUE_FACTORY.createIRI(BDFNS, "KB/Mode/Sids"); /* * Text Index modes. */ - static public final URI TextIndexValueCentric = new URIImpl(BDFNS - + "KB/TextIndex/ValueCentric"); + static public final IRI TextIndexValueCentric = VALUE_FACTORY.createIRI(BDFNS, "KB/TextIndex/ValueCentric"); - static public final URI TextIndexSubjectCentric = new URIImpl(BDFNS - + "KB/TextIndex/SubjectCentric"); + static public final IRI TextIndexSubjectCentric = VALUE_FACTORY.createIRI(BDFNS, "KB/TextIndex/SubjectCentric"); /* * Misc KB features. */ - static public final URI TruthMaintenance = new URIImpl(BDFNS - + "KB/TruthMaintenance"); + static public final IRI TruthMaintenance = VALUE_FACTORY.createIRI(BDFNS, "KB/TruthMaintenance"); - static public final URI IsolatableIndices = new URIImpl(BDFNS - + "KB/IsolatableIndices"); + static public final IRI IsolatableIndices = VALUE_FACTORY.createIRI(BDFNS, "KB/IsolatableIndices"); /** * A highly available deployment - this feature refers to the presence of @@ -173,8 +171,7 @@ public class SD { * the actual #of running joined instances to determine whether the database * can withstand a failure. */ - static public final URI HighlyAvailable = new URIImpl(BDFNS - + "HighlyAvailable"); + static public final IRI HighlyAvailable = VALUE_FACTORY.createIRI(BDFNS, "HighlyAvailable"); /** * The value of this feature is the target replication factor for the @@ -184,34 +181,31 @@ public class SD { * highly available. THREE (3) is the minimum configuration that can * withstand a failure. */ - static public final URI ReplicationFactor = new URIImpl(BDFNS - + "replicationFactor"); + static public final IRI ReplicationFactor = VALUE_FACTORY.createIRI(BDFNS, "replicationFactor"); /** * An {@link IBigdataFederation}. */ - static public final URI ScaleOut = new URIImpl(BDFNS - + "ScaleOut"); + static public final IRI ScaleOut = VALUE_FACTORY.createIRI(BDFNS, "ScaleOut"); /** * This indicates that the namespace is compatible with mapgraph (aka GPU) * acceleration, but this does not indicate whether or not the namespace is * currently loaded in the mapgraph-runtime. */ - static public final URI MapgraphCompatible = new URIImpl(BDFNS + "MapgraphCompatible"); + static public final IRI MapgraphCompatible = VALUE_FACTORY.createIRI(BDFNS, "MapgraphCompatible"); /** * This indicates that the namespace is currently loaded within the * mapgraph-runtime. */ - static public final URI MapgraphAcceleration = new URIImpl(BDFNS + "MapgraphAcceleration"); + static public final IRI MapgraphAcceleration = VALUE_FACTORY.createIRI(BDFNS, "MapgraphAcceleration"); /** * The namespace for this KB instance as configured by the * {@link BigdataSail.Options#NAMESPACE} property. */ - static public final URI KB_NAMESPACE = new URIImpl(BDFNS - + "KB/Namespace"); + static public final IRI KB_NAMESPACE = VALUE_FACTORY.createIRI(BDFNS, "KB/Namespace"); /** * 
@@ -230,17 +224,13 @@ public class SD {
      *      usable with the properties sd:defaultSupportedEntailmentProfile and
      *      sd:supportedEntailmentProfile) 
      */
-    static public final URI defaultEntailmentRegime = new URIImpl(NS
-            + "defaultEntailmentRegime");
+    static public final IRI defaultEntailmentRegime = VALUE_FACTORY.createIRI(NS, "defaultEntailmentRegime");
 
-    static public final URI entailmentRegime = new URIImpl(NS
-            + "entailmentRegime");
+    static public final IRI entailmentRegime = VALUE_FACTORY.createIRI(NS, "entailmentRegime");
 
-    static public final URI supportedEntailmentProfile = new URIImpl(NS
-            + "supportedEntailmentProfile");
+    static public final IRI supportedEntailmentProfile = VALUE_FACTORY.createIRI(NS, "supportedEntailmentProfile");
 
-    static public final URI extensionFunction = new URIImpl(NS
-            + "extensionFunction");
+    static public final IRI extensionFunction = VALUE_FACTORY.createIRI(NS, "extensionFunction");
 
     /*
      * Entailment regimes.
@@ -251,33 +241,30 @@ public class SD {
      * 
      * @see http://www.w3.org/ns/entailment/Simple
      */
-    static public final URI simpleEntailment = new URIImpl(
-            "http://www.w3.org/ns/entailment/Simple");
+    static public final IRI simpleEntailment = VALUE_FACTORY.createIRI("http://www.w3.org/ns/entailment/Simple");
 
     /**
      * RDF Entailment
      * 
      * @see http://www.w3.org/ns/entailment/RDF
      */
-    static public final URI rdfEntailment = new URIImpl(
-            "http://www.w3.org/ns/entailment/RDF");
+    static public final IRI rdfEntailment = VALUE_FACTORY.createIRI("http://www.w3.org/ns/entailment/RDF");
 
     /**
      * RDFS Entailment
      * 
      * @see http://www.w3.org/ns/entailment/RDFS
      */
-    static public final URI rdfsEntailment = new URIImpl(
-            "http://www.w3.org/ns/entailment/RDFS");
+    static public final IRI rdfsEntailment = VALUE_FACTORY.createIRI("http://www.w3.org/ns/entailment/RDFS");
     
-    static public final URI Function = new URIImpl(NS + "Function");
-    static public final URI defaultDataset = new URIImpl(NS + "defaultDataset");
-    static public final URI Dataset = new URIImpl(NS + "Dataset");
-    static public final URI defaultGraph = new URIImpl(NS + "defaultGraph");
-    static public final URI Graph = new URIImpl(NS + "Graph");
-    static public final URI namedGraph = new URIImpl(NS + "namedGraph");
-    static public final URI NamedGraph = new URIImpl(NS + "NamedGraph");
-    static public final URI name = new URIImpl(NS + "name");
+    static public final IRI Function = VALUE_FACTORY.createIRI(NS, "Function");
+    static public final IRI defaultDataset = VALUE_FACTORY.createIRI(NS, "defaultDataset");
+    static public final IRI Dataset = VALUE_FACTORY.createIRI(NS, "Dataset");
+    static public final IRI defaultGraph = VALUE_FACTORY.createIRI(NS, "defaultGraph");
+    static public final IRI Graph = VALUE_FACTORY.createIRI(NS, "Graph");
+    static public final IRI namedGraph = VALUE_FACTORY.createIRI(NS, "namedGraph");
+    static public final IRI NamedGraph = VALUE_FACTORY.createIRI(NS, "NamedGraph");
+    static public final IRI name = VALUE_FACTORY.createIRI(NS, "name");
 
     /*
      * RDF data
@@ -286,39 +273,35 @@ public class SD {
      */
     
     /**
-     * Unique URI for RDF/XML
+     * Unique IRI for RDF/XML
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI RDFXML = new URIImpl(
-            "http://www.w3.org/ns/formats/RDF_XML");
+    static public final IRI RDFXML = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/RDF_XML");
     
     /**
-     * Unique URI for NTRIPLES
+     * Unique IRI for NTRIPLES
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI NTRIPLES = new URIImpl(
-            "http://www.w3.org/ns/formats/N-Triples");
+    static public final IRI NTRIPLES = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/N-Triples");
 
     /**
-     * Unique URI for TURTLE
+     * Unique IRI for TURTLE
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI TURTLE = new URIImpl(
-            "http://www.w3.org/ns/formats/Turtle");
+    static public final IRI TURTLE = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/Turtle");
 
     // RDR specific extension of TURTLE.
-    static public final URI TURTLE_RDR = new URIImpl(
-            "http://www.bigdata.com/ns/formats/Turtle-RDR");
+    static public final IRI TURTLE_RDR = VALUE_FACTORY.createIRI("http://www.bigdata.com/ns/formats/Turtle-RDR");
 
     /**
-     * Unique URI for N3.
+     * Unique IRI for N3.
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI N3 = new URIImpl("http://www.w3.org/ns/formats/N3");
+    static public final IRI N3 = new URIImpl("http://www.w3.org/ns/formats/N3");
 
     // /**
     // * TODO The TriX file format.
@@ -332,86 +315,78 @@ public class SD {
      * href="http://www.wiwiss.fu-berlin.de/suhl/bizer/TriG/Spec/">TriG file
      * format.
      */
-    static public final URI TRIG = new URIImpl(
-            "http://www.wiwiss.fu-berlin.de/suhl/bizer/TriG/Spec/");
+    static public final IRI TRIG = VALUE_FACTORY.createIRI("http://www.wiwiss.fu-berlin.de/suhl/bizer/TriG/Spec/");
 
     // /**
     // * TODO A binary RDF format (openrdf)
     // *
     // * @see http://www.openrdf.org/issues/browse/RIO-79 (Request for unique
-    // URI)
+    // IRI)
     // */
     // public static final RDFFormat BINARY = new RDFFormat("BinaryRDF",
     // "application/x-binary-rdf", null,
     // "brf", true, true);
 
     /**
-     * The URI that identifies the N-Quads syntax is
+     * The IRI that identifies the N-Quads syntax is
      * http://sw.deri.org/2008/07/n-quads/#n-quads.
      * 
      * @see http://sw.deri.org/2008/07/n-quads/
      */
-    static public final URI NQUADS = new URIImpl(
-            "http://sw.deri.org/2008/07/n-quads/#n-quads");
+    static public final IRI NQUADS = VALUE_FACTORY.createIRI("http://sw.deri.org/2008/07/n-quads/#n-quads");
 
     // RDR specific extension of N-Triples.
-    static public final URI NTRIPLES_RDR = new URIImpl(
-            "http://www.bigdata.com/ns/formats/N-Triples-RDR");
+    static public final IRI NTRIPLES_RDR = VALUE_FACTORY.createIRI("http://www.bigdata.com/ns/formats/N-Triples-RDR");
 
     /*
      * SPARQL results
      */
 
     /**
-     * Unique URI for SPARQL Results in XML
+     * Unique IRI for SPARQL Results in XML
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI SPARQL_RESULTS_XML = new URIImpl(
-            "http://www.w3.org/ns/formats/SPARQL_Results_XML");
+    static public final IRI SPARQL_RESULTS_XML = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/SPARQL_Results_XML");
 
     /**
-     * Unique URI for SPARQL Results in JSON
+     * Unique IRI for SPARQL Results in JSON
      * 
      * @see http://www.w3.org/ns/formats/
      * 
      *      TODO Does openrdf support this yet?
      */
-    static public final URI SPARQL_RESULTS_JSON = new URIImpl(
-            "http://www.w3.org/ns/formats/SPARQL_Results_JSON");
+    static public final IRI SPARQL_RESULTS_JSON = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/SPARQL_Results_JSON");
 
     /**
-     * Unique URI for SPARQL Results in CSV
+     * Unique IRI for SPARQL Results in CSV
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI SPARQL_RESULTS_CSV = new URIImpl(
-            "http://www.w3.org/ns/formats/SPARQL_Results_CSV");
+    static public final IRI SPARQL_RESULTS_CSV = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/SPARQL_Results_CSV");
 
     /**
-     * Unique URI for SPARQL Results in TSV
+     * Unique IRI for SPARQL Results in TSV
      * 
      * @see http://www.w3.org/ns/formats/
      */
-    static public final URI SPARQL_RESULTS_TSV = new URIImpl(
-            "http://www.w3.org/ns/formats/SPARQL_Results_TSV");
+    static public final IRI SPARQL_RESULTS_TSV = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/SPARQL_Results_TSV");
 
     // TODO openrdf binary format.
 //    /**
-//     * Unique URI for SPARQL Results in TSV
+//     * Unique IRI for SPARQL Results in TSV
 //     * 
 //     * @see TupleQueryResultFormat#BINARY
 //     * 
-//     * @see http://www.openrdf.org/issues/browse/RIO-79 (Request for unique URI) 
+//     * @see http://www.openrdf.org/issues/browse/RIO-79 (Request for unique IRI) 
 //     */
-//    static public final URI SPARQL_RESULTS_OPENRDF_BINARY = new URIImpl(
-//            "http://www.w3.org/ns/formats/SPARQL_Results_TSV");
+//    static public final IRI SPARQL_RESULTS_OPENRDF_BINARY = VALUE_FACTORY.createIRI("http://www.w3.org/ns/formats/SPARQL_Results_TSV");
 
     /**
      * The graph in which the service description is accumulated (from the
      * constructor).
      */
-    protected final Graph g;
+    protected final Model g;
     
     /**
      * The KB instance that is being described (from the constructor).
@@ -456,7 +431,7 @@ public class SD {
      * 
      * @see #describeService()
      */
-    public SD(final Graph g, final AbstractTripleStore tripleStore,
+    public SD(final Model g, final AbstractTripleStore tripleStore,
             final String... serviceURI) {
 
         if (g == null)
@@ -481,7 +456,7 @@ public SD(final Graph g, final AbstractTripleStore tripleStore,
         
         this.serviceURI = serviceURI;
         
-        this.f = g.getValueFactory();
+        this.f = VALUE_FACTORY;
         
         aService = f.createBNode("service");
 
@@ -547,9 +522,9 @@ public void describeService(final boolean describeStatistics,
      */
     protected void describeServiceEndpoints() {
 
-        for (String uri : serviceURI) {
+        for (String iri : serviceURI) {
 
-            g.add(aService, SD.endpoint, g.getValueFactory().createURI(uri));
+            g.add(aService, SD.endpoint, VALUE_FACTORY.createIRI(iri));
 
         }
 
@@ -744,7 +719,7 @@ protected void describeEntailmentRegime() {
         if (!tripleStore.isQuads())
             return;
 
-        final URI entailmentRegime;
+        final IRI entailmentRegime;
         final Axioms axioms = tripleStore.getAxioms();
         if (axioms == null || axioms instanceof NoAxioms) {
             entailmentRegime = SD.simpleEntailment;
diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
index dead4ab195..5ff1ff212d 100644
--- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
+++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/UpdateServlet.java
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -40,19 +41,20 @@
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Value;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandler;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandler;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
 
 import com.bigdata.journal.ITx;
 import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
-import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
 import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
+import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
 import com.bigdata.rdf.sail.webapp.BigdataRDFContext.AbstractQueryTask;
 import com.bigdata.rdf.sail.webapp.DeleteServlet.BufferStatementHandler;
 import com.bigdata.rdf.sail.webapp.DeleteServlet.RemoveStatementHandler;
@@ -155,10 +157,10 @@ private void doUpdateWithQuery(final HttpServletRequest req,
          * UpdateServlet fails to parse MIMEType when doing conneg. 
          */
 
-        final RDFFormat requestBodyFormat = RDFFormat.forMIMEType(new MiniMime(
-                contentType).getMimeType());
+        final Optional requestBodyFormat = RDFFormat.matchMIMEType(new MiniMime(
+                contentType).getMimeType(), RDFParserRegistry.getInstance().getKeys());
 
-        if (requestBodyFormat == null) {
+        if (requestBodyFormat.isEmpty()) {
 
             buildAndCommitResponse(resp, HTTP_BADREQUEST, MIME_TEXT_PLAIN,
                     "Content-Type not recognized as RDF: " + contentType);
@@ -167,10 +169,10 @@ private void doUpdateWithQuery(final HttpServletRequest req,
 
         }
 
-        final RDFParserFactory rdfParserFactory = RDFParserRegistry
-                .getInstance().get(requestBodyFormat);
+        final Optional rdfParserFactory = RDFParserRegistry
+                .getInstance().get(requestBodyFormat.get());
 
-        if (rdfParserFactory == null) {
+        if (rdfParserFactory.isEmpty()) {
 
             buildAndCommitResponse(resp, HTTP_INTERNALERROR, MIME_TEXT_PLAIN,
                     "Parser factory not found: Content-Type="
@@ -230,7 +232,7 @@ private void doUpdateWithQuery(final HttpServletRequest req,
 							baseURI,//
 							suppressTruthMaintenance, //
 							bindings,//
-							rdfParserFactory,//
+							rdfParserFactory.get(),//
 							defaultContextDelete,//
 							defaultContextInsert//
 					)).get();
@@ -245,7 +247,7 @@ private void doUpdateWithQuery(final HttpServletRequest req,
 	                     baseURI,//
 	                     suppressTruthMaintenance, //
 	                     bindings,//
-	                     rdfParserFactory,//
+	                     rdfParserFactory.get(),//
 	                     defaultContextDelete,//
 	                     defaultContextInsert//
 	               )).get();
@@ -419,10 +421,10 @@ public Void call() throws Exception {
 						// Run DELETE
 						{
 
-							final RDFParserFactory factory = RDFParserRegistry
+							final Optional factory = RDFParserRegistry
 									.getInstance().get(deleteQueryFormat);
 
-							final RDFParser rdfParser = factory.getParser();
+							final RDFParser rdfParser = factory.get().getParser();
 
 							rdfParser.setValueFactory(conn.getTripleStore()
 									.getValueFactory());
@@ -681,10 +683,10 @@ public Void call() throws Exception {
 	               // Run DELETE
 	               {
 	
-	                  final RDFParserFactory factory = RDFParserRegistry
+	                  final Optional factory = RDFParserRegistry
 	                        .getInstance().get(deleteQueryFormat);
 	
-	                  final RDFParser rdfParser = factory.getParser();
+	                  final RDFParser rdfParser = factory.get().getParser();
 	
 	                  rdfParser.setValueFactory(conn.getTripleStore()
 	                        .getValueFactory());
@@ -1100,12 +1102,13 @@ private void processData(final BigdataSailConnection conn,
              */
 
             final RDFFormat format = RDFFormat
-                    .forMIMEType(new MiniMime(contentType).getMimeType());
+                    .matchMIMEType(new MiniMime(contentType).getMimeType(),
+                        RDFParserRegistry.getInstance().getKeys()).get();
 
-            final RDFParserFactory rdfParserFactory = RDFParserRegistry
+            final Optional rdfParserFactory = RDFParserRegistry
                     .getInstance().get(format);
 
-            final RDFParser rdfParser = rdfParserFactory.getParser();
+            final RDFParser rdfParser = rdfParserFactory.get().getParser();
 
             rdfParser.setValueFactory(conn.getTripleStore()
                     .getValueFactory());
@@ -1143,10 +1146,11 @@ private boolean validateItem(
 	        
 	    }
 	
-        final RDFFormat format = RDFFormat
-                .forMIMEType(new MiniMime(contentType).getMimeType());
+        final Optional format = RDFFormat
+                .matchMIMEType(new MiniMime(contentType).getMimeType(), RDFParserRegistry
+                        .getInstance().getKeys());
 
-	    if (format == null) {
+	    if (format.isEmpty()) {
 	
 	        buildAndCommitResponse(resp, HTTP_BADREQUEST, MIME_TEXT_PLAIN,
 	                "Content-Type not recognized as RDF: " + contentType);
@@ -1155,10 +1159,10 @@ private boolean validateItem(
 	
 	    }
 	    
-        final RDFParserFactory rdfParserFactory = RDFParserRegistry
-		        .getInstance().get(format);
+        final Optional rdfParserFactory = RDFParserRegistry
+		        .getInstance().get(format.get());
 		
-		if (rdfParserFactory == null) {
+		if (rdfParserFactory.isEmpty()) {
 		
 		    buildAndCommitResponse(resp, HTTP_INTERNALERROR, MIME_TEXT_PLAIN,
 		            "Parser factory not found: Content-Type=" + contentType
diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/VoID.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/VoID.java
index 537124f70d..53ad6f3560 100644
--- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/VoID.java
+++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/VoID.java
@@ -34,17 +34,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.NotMaterializedException;
 import com.bigdata.rdf.model.BigdataResource;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sail.webapp.client.ConnectOptions;
 import com.bigdata.rdf.spo.SPOKeyOrder;
@@ -70,7 +71,7 @@ public class VoID {
      * The graph in which the service description is accumulated (from the
      * constructor).
      */
-    private final Graph g;
+    private final Model g;
     
     /**
      * The KB instance that is being described (from the constructor).
@@ -80,7 +81,7 @@ public class VoID {
     /**
      * The service end point(s) (from the constructor).
      */
-    private final String[] serviceURI;
+    private final String[] serviceIRI;
 
     /**
      * The value factory used to create values for the service description graph
@@ -109,15 +110,15 @@ public class VoID {
      *            Where to assemble the description.
      * @param tripleStore
      *            The KB instance to be described.
-     * @param serviceURI
+     * @param serviceIRI
      *            The SPARQL service end point.
      * @param aDefaultDataset
      *            The data set identifier that will be used on the description
      *            (the bigdata namespace of the dataset is obtained from the
      *            tripleStore).
      */
-    public VoID(final Graph g, final AbstractTripleStore tripleStore,
-            final String[] serviceURI, final Resource aDataset) {
+    public VoID(final Model g, final AbstractTripleStore tripleStore,
+            final String[] serviceIRI, final Resource aDataset) {
 
         if (g == null)
             throw new IllegalArgumentException();
@@ -125,13 +126,13 @@ public VoID(final Graph g, final AbstractTripleStore tripleStore,
         if (tripleStore == null)
             throw new IllegalArgumentException();
         
-        if (serviceURI == null)
+        if (serviceIRI == null)
             throw new IllegalArgumentException();
 
-        if (serviceURI.length == 0)
+        if (serviceIRI.length == 0)
             throw new IllegalArgumentException();
 
-        for (String s : serviceURI)
+        for (String s : serviceIRI)
             if (s == null)
                 throw new IllegalArgumentException();
         
@@ -142,9 +143,9 @@ public VoID(final Graph g, final AbstractTripleStore tripleStore,
         
         this.tripleStore = tripleStore;
         
-        this.serviceURI = serviceURI;
+        this.serviceIRI = serviceIRI;
         
-        this.f = g.getValueFactory();
+        this.f = SimpleValueFactory.getInstance();
         
         this.aDataset = aDataset;
     
@@ -187,14 +188,14 @@ public void describeDataSet(final boolean describeStatistics,
          * @see 
          *      Missing URL encoding in RemoteRepositoryManager 
          */
-        for (String uri : serviceURI) {
+        for (String iri : serviceIRI) {
             g.add(aDataset,
                     VoidVocabularyDecl.sparqlEndpoint,
-                    f.createURI(uri + "/" + ConnectOptions.urlEncode(namespace)
+                    f.createIRI(iri + "/" + ConnectOptions.urlEncode(namespace)
                             + "/sparql"));
         }
 
-        // any URI is considered to be an entity.
+        // any IRI is considered to be an entity.
         g.add(aDataset, VoidVocabularyDecl.uriRegexPattern,
                 f.createLiteral("^.*"));
 
@@ -229,7 +230,7 @@ public void describeDataSet(final boolean describeStatistics,
 
         // sb.append("termCount\t = " + tripleStore.getTermCount() + "\n");
         //
-        // sb.append("uriCount\t = " + tripleStore.getURICount() + "\n");
+        // sb.append("iriCount\t = " + tripleStore.getIRICount() + "\n");
         //
         // sb.append("literalCount\t = " + tripleStore.getLiteralCount() +
         // "\n");
@@ -259,7 +260,7 @@ public void describeDataSet(final boolean describeStatistics,
             @SuppressWarnings("rawtypes")
             final IChunkedIterator itr = r.distinctTermScan(keyOrder);
 
-            // resolve IVs to terms efficiently during iteration.
+            // resolve IVs to terms efficiently diring iteration.
             final BigdataValueIterator itr2 = new BigdataValueIteratorImpl(
                     tripleStore/* resolveTerms */, itr);
 
@@ -328,7 +329,7 @@ protected void describeVocabularies(final IVCount[] predicatePartitionCounts) {
             // property partitions.
             for (IVCount tmp : predicatePartitionCounts) {
 
-                final URI p = (URI) tmp.getValue();
+                final IRI p = (IRI) tmp.getValue();
 
                 String namespace = p.getNamespace();
 
@@ -354,7 +355,7 @@ protected void describeVocabularies(final IVCount[] predicatePartitionCounts) {
         for (String namespace : a) {
 
             g.add(aDataset, VoidVocabularyDecl.vocabulary,
-                    f.createURI(namespace));
+                    f.createIRI(namespace));
 
         }
 
@@ -398,7 +399,7 @@ protected void describeGraph(final Resource graph,
 
             final BNode propertyPartition = f.createBNode();
 
-            final URI p = (URI) tmp.getValue();
+            final IRI p = (IRI) tmp.getValue();
 
             g.add(graph, VoidVocabularyDecl.propertyPartition,
                     propertyPartition);
@@ -506,7 +507,7 @@ public int compareTo(IVCount arg0) {
     /**
      * Return an array of the distinct predicates in the KB ordered by their
      * descending frequency of use. The {@link IV}s in the returned array will
-     * have been resolved to the corresponding {@link BigdataURI}s which can be
+     * have been resolved to the corresponding {@link BigdataIRI}s which can be
      * accessed using {@link IV#getValue()}.
      * 
      * @param kb
@@ -532,7 +533,7 @@ protected static IVCount[] predicateUsage(final AbstractTripleStore kb) {
         @SuppressWarnings("rawtypes")
         final IChunkedIterator itr = r.distinctTermScan(keyOrder);
 
-        // resolve term identifiers to terms efficiently during iteration.
+        // resolve term identifiers to terms efficiently diring iteration.
         final BigdataValueIterator itr2 = new BigdataValueIteratorImpl(
                 kb/* resolveTerms */, itr);
 
@@ -683,7 +684,7 @@ protected static IVCount[] classUsage(final AbstractTripleStore kb) {
         final SPOKeyOrder keyOrder = quads ? SPOKeyOrder.POCS : SPOKeyOrder.POS;
 
         // Resolve IV for rdf:type
-        final BigdataURI rdfType = kb.getValueFactory().asValue(RDF.TYPE);
+        final BigdataIRI rdfType = kb.getValueFactory().asValue(RDF.TYPE);
 
         kb.getLexiconRelation().addTerms(new BigdataValue[] { rdfType },
                 1/* numTerms */, true/* readOnly */);
@@ -700,7 +701,7 @@ protected static IVCount[] classUsage(final AbstractTripleStore kb) {
         final IChunkedIterator itr = r.distinctMultiTermScan(keyOrder,
                 new IV[] { rdfType.getIV() }/* knownTerms */);
 
-        // resolve term identifiers to terms efficiently during iteration.
+        // resolve term identifiers to terms efficiently diring iteration.
         final BigdataValueIterator itr2 = new BigdataValueIteratorImpl(
                 kb/* resolveTerms */, itr);
 
@@ -779,7 +780,7 @@ protected static IVCount[] classUsage(final AbstractTripleStore kb,
         }
 
         // Resolve IV for rdf:type
-        final BigdataURI rdfType = kb.getValueFactory().asValue(RDF.TYPE);
+        final BigdataIRI rdfType = kb.getValueFactory().asValue(RDF.TYPE);
 
         kb.getLexiconRelation().addTerms(new BigdataValue[] { rdfType },
                 1/* numTerms */, true/* readOnly */);
diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/WorkbenchServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/WorkbenchServlet.java
index a811a9d2df..835ab96e37 100644
--- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/WorkbenchServlet.java
+++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/WorkbenchServlet.java
@@ -23,20 +23,21 @@
 package com.bigdata.rdf.sail.webapp;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Graph;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.rdf.sail.webapp.client.MiniMime;
 
@@ -101,10 +102,10 @@ private void doConvert(final HttpServletRequest req,
          * UpdateServlet fails to parse MIMEType when doing conneg. 
          */
 
-        final RDFFormat requestBodyFormat = RDFFormat.forMIMEType(new MiniMime(
-                contentType).getMimeType());
+        final Optional requestBodyFormat = RDFFormat.matchMIMEType(new MiniMime(
+                contentType).getMimeType(), RDFParserRegistry.getInstance().getKeys());
 
-        if (requestBodyFormat == null) {
+        if (requestBodyFormat.isEmpty()) {
 
             buildAndCommitResponse(resp, HTTP_BADREQUEST, MIME_TEXT_PLAIN,
                     "Content-Type not recognized as RDF: " + contentType);
@@ -113,10 +114,10 @@ private void doConvert(final HttpServletRequest req,
 
         }
 
-        final RDFParserFactory rdfParserFactory = RDFParserRegistry
-                .getInstance().get(requestBodyFormat);
+        final Optional rdfParserFactory = RDFParserRegistry
+                .getInstance().get(requestBodyFormat.get());
 
-        if (rdfParserFactory == null) {
+        if (rdfParserFactory.isEmpty()) {
 
             buildAndCommitResponse(resp, HTTP_INTERNALERROR, MIME_TEXT_PLAIN,
                     "Parser factory not found: Content-Type="
@@ -129,7 +130,7 @@ private void doConvert(final HttpServletRequest req,
 //        final String s= IOUtil.readString(req.getInputStream());
 //        System.err.println(s);
         
-        final Graph g = new LinkedHashModel();
+        final Model g = new LinkedHashModel();
         
         try {
         
@@ -137,10 +138,10 @@ private void doConvert(final HttpServletRequest req,
 	         * There is a request body, so let's try and parse it.
 	         */
 	
-	        final RDFParser rdfParser = rdfParserFactory
+	        final RDFParser rdfParser = rdfParserFactory.get()
 	                .getParser();
 	
-	        rdfParser.setValueFactory(new ValueFactoryImpl());
+	        rdfParser.setValueFactory(SimpleValueFactory.getInstance());
 	
 	        rdfParser.setVerifyData(true);
 	
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/bop/aggregate/AggregateBase.java b/bigdata-core/bigdata/src/java/com/bigdata/bop/aggregate/AggregateBase.java
index d2af0661d4..8b69a560f4 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/bop/aggregate/AggregateBase.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/bop/aggregate/AggregateBase.java
@@ -2,8 +2,8 @@
 
 import java.util.Map;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java b/bigdata-core/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
index 969ddbb6cb..41283ffa2f 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
@@ -41,7 +41,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.jetty.client.HttpClient;
-import org.openrdf.query.BindingSet;
+import org.eclipse.rdf4j.query.BindingSet;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpContext;
@@ -57,7 +57,7 @@
 import com.bigdata.bop.join.JoinTypeEnum;
 import com.bigdata.htree.HTree;
 import com.bigdata.rdf.lexicon.LexiconRelation;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.sparql.ast.service.BigdataServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ExternalServiceCall;
 import com.bigdata.rdf.sparql.ast.service.MockIVReturningServiceCall;
@@ -321,7 +321,7 @@ public Void call() throws Exception {
          */
         private void doServiceCallWithConstant() throws Exception {
 
-            final BigdataURI serviceURI = ServiceCallUtility
+            final BigdataIRI serviceURI = ServiceCallUtility
                     .getConstantServiceURI(serviceRef);
 
             if (serviceURI == null)
@@ -401,7 +401,7 @@ private void doServiceCallWithExpression() throws Exception {
 
                 while (sitr.hasNext()) {
 
-                    final Map serviceCallChunks = new HashMap();
+                    final Map serviceCallChunks = new HashMap();
 
                     final IBindingSet[] chunk = sitr.next();
 
@@ -409,7 +409,7 @@ private void doServiceCallWithExpression() throws Exception {
 
                         final IBindingSet bset = chunk[i];
 
-                        final BigdataURI serviceURI = ServiceCallUtility
+                        final BigdataIRI serviceURI = ServiceCallUtility
                                 .getServiceURI(serviceRef, bset);
 
                         ServiceCallChunk serviceCallChunk = serviceCallChunks
@@ -538,7 +538,7 @@ private void doServiceCallWithExpression() throws Exception {
          * @return The {@link ServiceCall} and never null.
          */
         private ServiceCall resolveService(
-                final BigdataURI serviceURI) {
+                final BigdataIRI serviceURI) {
 
             final ServiceCall serviceCall = ServiceRegistry.getInstance()
                     .toServiceCall(db, cm, serviceURI, serviceNode, (BaseJoinStats)context.getStats());
@@ -560,7 +560,7 @@ private class ServiceCallTask implements Callable {
             private final IBindingSet[] chunk;
 
             /** The service URI. */
-            private final BigdataURI serviceURI;
+            private final BigdataIRI serviceURI;
 
             /** The object used to talk to that service. */
             private final ServiceCall serviceCall;
@@ -871,7 +871,7 @@ private ICloseableIterator doNonBigdataSesameServiceCall(
             }
             
             /**
-             * Service call against a (non sesame based) external endpoint.
+             * Service call against a (non rdf4j based) external endpoint.
              * 
              * @param serviceCall
              *            The object which will make the service call.
@@ -903,7 +903,7 @@ private ICloseableIterator doNonBigdataMockIVServiceCall(
      */
     private static class ServiceCallChunk {
 
-        public final BigdataURI serviceURI;
+        public final BigdataIRI serviceURI;
 
         public final ServiceCall serviceCall;
 
@@ -911,7 +911,7 @@ private static class ServiceCallChunk {
         
         private final List sourceSolutions;
         
-        public ServiceCallChunk(final BigdataURI serviceURI,
+        public ServiceCallChunk(final BigdataIRI serviceURI,
                 final ServiceCall serviceCall, final IBindingSet[] chunk) {
 
             if(serviceURI == null)
@@ -936,7 +936,7 @@ public ServiceCallChunk(final BigdataURI serviceURI,
 
         }
 
-        public ServiceCallChunk(final BigdataURI serviceURI,
+        public ServiceCallChunk(final BigdataIRI serviceURI,
                 final ServiceCall serviceCall) {
     
             if(serviceURI == null)
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/bop/engine/StaticAnalysisStats.java b/bigdata-core/bigdata/src/java/com/bigdata/bop/engine/StaticAnalysisStats.java
index ad08c63bde..7e36b29f43 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/bop/engine/StaticAnalysisStats.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/bop/engine/StaticAnalysisStats.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -32,7 +32,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.sparql.ast.ASTContainer;
 import com.bigdata.rdf.sparql.ast.optimizers.ASTOptimizerList;
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/bop/solutions/IVComparator.java b/bigdata-core/bigdata/src/java/com/bigdata/bop/solutions/IVComparator.java
index 4d9fbc371f..dec3c74269 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/bop/solutions/IVComparator.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/bop/solutions/IVComparator.java
@@ -31,20 +31,20 @@
 
 package com.bigdata.bop.solutions;
 
-import info.aduna.lang.ObjectUtil;
+import org.eclipse.rdf4j.common.lang.ObjectUtil;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.datatypes.XMLDatatypeUtil;
-import org.openrdf.model.util.Literals;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.Compare.CompareOp;
-import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
-import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
-import org.openrdf.query.algebra.evaluation.util.ValueComparator;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil;
+import org.eclipse.rdf4j.model.util.Literals;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.Compare.CompareOp;
+import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException;
+import org.eclipse.rdf4j.query.algebra.evaluation.util.QueryEvaluationUtil;
+import org.eclipse.rdf4j.query.algebra.evaluation.util.ValueComparator;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.XSD;
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/counters/format/CounterSetFormat.java b/bigdata-core/bigdata/src/java/com/bigdata/counters/format/CounterSetFormat.java
index ab69fd7a0c..cfa863d0c8 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/counters/format/CounterSetFormat.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/counters/format/CounterSetFormat.java
@@ -57,7 +57,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
  */
 package com.bigdata.counters.format;
 
-import info.aduna.lang.FileFormat;
+import org.eclipse.rdf4j.common.lang.FileFormat;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -206,8 +206,7 @@ public static CounterSetFormat forMIMEType(final String mimeType) {
     public static CounterSetFormat forMIMEType(String mimeType,
             CounterSetFormat fallback) {
 
-        return matchMIMEType(mimeType, formats/* Iterable */,
-                fallback);
+        return matchMIMEType(mimeType, formats/* Iterable */).orElse(fallback);
         
     }
 
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/search/FullTextIndex.java b/bigdata-core/bigdata/src/java/com/bigdata/search/FullTextIndex.java
index 62a404b87f..a8be859854 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/search/FullTextIndex.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/search/FullTextIndex.java
@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
@@ -748,7 +749,7 @@ public void destroy() {
      * 
      * @return The token analyzer best suited to the indicated language family.
      */
-    protected Analyzer getAnalyzer(final String languageCode, final boolean filterStopwords) {
+    protected Analyzer getAnalyzer(final Optional languageCode, final boolean filterStopwords) {
 
         return analyzerFactory.getAnalyzer(languageCode, filterStopwords);
         
@@ -772,7 +773,7 @@ protected final IKeyBuilder getKeyBuilder() {
      * Uses a default filterStopwords value of true.
      */
     public void index(final TokenBuffer buffer, final V docId,
-            final int fieldId, final String languageCode, final Reader r) {
+            final int fieldId, final Optional languageCode, final Reader r) {
     	
     	index(buffer, docId, fieldId, languageCode, r, true/* filterStopwords */);
     	
@@ -808,7 +809,7 @@ public void index(final TokenBuffer buffer, final V docId,
      * @see TokenBuffer#flush()
      */
     public void index(final TokenBuffer buffer, final V docId,
-            final int fieldId, final String languageCode, final Reader r,
+            final int fieldId, final Optional languageCode, final Reader r,
             final boolean filterStopwords) {
 
         /*
@@ -873,7 +874,7 @@ public void index(final TokenBuffer buffer, final V docId,
      * 
      * @return The extracted token stream.
      */
-    protected TokenStream getTokenStream(final String languageCode, 
+    protected TokenStream getTokenStream(final Optional languageCode, 
     		final Reader r, final boolean filterStopwords) {
 
         /*
@@ -1027,7 +1028,7 @@ public int count(final FullTextQuery query) {
     protected TermFrequencyData tokenize(final FullTextQuery query) {
     	
 		final String q = query.getQuery();
-		final String languageCode = query.getLanguageCode(); 
+		final Optional languageCode = query.getLanguageCode(); 
 		final boolean prefixMatch = query.isPrefixMatch();
 
         // tokenize the query.
@@ -1075,7 +1076,7 @@ protected TermFrequencyData tokenize(final FullTextQuery query) {
     public Hit[] _search(final FullTextQuery query) {
     	
 		final String queryStr = query.getQuery();
-		final String languageCode = query.getLanguageCode(); 
+		final Optional languageCode = query.getLanguageCode(); 
 		final boolean prefixMatch = query.isPrefixMatch();
         final double minCosine = query.getMinCosine();
         final double maxCosine = query.getMaxCosine();
diff --git a/bigdata-core/bigdata/src/java/com/bigdata/search/IAnalyzerFactory.java b/bigdata-core/bigdata/src/java/com/bigdata/search/IAnalyzerFactory.java
index db9252ab6c..58ed025391 100644
--- a/bigdata-core/bigdata/src/java/com/bigdata/search/IAnalyzerFactory.java
+++ b/bigdata-core/bigdata/src/java/com/bigdata/search/IAnalyzerFactory.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,6 +28,7 @@
 package com.bigdata.search;
 
 import java.util.Locale;
+import java.util.Optional;
 
 import org.apache.lucene.analysis.Analyzer;
 
@@ -50,6 +51,6 @@ public interface IAnalyzerFactory {
      * 
      * @return The token analyzer best suited to the indicated language family.
      */
-    Analyzer getAnalyzer(final String languageCode, final boolean filterStopwords);
+    Analyzer getAnalyzer(final Optional languageCode, final boolean filterStopwords);
 
 }
diff --git a/bigdata-core/pom.xml b/bigdata-core/pom.xml
index 87fade2192..8ad647a8c5 100644
--- a/bigdata-core/pom.xml
+++ b/bigdata-core/pom.xml
@@ -305,6 +305,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       org.eclipse.rdf4j
diff --git a/bigdata-gas/pom.xml b/bigdata-gas/pom.xml
index 8939c4f9d4..2bdf4e2cb8 100644
--- a/bigdata-gas/pom.xml
+++ b/bigdata-gas/pom.xml
@@ -103,6 +103,7 @@ ga('send', 'pageview');
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       com.blazegraph
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/BinderBase.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/BinderBase.java
index 2f4027735e..138b43b097 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/BinderBase.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/BinderBase.java
@@ -19,8 +19,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IVariable;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IBinder.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IBinder.java
index 8a3573bad7..7c28681ff2 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IBinder.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IBinder.java
@@ -17,8 +17,8 @@
 
 import java.util.List;
 
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IVariable;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASContext.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASContext.java
index 7af18f9c99..188d7bd3ea 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASContext.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASContext.java
@@ -19,8 +19,8 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Execution context for an {@link IGASProgram}. This is distinct from the
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASOptions.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASOptions.java
index 0e072d5f4e..8c5516da8b 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASOptions.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASOptions.java
@@ -15,8 +15,8 @@
 */
 package com.bigdata.rdf.graph;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.analytics.CC;
 import com.bigdata.rdf.graph.impl.util.GASRunnerBase;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASProgram.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASProgram.java
index 4434085e86..5fcceb6c28 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASProgram.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASProgram.java
@@ -15,8 +15,8 @@
 */
 package com.bigdata.rdf.graph;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Abstract interface for GAS programs.
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASScheduler.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASScheduler.java
index 4b485c90af..55eb2a6d66 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASScheduler.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASScheduler.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Interface schedules a vertex for execution. This interface is exposed to the
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASState.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASState.java
index 4574cffdbd..1a7b449e63 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASState.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGASState.java
@@ -17,10 +17,10 @@
 
 import java.util.Set;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Interface exposes access to the VS and ES that is visible during a GATHER or
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGraphAccessor.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGraphAccessor.java
index cf8fa8c1dc..3e130f2658 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGraphAccessor.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IGraphAccessor.java
@@ -18,8 +18,8 @@
 import java.util.Iterator;
 import java.util.Random;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.impl.util.VertexDistribution;
 
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IPredecessor.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IPredecessor.java
index 8ecab94fb6..3e4b7e46f0 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IPredecessor.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IPredecessor.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * A interface for {@link IGASProgram}s that compute paths and track a
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IReducer.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IReducer.java
index b6cf63aa42..7fa71911fb 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IReducer.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IReducer.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * An interface for computing reductions over the vertices of a graph.
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IStaticFrontier.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IStaticFrontier.java
index 1ad0e7733f..4be701066e 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IStaticFrontier.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/IStaticFrontier.java
@@ -17,7 +17,7 @@
 
 import java.util.Iterator;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Interface abstracts the fixed frontier as known on entry into a new
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/BFS.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/BFS.java
index fafea65b29..78b3465a30 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/BFS.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/BFS.java
@@ -21,9 +21,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.rdf.graph.BinderBase;
 import com.bigdata.rdf.graph.EdgesEnum;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/CC.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/CC.java
index 0944329548..b5aca8ec3b 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/CC.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/CC.java
@@ -24,9 +24,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.rdf.graph.BinderBase;
 import com.bigdata.rdf.graph.EdgesEnum;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/FuzzySSSP.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/FuzzySSSP.java
index b86d4d208a..3d7f1ef5c3 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/FuzzySSSP.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/FuzzySSSP.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/PR.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/PR.java
index ba4524fa59..b22236a7d8 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/PR.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/PR.java
@@ -22,9 +22,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.rdf.graph.BinderBase;
 import com.bigdata.rdf.graph.EdgesEnum;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/SSSP.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/SSSP.java
index 89033a35fb..0585322523 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/SSSP.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/analytics/SSSP.java
@@ -22,10 +22,10 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.rdf.graph.BinderBase;
 import com.bigdata.rdf.graph.EdgesEnum;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java
index d32450ab6e..dfe7381604 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java
@@ -19,10 +19,10 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 
 import com.bigdata.rdf.graph.BinderBase;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/EdgeOnlyFilter.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/EdgeOnlyFilter.java
index 05cac78613..55da2c870f 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/EdgeOnlyFilter.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/EdgeOnlyFilter.java
@@ -15,7 +15,7 @@
  */
 package com.bigdata.rdf.graph.impl;
 
-import org.openrdf.model.Statement;
+import org.eclipse.rdf4j.model.Statement;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASState;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASContext.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASContext.java
index 936c213dea..970e51b424 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASContext.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASContext.java
@@ -28,9 +28,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.IGASContext;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASEngine.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASEngine.java
index 477df10f10..ee3f5e13f3 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASEngine.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASEngine.java
@@ -25,7 +25,7 @@
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASState.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASState.java
index 239849edbe..7f34471e30 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASState.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/GASState.java
@@ -24,12 +24,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.query.algebra.evaluation.util.ValueComparator;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.algebra.evaluation.util.ValueComparator;
 
 import com.bigdata.rdf.graph.Factory;
 import com.bigdata.rdf.graph.IGASContext;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java
index dcad345ad9..64a3471668 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java
@@ -17,7 +17,7 @@
 
 import java.util.concurrent.Callable;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * A factory for tasks that are applied to each vertex in the frontier.
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java
index 4c5ebdf7f2..e8db6abd04 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java
@@ -18,7 +18,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IStaticFrontier;
 import com.bigdata.rdf.graph.impl.util.IArraySlice;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGASEngine.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGASEngine.java
index e0af5b1027..09c53e13f9 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGASEngine.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGASEngine.java
@@ -22,13 +22,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.IGASContext;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphFixture.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphFixture.java
index 15cb864034..4c8d977776 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphFixture.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphFixture.java
@@ -15,10 +15,10 @@
 */
 package com.bigdata.rdf.graph.impl.ram;
 
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.graph.IGASEngine;
 import com.bigdata.rdf.graph.IGraphAccessor;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphLoader.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphLoader.java
index 953e3c5736..112332132e 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphLoader.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/ram/RAMGraphLoader.java
@@ -15,10 +15,10 @@
 */
 package com.bigdata.rdf.graph.impl.ram;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
 
 import com.bigdata.rdf.graph.impl.ram.RAMGASEngine.RAMGraph;
 import com.bigdata.rdf.graph.util.GraphLoader;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java
index fca1c31a37..3235704003 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java
@@ -15,19 +15,19 @@
 */
 package com.bigdata.rdf.graph.impl.sail;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Random;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.IGASContext;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASRunner.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASRunner.java
index 9298535e97..abc59d61eb 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASRunner.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SAILGASRunner.java
@@ -19,11 +19,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.graph.IGASEngine;
 import com.bigdata.rdf.graph.IGraphAccessor;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java
index cc3288d885..f187f2b96b 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java
@@ -15,10 +15,10 @@
 */
 package com.bigdata.rdf.graph.impl.sail;
 
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.graph.IGASEngine;
 import com.bigdata.rdf.graph.IGraphAccessor;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/Sesame2BigdataIterator.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/Sesame2BigdataIterator.java
index 7d59627fd1..8a0fc3363b 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/Sesame2BigdataIterator.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/sail/Sesame2BigdataIterator.java
@@ -21,7 +21,7 @@
 
 import java.util.NoSuchElementException;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 import cutthecrap.utils.striterators.ICloseableIterator;
 
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java
index 54d999b957..ff3d80c4d6 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java
@@ -17,7 +17,7 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IGASSchedulerImpl;
 import com.bigdata.rdf.graph.IStaticFrontier;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java
index cb67aff6d6..cf3efafd5c 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java
@@ -18,7 +18,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IGASSchedulerImpl;
 import com.bigdata.rdf.graph.IStaticFrontier;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java
index e1b6bc9ecf..b56060efcc 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java
@@ -17,7 +17,7 @@
 
 import java.util.Set;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 
 /**
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASRunnerBase.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASRunnerBase.java
index b8496042dc..b77d7ebd2b 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASRunnerBase.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/GASRunnerBase.java
@@ -8,7 +8,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.FrontierEnum;
 import com.bigdata.rdf.graph.IGASContext;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java
index 5ae24cc152..b9b234f943 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java
@@ -23,7 +23,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
+import org.eclipse.rdf4j.model.Resource;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
index dfb7d5b63b..654b4bc86e 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph.util;
 
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 
 abstract public class AbstractGraphFixture implements
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GASUtil.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GASUtil.java
index 47aa566f3d..788dbc3b0d 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GASUtil.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GASUtil.java
@@ -18,8 +18,8 @@
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 
 import cutthecrap.utils.striterators.EmptyIterator;
 
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GraphLoader.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GraphLoader.java
index acbac241ec..c97b2054b0 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GraphLoader.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/GraphLoader.java
@@ -24,22 +24,26 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URISyntaxException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.common.lang.FileFormat;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 /**
  * Utility to load data into a graph.
@@ -64,20 +68,23 @@ abstract public class GraphLoader {
      */
     private RDFFormat guessRDFFormat(final String n, final RDFFormat rdfFormat) {
 
-        RDFFormat fmt = RDFFormat.forFileName(n);
+        Set formats = RDFParserRegistry.getInstance().getKeys();
 
-        if (fmt == null && n.endsWith(".zip")) {
-            fmt = RDFFormat.forFileName(n.substring(0, n.length() - 4));
+        Optional fmt = FileFormat.matchFileName(n, formats);
+
+        if (fmt.isEmpty() && n.endsWith(".zip")) {
+            fmt = FileFormat.matchFileName(n.substring(0, n.length() - 4), formats);
         }
 
-        if (fmt == null && n.endsWith(".gz")) {
-            fmt = RDFFormat.forFileName(n.substring(0, n.length() - 3));
+        if (fmt.isEmpty() && n.endsWith(".gz")) {
+            fmt = FileFormat.matchFileName(n.substring(0, n.length() - 3), formats);
+
         }
 
-        if (fmt == null) // fallback
-            fmt = rdfFormat;
+        if (fmt.isEmpty()) // fallback
+            return rdfFormat;
 
-        return fmt;
+        return fmt.get();
 
     }
     
@@ -282,7 +289,7 @@ private void loadFromStream(final InputStream is,
         try {
 
             final RDFParserFactory rdfParserFactory = RDFParserRegistry
-                    .getInstance().get(rdfFormat);
+                    .getInstance().get(rdfFormat).get();
 
             final RDFParser rdfParser = rdfParserFactory.getParser();
 
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/IGraphFixture.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/IGraphFixture.java
index 9d1432f3ca..3cb8b1cff1 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/IGraphFixture.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/IGraphFixture.java
@@ -15,8 +15,8 @@
 */
 package com.bigdata.rdf.graph.util;
 
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.IGASEngine;
 import com.bigdata.rdf.graph.IGraphAccessor;
diff --git a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/SailGraphLoader.java b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/SailGraphLoader.java
index aaec66e968..300ef02f1f 100644
--- a/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/SailGraphLoader.java
+++ b/bigdata-gas/src/main/java/com/bigdata/rdf/graph/util/SailGraphLoader.java
@@ -15,12 +15,12 @@
 */
 package com.bigdata.rdf.graph.util;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
 
 public class SailGraphLoader extends GraphLoader {
 
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestBFS.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestBFS.java
index 4383590661..71d6117eaf 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestBFS.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestBFS.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph.analytics;
 
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestCC.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestCC.java
index d54913e9e5..7c43c503e6 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestCC.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestCC.java
@@ -18,8 +18,8 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openrdf.model.Value;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestSSSP.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestSSSP.java
index f659a807d8..328a95a525 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestSSSP.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/analytics/TestSSSP.java
@@ -15,7 +15,7 @@
 */
 package com.bigdata.rdf.graph.analytics;
 
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/AbstractRAMGraphTestCase.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/AbstractRAMGraphTestCase.java
index 414e138881..4a80107ef9 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/AbstractRAMGraphTestCase.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/AbstractRAMGraphTestCase.java
@@ -15,10 +15,10 @@
 */
 package com.bigdata.rdf.graph.impl.ram;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.graph.AbstractGraphTestCase;
 import com.bigdata.rdf.graph.impl.ram.RAMGASEngine.RAMGraph;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/TestGather.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/TestGather.java
index 1586e58f12..ec01e520b3 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/TestGather.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/ram/TestGather.java
@@ -19,9 +19,9 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.Factory;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java
index 4a29e73dab..3bc4b4f8f4 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java
@@ -21,10 +21,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.sail.Sail;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.sail.Sail;
 
 import com.bigdata.rdf.graph.AbstractGraphTestCase;
 import com.bigdata.rdf.graph.util.IGraphFixture;
diff --git a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/TestGather.java b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/TestGather.java
index 723f889d58..de0f864484 100644
--- a/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/TestGather.java
+++ b/bigdata-gas/src/test/java/com/bigdata/rdf/graph/impl/sail/TestGather.java
@@ -19,10 +19,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.Factory;
diff --git a/bigdata-gom/src/samples/com/bigdata/gom/samples/Example1.java b/bigdata-gom/src/samples/com/bigdata/gom/samples/Example1.java
index c57c1c7722..c4c8f8871c 100644
--- a/bigdata-gom/src/samples/com/bigdata/gom/samples/Example1.java
+++ b/bigdata-gom/src/samples/com/bigdata/gom/samples/Example1.java
@@ -6,8 +6,8 @@
 import java.util.concurrent.Executors;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.gom.gpo.IGPO;
diff --git a/bigdata-gom/src/samples/com/bigdata/gom/samples/Example2.java b/bigdata-gom/src/samples/com/bigdata/gom/samples/Example2.java
index 6b5de6da9d..e9eb3feba5 100644
--- a/bigdata-gom/src/samples/com/bigdata/gom/samples/Example2.java
+++ b/bigdata-gom/src/samples/com/bigdata/gom/samples/Example2.java
@@ -9,12 +9,12 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.jetty.client.HttpClient;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.gom.gpo.IGPO;
diff --git a/bigdata-jar/pom.xml b/bigdata-jar/pom.xml
index 4c31e270d1..3da4ca3903 100644
--- a/bigdata-jar/pom.xml
+++ b/bigdata-jar/pom.xml
@@ -44,7 +44,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
         
           **/*.xml
           **/*.properties
-          **/org.openrdf.rio.*
+          **/org.eclipse.rdf4j.rio.*
           **/com.bigdata.*
         
       
diff --git a/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery.java b/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery.java
index 50da9a38ce..cb44ce1837 100644
--- a/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery.java
+++ b/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery.java
@@ -3,8 +3,8 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.util.httpd.Config;
diff --git a/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery2.java b/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery2.java
index 05a9ce5a72..8f29bf1bcb 100644
--- a/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery2.java
+++ b/bigdata-perf/chem2bio2rdf/src/test/com/bigdata/perf/chem2bio2rdf/TestQuery2.java
@@ -4,10 +4,10 @@
 import java.io.Reader;
 import java.util.Properties;
 
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.Journal;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-rdf-test/pom.xml b/bigdata-rdf-test/pom.xml
index db7bf65df7..dad169611d 100644
--- a/bigdata-rdf-test/pom.xml
+++ b/bigdata-rdf-test/pom.xml
@@ -271,6 +271,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       org.eclipse.rdf4j
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/TestBOpUtility.java b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/TestBOpUtility.java
index ca270ba57d..56de049f13 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/TestBOpUtility.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/TestBOpUtility.java
@@ -34,20 +34,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpUtility;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/aggregate/TestGROUP_CONCAT.java b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/aggregate/TestGROUP_CONCAT.java
index cc6aa0dfc5..8e20993ad2 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/aggregate/TestGROUP_CONCAT.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/aggregate/TestGROUP_CONCAT.java
@@ -25,7 +25,7 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpContext;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/filter/TestNativeDistinctFilter.java b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/filter/TestNativeDistinctFilter.java
index 66e7139aa1..e809faa34c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/filter/TestNativeDistinctFilter.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/filter/TestNativeDistinctFilter.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -39,7 +39,7 @@
 import com.bigdata.journal.ITx;
 import com.bigdata.journal.Journal;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -105,14 +105,14 @@ public JoinSetup(final String kbNamespace) {
             {
                 final BigdataValueFactory vf = kb.getValueFactory();
                 final String uriString = "http://bigdata.com/";
-                final BigdataURI _knows = vf.asValue(FOAFVocabularyDecl.knows);
-                final BigdataURI _brad = vf.createURI(uriString+"brad");
-                final BigdataURI _john = vf.createURI(uriString+"john");
-                final BigdataURI _fred = vf.createURI(uriString+"fred");
-                final BigdataURI _mary = vf.createURI(uriString+"mary");
-                final BigdataURI _paul = vf.createURI(uriString+"paul");
-                final BigdataURI _leon = vf.createURI(uriString+"leon");
-                final BigdataURI _luke = vf.createURI(uriString+"luke");
+                final BigdataIRI _knows = vf.asValue(FOAFVocabularyDecl.knows);
+                final BigdataIRI _brad = vf.createURI(uriString+"brad");
+                final BigdataIRI _john = vf.createURI(uriString+"john");
+                final BigdataIRI _fred = vf.createURI(uriString+"fred");
+                final BigdataIRI _mary = vf.createURI(uriString+"mary");
+                final BigdataIRI _paul = vf.createURI(uriString+"paul");
+                final BigdataIRI _leon = vf.createURI(uriString+"leon");
+                final BigdataIRI _luke = vf.createURI(uriString+"luke");
 
                 final BigdataValue[] a = new BigdataValue[] {
                       _knows,//
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/joinGraph/GenerateBarData.java b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/joinGraph/GenerateBarData.java
index 63b9cffbb9..cdc7dee9f3 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/joinGraph/GenerateBarData.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/bop/rdf/joinGraph/GenerateBarData.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -34,14 +34,14 @@
 import java.util.Random;
 import java.util.UUID;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.Rio;
-import org.openrdf.sail.memory.model.MemValueFactory;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFWriter;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.sail.memory.model.MemValueFactory;
 
 import com.bigdata.rdf.sparql.ast.eval.rto.TestRTO_BAR;
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/axioms/TestAxioms.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/axioms/TestAxioms.java
index ed9186c272..90f96ca0a0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/axioms/TestAxioms.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/axioms/TestAxioms.java
@@ -30,12 +30,12 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.io.SerializerUtil;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.spo.SPO;
@@ -112,9 +112,9 @@ public void test_NoAxioms() {
             // Must be using the same namespace.
             assertEquals(store.getAxioms().getNamespace(), f.getNamespace());
 
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfProperty = f.asValue(RDF.PROPERTY);
-            final BigdataURI unknownURI = f.createURI("http://www.bigdata.com/unknown");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfProperty = f.asValue(RDF.PROPERTY);
+            final BigdataIRI unknownURI = f.createURI("http://www.bigdata.com/unknown");
             
             // resolve term ids.
             store.addTerms(new BigdataValue[] { rdfType, rdfProperty, unknownURI });
@@ -198,9 +198,9 @@ public void test_RdfsAxioms() {
             
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfProperty = f.asValue(RDF.PROPERTY);
-            final BigdataURI unknownURI = f.createURI("http://www.bigdata.com/unknown");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfProperty = f.asValue(RDF.PROPERTY);
+            final BigdataIRI unknownURI = f.createURI("http://www.bigdata.com/unknown");
             
             // resolve term ids.
             store.addTerms(new BigdataValue[] { rdfType, rdfProperty, unknownURI });
@@ -277,10 +277,10 @@ public void test_OwlAxioms() {
             
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfProperty = f.asValue(RDF.PROPERTY);
-            final BigdataURI owlEquivalentClass = f.asValue(OWL.EQUIVALENTCLASS);
-            final BigdataURI unknownURI = f.createURI("http://www.bigdata.com/unknown");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfProperty = f.asValue(RDF.PROPERTY);
+            final BigdataIRI owlEquivalentClass = f.asValue(OWL.EQUIVALENTCLASS);
+            final BigdataIRI unknownURI = f.createURI("http://www.bigdata.com/unknown");
             
             // resolve term ids.
             store.addTerms(new BigdataValue[] { rdfType, rdfProperty,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java
index 1837a8b799..ee70a7cbc0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java
@@ -25,8 +25,8 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.Journal;
@@ -34,7 +34,7 @@
 import com.bigdata.rdf.graph.util.IGraphFixture;
 import com.bigdata.rdf.graph.util.IGraphFixtureFactory;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
@@ -111,7 +111,7 @@ protected class SmallGraphProblem {
          */
         static private final String smallGraph = "src/test/resources/graph/data/smallGraph.ttl";
 
-        private final BigdataURI rdfType, foafKnows, foafPerson, mike, bryan,
+        private final BigdataIRI rdfType, foafKnows, foafPerson, mike, bryan,
                 martyn;
 
         public SmallGraphProblem() throws Exception {
@@ -124,19 +124,19 @@ public SmallGraphProblem() throws Exception {
                     
                 final ValueFactory vf = conn.getBigdataSail().getValueFactory();
     
-            rdfType = (BigdataURI) vf.createURI(RDF.TYPE.stringValue());
+            rdfType = (BigdataIRI) vf.createURI(RDF.TYPE.stringValue());
     
-            foafKnows = (BigdataURI) vf
+            foafKnows = (BigdataIRI) vf
                     .createURI("http://xmlns.com/foaf/0.1/knows");
     
-            foafPerson = (BigdataURI) vf
+            foafPerson = (BigdataIRI) vf
                     .createURI("http://xmlns.com/foaf/0.1/Person");
     
-            mike = (BigdataURI) vf.createURI("http://www.bigdata.com/Mike");
+            mike = (BigdataIRI) vf.createURI("http://www.bigdata.com/Mike");
     
-            bryan = (BigdataURI) vf.createURI("http://www.bigdata.com/Bryan");
+            bryan = (BigdataIRI) vf.createURI("http://www.bigdata.com/Bryan");
     
-            martyn = (BigdataURI) vf.createURI("http://www.bigdata.com/Martyn");
+            martyn = (BigdataIRI) vf.createURI("http://www.bigdata.com/Martyn");
     
             final BigdataValue[] terms = new BigdataValue[] { rdfType,
                     foafKnows, foafPerson, mike, bryan, martyn };
@@ -213,7 +213,7 @@ protected class SmallWeightedGraphProblem {
          */
         static private final String smallWeightedGraph = "src/test/resources/graph/data/smallWeightedGraph.ttlx";
 
-        private final BigdataURI foafKnows, linkWeight, v1, v2, v3, v4, v5;
+        private final BigdataIRI foafKnows, linkWeight, v1, v2, v3, v4, v5;
 
         public SmallWeightedGraphProblem() throws Exception {
 
@@ -225,17 +225,17 @@ public SmallWeightedGraphProblem() throws Exception {
                     
                 final ValueFactory vf = conn.getBigdataSail().getValueFactory();
     
-            foafKnows = (BigdataURI) vf
+            foafKnows = (BigdataIRI) vf
                     .createURI("http://xmlns.com/foaf/0.1/knows");
             
-            linkWeight = (BigdataURI) vf
+            linkWeight = (BigdataIRI) vf
                     .createURI("http://www.bigdata.com/weight");
     
-            v1 = (BigdataURI) vf.createURI("http://www.bigdata.com/1");
-            v2 = (BigdataURI) vf.createURI("http://www.bigdata.com/2");
-            v3 = (BigdataURI) vf.createURI("http://www.bigdata.com/3");
-            v4 = (BigdataURI) vf.createURI("http://www.bigdata.com/4");
-            v5 = (BigdataURI) vf.createURI("http://www.bigdata.com/5");
+            v1 = (BigdataIRI) vf.createURI("http://www.bigdata.com/1");
+            v2 = (BigdataIRI) vf.createURI("http://www.bigdata.com/2");
+            v3 = (BigdataIRI) vf.createURI("http://www.bigdata.com/3");
+            v4 = (BigdataIRI) vf.createURI("http://www.bigdata.com/4");
+            v5 = (BigdataIRI) vf.createURI("http://www.bigdata.com/5");
     
             final BigdataValue[] terms = new BigdataValue[] { foafKnows,
                     linkWeight, v1, v2, v3, v4, v5 };
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestBFS.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestBFS.java
index d2a2faf65b..32f135d6a7 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestBFS.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestBFS.java
@@ -23,7 +23,7 @@
 */
 package com.bigdata.rdf.graph.impl.bd;
 
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestFuzzySSSP.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestFuzzySSSP.java
index 7e9cbf23b7..5d258556ae 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestFuzzySSSP.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestFuzzySSSP.java
@@ -25,7 +25,7 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.IGASEngine;
 import com.bigdata.rdf.graph.IGraphAccessor;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestGather.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestGather.java
index f57e3027be..df5a466538 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestGather.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestGather.java
@@ -27,8 +27,8 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.rdf.graph.EdgesEnum;
 import com.bigdata.rdf.graph.Factory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestSSSP.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestSSSP.java
index 2fd26221f5..ec462cbc50 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestSSSP.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/graph/impl/bd/TestSSSP.java
@@ -23,7 +23,7 @@
 */
 package com.bigdata.rdf.graph.impl.bd;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 
 import com.bigdata.rdf.graph.IGASContext;
 import com.bigdata.rdf.graph.IGASEngine;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/AbstractEncodeDecodeMixedIVsTest.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/AbstractEncodeDecodeMixedIVsTest.java
index df95bd9d2d..c0e795d249 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/AbstractEncodeDecodeMixedIVsTest.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/AbstractEncodeDecodeMixedIVsTest.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -39,10 +39,11 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.internal.ColorsEnumExtension.Color;
 import com.bigdata.rdf.internal.impl.BlobIV;
@@ -70,8 +71,8 @@
 import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV;
 import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV;
 import com.bigdata.rdf.model.BigdataBNode;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -108,6 +109,8 @@ public AbstractEncodeDecodeMixedIVsTest(String name) {
      * imposed by the {@link AbstractTripleStore.Options}.
      */
     static private boolean fullyInlineUnicode = true;
+
+    private static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance();
     
     protected List> prepareIVs() throws DatatypeConfigurationException {
         
@@ -115,21 +118,21 @@ protected List> prepareIVs() throws DatatypeConfigurationException {
 
         final BigdataValueFactory vf = BigdataValueFactoryImpl.getInstance(getName());
         
-        final URI datatype = new URIImpl("http://www.bigdata.com");
-        final URI dt1 = new URIImpl("http://www.bigdata.com/mock-datatype-1");
-        final URI dt2 = new URIImpl("http://www.bigdata.com/mock-datatype-2");
+        final IRI datatype = VALUE_FACTORY.createIRI("http://www.bigdata.com");
+        final IRI dt1 = VALUE_FACTORY.createIRI("http://www.bigdata.com/mock-datatype-1");
+        final IRI dt2 = VALUE_FACTORY.createIRI("http://www.bigdata.com/mock-datatype-2");
 
-        final IV namespaceIV = newTermId(VTE.URI);
-        final IV datatypeIV = newTermId(VTE.URI);
-        final IV datatypeIV2 = newTermId(VTE.URI);
+        final IV namespaceIV = newTermId(VTE.IRI);
+        final IV datatypeIV = newTermId(VTE.IRI);
+        final IV datatypeIV2 = newTermId(VTE.IRI);
 
-        final IV colorIV = newTermId(VTE.URI);// ColorsEnumExtension.COLOR;
-        final IV xsdStringIV = newTermId(VTE.URI);// XSD.STRING;
-        final IV xsdDateTimeIV = newTermId(VTE.URI);// XSD.DATETIME;
+        final IV colorIV = newTermId(VTE.IRI);// ColorsEnumExtension.COLOR;
+        final IV xsdStringIV = newTermId(VTE.IRI);// XSD.STRING;
+        final IV xsdDateTimeIV = newTermId(VTE.IRI);// XSD.DATETIME;
 
         final IDatatypeURIResolver resolver = new IDatatypeURIResolver() {
-            public BigdataURI resolve(final URI uri) {
-                final BigdataURI buri = vf.createURI(uri.stringValue());
+            public BigdataIRI resolve(final IRI uri) {
+                final BigdataIRI buri = vf.createURI(uri.stringValue());
                 if (ColorsEnumExtension.COLOR.equals(uri)) {
                     buri.setIV(colorIV);
                 } else if (XSD.STRING.equals(uri)) {
@@ -137,27 +140,27 @@ public BigdataURI resolve(final URI uri) {
                 } else if (XSD.DATETIME.equals(uri)) {
                     buri.setIV(xsdDateTimeIV);
                 } else if (XSD.DATE.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.TIME.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.GDAY.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.GMONTH.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.GMONTHDAY.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.GYEAR.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.GYEARMONTH.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.POSITIVE_INTEGER.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.NEGATIVE_INTEGER.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.NON_POSITIVE_INTEGER.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else if (XSD.NON_NEGATIVE_INTEGER.equals(uri)) {
-                    buri.setIV(newTermId(VTE.URI));
+                    buri.setIV(newTermId(VTE.IRI));
                 } else
                     throw new UnsupportedOperationException();
                 return buri;
@@ -204,28 +207,28 @@ public BigdataURI resolve(final URI uri) {
                 /*
                  * URIs
                  */
-                ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
-                ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/")));
-                ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/foo")));
-                ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com:80/foo")));
-                ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
+                ivs.add(new FullyInlineURIIV(VALUE_FACTORY.createIRI("http://www.bigdata.com")));
+                ivs.add(new FullyInlineURIIV(VALUE_FACTORY.createIRI("http://www.bigdata.com/")));
+                ivs.add(new FullyInlineURIIV(VALUE_FACTORY.createIRI("http://www.bigdata.com/foo")));
+                ivs.add(new FullyInlineURIIV(VALUE_FACTORY.createIRI("http://www.bigdata.com:80/foo")));
+                ivs.add(new FullyInlineURIIV(VALUE_FACTORY.createIRI("http://www.bigdata.com")));
                 if (fullyInlineUnicode) {
-                    ivs.add(new FullyInlineURIIV(RDF.TYPE));
-                    ivs.add(new FullyInlineURIIV(RDF.SUBJECT));
-                    ivs.add(new FullyInlineURIIV(RDF.BAG));
-                    ivs.add(new FullyInlineURIIV(RDF.OBJECT));
-                    ivs.add(new URIExtensionIV(
+                    ivs.add(new FullyInlineURIIV(RDF.TYPE));
+                    ivs.add(new FullyInlineURIIV(RDF.SUBJECT));
+                    ivs.add(new FullyInlineURIIV(RDF.BAG));
+                    ivs.add(new FullyInlineURIIV(RDF.OBJECT));
+                    ivs.add(new URIExtensionIV(
                             new FullyInlineTypedLiteralIV(
                                     "http://www.example.com/"),
-                            new VocabURIByteIV((byte) 1)));
-                    ivs.add(new URIExtensionIV(
+                            new VocabURIByteIV((byte) 1)));
+                    ivs.add(new URIExtensionIV(
                             new FullyInlineTypedLiteralIV(
                                     "http://www.example.com/foo"),
-                            new VocabURIByteIV((byte) 1)));
-                    ivs.add(new URIExtensionIV(
+                            new VocabURIByteIV((byte) 1)));
+                    ivs.add(new URIExtensionIV(
                             new FullyInlineTypedLiteralIV(
                                     "http://www.example.com/foobar"),
-                            new VocabURIByteIV((byte) 1)));
+                            new VocabURIByteIV((byte) 1)));
                     }
 
                 /*
@@ -491,27 +494,27 @@ public BigdataURI resolve(final URI uri) {
                 ivs.add(new XSDIntegerIV(new BigInteger("-151")));//
 
                 // byte vocabulary IVs.
-                ivs.add(new VocabURIByteIV((byte) Byte.MIN_VALUE));
-                ivs.add(new VocabURIByteIV((byte) -1));
-                ivs.add(new VocabURIByteIV((byte) 0));
-                ivs.add(new VocabURIByteIV((byte) 1));
-                ivs.add(new VocabURIByteIV((byte) Byte.MAX_VALUE));
+                ivs.add(new VocabURIByteIV((byte) Byte.MIN_VALUE));
+                ivs.add(new VocabURIByteIV((byte) -1));
+                ivs.add(new VocabURIByteIV((byte) 0));
+                ivs.add(new VocabURIByteIV((byte) 1));
+                ivs.add(new VocabURIByteIV((byte) Byte.MAX_VALUE));
 
                 // short vocabulary IVs.
-                ivs.add(new VocabURIShortIV((short) Short.MIN_VALUE));
-                ivs.add(new VocabURIShortIV((short) -1));
-                ivs.add(new VocabURIShortIV((short) 0));
-                ivs.add(new VocabURIShortIV((short) 1));
-                ivs.add(new VocabURIShortIV((short) Short.MAX_VALUE));
+                ivs.add(new VocabURIShortIV((short) Short.MIN_VALUE));
+                ivs.add(new VocabURIShortIV((short) -1));
+                ivs.add(new VocabURIShortIV((short) 0));
+                ivs.add(new VocabURIShortIV((short) 1));
+                ivs.add(new VocabURIShortIV((short) Short.MAX_VALUE));
 
                 // SIDs
                 {
                     
-                    final IV s1 = newTermId(VTE.URI);
-                    final IV s2 = newTermId(VTE.URI);
-                    final IV p1 = newTermId(VTE.URI);
-                    final IV p2 = newTermId(VTE.URI);
-                    final IV o1 = newTermId(VTE.URI);
+                    final IV s1 = newTermId(VTE.IRI);
+                    final IV s2 = newTermId(VTE.IRI);
+                    final IV p1 = newTermId(VTE.IRI);
+                    final IV p2 = newTermId(VTE.IRI);
+                    final IV o1 = newTermId(VTE.IRI);
                     final IV o2 = newTermId(VTE.BNODE);
                     final IV o3 = newTermId(VTE.LITERAL);
 
@@ -625,19 +628,19 @@ public BigdataURI resolve(final URI uri) {
 
                 // URIs
                 if (fullyInlineUnicode) {
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("bar"),
                             namespaceIV));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("baz"),
                             namespaceIV));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("123"),
                             namespaceIV));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("23"),
                             namespaceIV));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("3"),
                             namespaceIV));
                 }
@@ -715,53 +718,53 @@ public BigdataURI resolve(final URI uri) {
                 }
 
                 if(fullyInlineUnicode){
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("bar"),// localName
-                            new VocabURIShortIV((short) 1) // namespace
+                            new VocabURIShortIV((short) 1) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("baz"),// localName
-                            new VocabURIShortIV((short) 1) // namespace
+                            new VocabURIShortIV((short) 1) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("bar"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("baz"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("123"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("123"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("23"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("23"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("3"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
-                    ivs.add(new PartlyInlineURIIV(
+                    ivs.add(new PartlyInlineURIIV(
                             new FullyInlineTypedLiteralIV("3"),// localName
-                            new VocabURIShortIV((short) 2) // namespace
+                            new VocabURIShortIV((short) 2) // namespace
                     ));
                 }
 
                 if (fullyInlineUnicode) {
 
-                    final IV datatypeIVa = new VocabURIShortIV(
+                    final IV datatypeIVa = new VocabURIShortIV(
                             (short) 1);
-                    final IV datatypeIVa2 = new VocabURIShortIV(
+                    final IV datatypeIVa2 = new VocabURIShortIV(
                             (short) 2);
                     ivs.add(new PartlyInlineTypedLiteralIV(
                             new FullyInlineTypedLiteralIV("bar"),
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ColorsEnumExtension.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ColorsEnumExtension.java
index dc52888513..7541972040 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ColorsEnumExtension.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ColorsEnumExtension.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,15 +27,15 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV;
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.internal.impl.literal.XSDNumericIV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.BD;
@@ -51,7 +51,7 @@ public class ColorsEnumExtension implements IExtension getDatatypes() {
+    public Set getDatatypes() {
         
-        final Set datatypes = new LinkedHashSet();
+        final Set datatypes = new LinkedHashSet();
         datatypes.add(color);
         return datatypes;
         
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/EpochExtension.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/EpochExtension.java
index 0ac3879e90..6eb66f70ce 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/EpochExtension.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/EpochExtension.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,16 +27,16 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.datatypes.XMLDatatypeUtil;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV;
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.internal.impl.literal.XSDNumericIV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.BD;
@@ -53,7 +53,7 @@ public class EpochExtension implements IExtension {
      */
     public transient static final URI EPOCH = new URIImpl(BD.NAMESPACE + "Epoch");
     
-    private final BigdataURI epoch;
+    private final BigdataIRI epoch;
     
     public EpochExtension(final IDatatypeURIResolver resolver) {
 
@@ -61,9 +61,9 @@ public EpochExtension(final IDatatypeURIResolver resolver) {
         
     }
         
-    public Set getDatatypes() {
+    public Set getDatatypes() {
         
-        final Set datatypes = new LinkedHashSet();
+        final Set datatypes = new LinkedHashSet();
         datatypes.add(epoch);
         return datatypes;
         
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/HashCollisionUtility.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/HashCollisionUtility.java
index 71b167f0ba..0f3003bb1d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/HashCollisionUtility.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/HashCollisionUtility.java
@@ -37,18 +37,18 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 import com.bigdata.Banner;
 import com.bigdata.btree.BTree;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ParserSpeedTest.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ParserSpeedTest.java
index c9cd5f751b..5738d89b43 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ParserSpeedTest.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/ParserSpeedTest.java
@@ -15,16 +15,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 import com.bigdata.Banner;
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestBlobIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestBlobIV.java
index 423f0ae597..2356ec224c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestBlobIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestBlobIV.java
@@ -33,7 +33,7 @@
 import com.bigdata.btree.keys.IKeyBuilder;
 import com.bigdata.rdf.internal.impl.BlobIV;
 import com.bigdata.rdf.lexicon.BlobsIndexHelper;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.util.BytesUtil;
 
 /**
@@ -64,7 +64,7 @@ protected void tearDown() throws Exception {
 
     public void test_BlobIV_isExtensionIV() {
 
-        final BlobIV iv = new BlobIV(VTE.URI,
+        final BlobIV iv = new BlobIV(VTE.URI,
                 12/* hash */, (short) 50/* counter */);
 
         assertEquals(VTE.URI, iv.getVTE());
@@ -86,7 +86,7 @@ private void doBlobIVTest(final VTE vte, final int hashCode,
 
 		final IKeyBuilder keyBuilder = helper.newKeyBuilder();
 
-		final BlobIV iv = new BlobIV(vte, hashCode,
+		final BlobIV iv = new BlobIV(vte, hashCode,
 				(short) counter);
 
 		assertEquals(BlobIV.toFlags(vte), iv.flags());
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeGeoSpatialLiteralIVs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeGeoSpatialLiteralIVs.java
index dad1846228..8921de5a86 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeGeoSpatialLiteralIVs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeGeoSpatialLiteralIVs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,15 +31,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.internal.impl.extensions.GeoSpatialLiteralExtension;
 import com.bigdata.rdf.internal.impl.extensions.InvalidGeoSpatialDatatypeConfigurationError;
 import com.bigdata.rdf.internal.impl.extensions.InvalidGeoSpatialLiteralError;
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -878,8 +878,8 @@ protected GeoSpatialLiteralExtension getGSLiteralExtension(
       return 
          new GeoSpatialLiteralExtension(
             new IDatatypeURIResolver() {
-               public BigdataURI resolve(URI uri) {
-                  final BigdataURI buri = vf.createURI(uri.stringValue());
+               public BigdataIRI resolve(URI uri) {
+                  final BigdataIRI buri = vf.createURI(uri.stringValue());
                   buri.setIV(newTermId(VTE.URI));
                   return buri;
                }
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
index d4ead902d6..e4eebe71ff 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
@@ -37,10 +37,10 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.internal.ColorsEnumExtension.Color;
 import com.bigdata.rdf.internal.impl.AbstractIV;
@@ -60,7 +60,7 @@
 import com.bigdata.rdf.lexicon.LexiconRelation;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -465,8 +465,8 @@ public void test_encodeDecodeEpoch() {
         
         final EpochExtension ext = 
             new EpochExtension(new IDatatypeURIResolver() {
-            public BigdataURI resolve(final URI uri) {
-                final BigdataURI buri = vf.createURI(uri.stringValue());
+            public BigdataIRI resolve(final URI uri) {
+                final BigdataIRI buri = vf.createURI(uri.stringValue());
                 buri.setIV(newTermId(VTE.URI));
                 return buri;
             }
@@ -508,8 +508,8 @@ public void test_encodeDecodeColor() {
         
         final ColorsEnumExtension ext = 
             new ColorsEnumExtension(new IDatatypeURIResolver() {
-            public BigdataURI resolve(URI uri) {
-                final BigdataURI buri = vf.createURI(uri.stringValue());
+            public BigdataIRI resolve(URI uri) {
+                final BigdataIRI buri = vf.createURI(uri.stringValue());
                 buri.setIV(newTermId(VTE.URI));
                 return buri;
             }
@@ -543,8 +543,8 @@ public void test_encodeDecodeDateTime() throws Exception {
 
         final DateTimeExtension ext = 
             new DateTimeExtension(new IDatatypeURIResolver() {
-                public BigdataURI resolve(URI uri) {
-                    final BigdataURI buri = vf.createURI(uri.stringValue());
+                public BigdataIRI resolve(URI uri) {
+                    final BigdataIRI buri = vf.createURI(uri.stringValue());
                     buri.setIV(newTermId(VTE.URI));
                     return buri;
                 }
@@ -612,8 +612,8 @@ public void test_dateTime_preservesMillis()
 
         final DateTimeExtension ext = new DateTimeExtension(
                 new IDatatypeURIResolver() {
-                    public BigdataURI resolve(URI uri) {
-                        final BigdataURI buri = vf.createURI(uri.stringValue());
+                    public BigdataIRI resolve(URI uri) {
+                        final BigdataIRI buri = vf.createURI(uri.stringValue());
                         buri.setIV(newTermId(VTE.URI));
                         return buri;
                     }
@@ -668,8 +668,8 @@ public void test_encodeDecodeDerivedNumerics() throws Exception {
         
         final DerivedNumericsExtension ext = 
             new DerivedNumericsExtension(new IDatatypeURIResolver() {
-                public BigdataURI resolve(URI uri) {
-                    final BigdataURI buri = vf.createURI(uri.stringValue());
+                public BigdataIRI resolve(URI uri) {
+                    final BigdataIRI buri = vf.createURI(uri.stringValue());
                     buri.setIV(newTermId(VTE.URI));
                     return buri;
                 }
@@ -725,8 +725,8 @@ public void test_encodeDecodeGeoSpatialLiterals01() throws Exception {
         final GeoSpatialDatatypeConfiguration datatypeConfig = conf.getDatatypeConfigs().get(0);
         final GeoSpatialLiteralExtension ext = 
             new GeoSpatialLiteralExtension(new IDatatypeURIResolver() {
-                public BigdataURI resolve(URI uri) {
-                    final BigdataURI buri = vf.createURI(uri.stringValue());
+                public BigdataIRI resolve(URI uri) {
+                    final BigdataIRI buri = vf.createURI(uri.stringValue());
                     buri.setIV(newTermId(VTE.URI));
                     return buri;
                 }
@@ -782,8 +782,8 @@ public void test_encodeDecodeGeoSpatialLiterals02() throws Exception {
         final GeoSpatialDatatypeConfiguration datatypeConfig = conf.getDatatypeConfigs().get(0);
         final GeoSpatialLiteralExtension ext = 
             new GeoSpatialLiteralExtension(new IDatatypeURIResolver() {
-                public BigdataURI resolve(URI uri) {
-                    final BigdataURI buri = vf.createURI(uri.stringValue());
+                public BigdataIRI resolve(URI uri) {
+                    final BigdataIRI buri = vf.createURI(uri.stringValue());
                     buri.setIV(newTermId(VTE.URI));
                     return buri;
                 }
@@ -897,11 +897,11 @@ public void test_encodeDecode_sids() {
     public void test_encodeDecode_URIByteIV() {
 
         final IV[] e = {//
-                new VocabURIByteIV((byte) Byte.MIN_VALUE),//
-                new VocabURIByteIV((byte) -1),//
-                new VocabURIByteIV((byte) 0),//
-                new VocabURIByteIV((byte) 1),//
-                new VocabURIByteIV((byte) Byte.MAX_VALUE),//
+                new VocabURIByteIV((byte) Byte.MIN_VALUE),//
+                new VocabURIByteIV((byte) -1),//
+                new VocabURIByteIV((byte) 0),//
+                new VocabURIByteIV((byte) 1),//
+                new VocabURIByteIV((byte) Byte.MAX_VALUE),//
         };
 
         doEncodeDecodeTest(e);
@@ -921,11 +921,11 @@ public void test_encodeDecode_URIByteIV() {
     public void test_encodeDecode_URIShortIV() {
 
         final IV[] e = {//
-                new VocabURIShortIV((short) Short.MIN_VALUE),//
-                new VocabURIShortIV((short) -1),//
-                new VocabURIShortIV((short) 0),//
-                new VocabURIShortIV((short) 1),//
-                new VocabURIShortIV((short) Short.MAX_VALUE),//
+                new VocabURIShortIV((short) Short.MIN_VALUE),//
+                new VocabURIShortIV((short) -1),//
+                new VocabURIShortIV((short) 0),//
+                new VocabURIShortIV((short) 1),//
+                new VocabURIShortIV((short) Short.MAX_VALUE),//
         };
 
         doEncodeDecodeTest(e);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodePackedLongIVs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodePackedLongIVs.java
index 341423630f..46879e9105 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodePackedLongIVs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodePackedLongIVs.java
@@ -24,14 +24,14 @@
 
 import java.util.UUID;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 
 import com.bigdata.rdf.internal.impl.extensions.CompressedTimestampExtension;
 import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV;
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.internal.impl.literal.PackedLongIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -128,8 +128,8 @@ public void testRoundTripAndCompareCompressedTimestamp() throws Exception {
             new CompressedTimestampExtension(
                 new IDatatypeURIResolver() {
                       @Override
-                      public BigdataURI resolve(final URI uri) {
-                         final BigdataURI buri = vf.createURI(uri.stringValue());
+                      public BigdataIRI resolve(final URI uri) {
+                         final BigdataIRI buri = vf.createURI(uri.stringValue());
                          buri.setIV(newTermId(VTE.URI));
                          return buri;
                       }
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeUnicodeIVs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeUnicodeIVs.java
index ac87b66cfb..3b22781b84 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeUnicodeIVs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeUnicodeIVs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,11 +27,11 @@
 
 package com.bigdata.rdf.internal;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.internal.impl.bnode.FullyInlineUnicodeBNodeIV;
 import com.bigdata.rdf.internal.impl.extensions.XSDStringExtension;
@@ -44,7 +44,7 @@
 import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -87,8 +87,8 @@ public void test_encodeDecode_extension_xsdString() {
         final XSDStringExtension ext = 
             new XSDStringExtension(
                 new IDatatypeURIResolver() {
-                    public BigdataURI resolve(final URI uri) {
-                        final BigdataURI buri = vf.createURI(uri.stringValue());
+                    public BigdataIRI resolve(final URI uri) {
+                        final BigdataIRI buri = vf.createURI(uri.stringValue());
                         buri.setIV(newTermId(VTE.URI));
                         return buri;
                     }
@@ -124,11 +124,11 @@ public BigdataURI resolve(final URI uri) {
     public void test_encodeDecode_Inline_URI() {
         
         final IV[] e = {//
-                new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")),//
-                new FullyInlineURIIV(RDF.TYPE),//
-                new FullyInlineURIIV(RDF.SUBJECT),//
-                new FullyInlineURIIV(RDF.BAG),//
-                new FullyInlineURIIV(RDF.OBJECT),//
+                new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")),//
+                new FullyInlineURIIV(RDF.TYPE),//
+                new FullyInlineURIIV(RDF.SUBJECT),//
+                new FullyInlineURIIV(RDF.BAG),//
+                new FullyInlineURIIV(RDF.OBJECT),//
         };
 
         doEncodeDecodeTest(e);
@@ -146,18 +146,18 @@ public void test_encodeDecode_Inline_URI() {
     public void test_encodeDecode_Inline_Extension_URI() {
 
         final IV[] e = {//
-                new URIExtensionIV(
+                new URIExtensionIV(
                         new FullyInlineTypedLiteralIV(
                                 "http://www.example.com/"),
-                        new VocabURIByteIV((byte) 1)),//
-                new URIExtensionIV(
+                        new VocabURIByteIV((byte) 1)),//
+                new URIExtensionIV(
                         new FullyInlineTypedLiteralIV(
                                 "http://www.example.com/foo"),
-                        new VocabURIByteIV((byte) 1)),//
-                new URIExtensionIV(
+                        new VocabURIByteIV((byte) 1)),//
+                new URIExtensionIV(
                         new FullyInlineTypedLiteralIV(
                                 "http://www.example.com/foobar"),
-                        new VocabURIByteIV((byte) 1)),//
+                        new VocabURIByteIV((byte) 1)),//
         };
 
         doEncodeDecodeTest(e);
@@ -448,15 +448,15 @@ public void test_encodeDecode_NonInline_URI_with_NamespaceIV() {
         final IV namespaceIV = newTermId(VTE.URI);
         
         final IV[] e = {//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("bar"), namespaceIV),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("baz"), namespaceIV),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("123"), namespaceIV),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("23"), namespaceIV),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("3"), namespaceIV),//
         };
 
@@ -525,45 +525,45 @@ public void test_encodeDecode_NonInline_Literal_with_DatatypeIV() {
     public void test_encodeDecode_URINamespaceIV() {
 
         final IV[] e = {//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("bar"),// localName
-                        new VocabURIShortIV((short) 1) // namespace
+                        new VocabURIShortIV((short) 1) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("baz"),// localName
-                        new VocabURIShortIV((short) 1) // namespace
+                        new VocabURIShortIV((short) 1) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("bar"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("baz"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("123"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("123"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("23"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("23"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("3"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
-                new PartlyInlineURIIV(
+                new PartlyInlineURIIV(
                         new FullyInlineTypedLiteralIV("3"),// localName
-                        new VocabURIShortIV((short) 2) // namespace
+                        new VocabURIShortIV((short) 2) // namespace
                 ),//
         };
 
@@ -580,8 +580,8 @@ public void test_encodeDecode_URINamespaceIV() {
      */
     public void test_encodeDecode_LiteralNamespaceIV() {
 
-        final IV datatypeIV = new VocabURIShortIV((short) 1);
-        final IV datatypeIV2 = new VocabURIShortIV((short) 2);
+        final IV datatypeIV = new VocabURIShortIV((short) 1);
+        final IV datatypeIV2 = new VocabURIShortIV((short) 2);
 
         final IV[] e = {//
                 new PartlyInlineTypedLiteralIV(
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeXSDDateIVs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeXSDDateIVs.java
index 85e5655010..6e9452102d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeXSDDateIVs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeXSDDateIVs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,13 +29,13 @@
 
 import java.util.TimeZone;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 
 import com.bigdata.rdf.internal.impl.extensions.DateTimeExtension;
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.internal.impl.literal.XSDIntegerIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -357,8 +357,8 @@ protected DateTimeExtension getDateTimeExtensionGMT(final BigdataV
        return 
           new DateTimeExtension(
              new IDatatypeURIResolver() {
-                public BigdataURI resolve(URI uri) {
-                   final BigdataURI buri = vf.createURI(uri.stringValue());
+                public BigdataIRI resolve(URI uri) {
+                   final BigdataIRI buri = vf.createURI(uri.stringValue());
                    buri.setIV(newTermId(VTE.URI));
                    return buri;
                 }
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineTypedLiteralIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineTypedLiteralIV.java
index fc5ee7329e..2ee7e1436f 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineTypedLiteralIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineTypedLiteralIV.java
@@ -5,8 +5,8 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.btree.keys.IKeyBuilder;
 import com.bigdata.rdf.internal.impl.literal.FullyInlineTypedLiteralIV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineURIIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineURIIV.java
index d6db70c463..dc5cd09162 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineURIIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestFullyInlineURIIV.java
@@ -5,12 +5,12 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.btree.keys.IKeyBuilder;
 import com.bigdata.rdf.internal.impl.uri.FullyInlineURIIV;
 import com.bigdata.rdf.lexicon.BlobsIndexHelper;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 
 /**
  * Test suite for {@link FullyInlineURIIV}.
@@ -26,14 +26,14 @@ public TestFullyInlineURIIV(String name) {
 
 	public void test_InlineURIIV() {
 
-        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
-        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/")));
-        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/foo")));
-        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com:80/foo")));
+        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
+        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/")));
+        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/foo")));
+        doTest(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com:80/foo")));
 
 	}
 
-	private void doTest(final FullyInlineURIIV iv) {
+	private void doTest(final FullyInlineURIIV iv) {
 
 		assertEquals(VTE.URI, iv.getVTE());
 		
@@ -64,10 +64,10 @@ public void test_encodeDecode_comparator() {
         final List> ivs = new LinkedList>();
         {
 
-            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
-            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/")));
-            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/foo")));
-            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com:80/foo")));
+            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com")));
+            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/")));
+            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com/foo")));
+            ivs.add(new FullyInlineURIIV(new URIImpl("http://www.bigdata.com:80/foo")));
 
         }
         
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestMultiInlineURIHandlersSingleNamespace.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestMultiInlineURIHandlersSingleNamespace.java
index 9d9f8d40fe..eda91f96d0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestMultiInlineURIHandlersSingleNamespace.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestMultiInlineURIHandlersSingleNamespace.java
@@ -7,7 +7,7 @@
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.rio.StatementBuffer;
@@ -105,7 +105,7 @@ public void test_TestVocabularyInlineValues() {
 			final StatementBuffer sb = new StatementBuffer(
 					store, 4 /* capacity */);
 
-			BigdataURI pred = vf
+			BigdataIRI pred = vf
 					.createURI("http://blazegraph.com/Position#hasMarketValue");
 			BigdataValue obj = vf.createLiteral("100.00");
 
@@ -114,7 +114,7 @@ public void test_TestVocabularyInlineValues() {
 			// http://blazegraph.com/Data#Position_010072F0000038090100000000D56C9E_UnrealizedGain
 			// http://blazegraph.com/Data#Position_010072F0000038090100000000D56C9E_WashSale
 
-			final BigdataURI[] uris = new BigdataURI[] {
+			final BigdataIRI[] uris = new BigdataIRI[] {
 					vf.createURI("http://blazegraph.com/Data#Position_010072F0000038090100000000D56C9E_TaxCost"),
 					vf.createURI("http://blazegraph.com/Data#Position_010072F0000038090100000000D56C9E_UnrealizedGain"),
 					vf.createURI("http://blazegraph.com/Data#Position_010072F0000038090100000000D56C9E"),
@@ -139,7 +139,7 @@ public void test_TestVocabularyInlineValues() {
 
 			for (int i = 0; i < uris.length; i++) {
 
-				final BigdataURI uri = uris[i];
+				final BigdataIRI uri = uris[i];
 
 				if (log.isDebugEnabled()) {
 					log.debug("Checking " + uri.getNamespace() + " "
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestPackedLongIVs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestPackedLongIVs.java
index a33f54a0d0..e79afa18d9 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestPackedLongIVs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestPackedLongIVs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,7 +33,7 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 
 import com.bigdata.rdf.internal.constraints.MathBOp.MathOp;
 import com.bigdata.rdf.internal.constraints.MathUtility;
@@ -44,7 +44,7 @@
 import com.bigdata.rdf.internal.impl.literal.XSDDecimalIV;
 import com.bigdata.rdf.internal.impl.literal.XSDIntegerIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -81,8 +81,8 @@ public void testMath() {
             new CompressedTimestampExtension(
                 new IDatatypeURIResolver() {
                       @Override
-                      public BigdataURI resolve(final URI uri) {
-                         final BigdataURI buri = vf.createURI(uri.stringValue());
+                      public BigdataIRI resolve(final URI uri) {
+                         final BigdataIRI buri = vf.createURI(uri.stringValue());
                          buri.setIV(termIdFactory.newTermId(VTE.URI));
                          return buri;
                       }
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestTermIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestTermIV.java
index c1239a4407..575685d2de 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestTermIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestTermIV.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -36,7 +36,7 @@
 import com.bigdata.rdf.internal.impl.AbstractIV;
 import com.bigdata.rdf.internal.impl.TermId;
 import com.bigdata.rdf.lexicon.BlobsIndexHelper;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
 import com.bigdata.util.Bytes;
@@ -83,7 +83,7 @@ public void test_TermIV_isNullIV() {
 
     public void test_TermIV_isExtensionIV() {
 
-        final TermId iv = new TermId(VTE.URI,
+        final TermId iv = new TermId(VTE.URI,
                 12L);
 
         assertEquals(VTE.URI, iv.getVTE());
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestURIExtensionIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestURIExtensionIV.java
index 42fb809027..a6370f3cbd 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestURIExtensionIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestURIExtensionIV.java
@@ -8,16 +8,16 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.btree.keys.IKeyBuilder;
 import com.bigdata.rdf.internal.impl.literal.FullyInlineTypedLiteralIV;
 import com.bigdata.rdf.internal.impl.uri.URIExtensionIV;
 import com.bigdata.rdf.lexicon.BlobsIndexHelper;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.vocab.BaseVocabulary;
 import com.bigdata.rdf.vocab.VocabularyDecl;
 
@@ -109,7 +109,7 @@ protected void addValues() {
         
     }
 
-    private URIExtensionIV newFixture(final URI uri) {
+    private URIExtensionIV newFixture(final URI uri) {
 
         final String namespace = uri.getNamespace();
 
@@ -126,7 +126,7 @@ private URIExtensionIV newFixture(final URI uri) {
         final FullyInlineTypedLiteralIV localNameIV = new FullyInlineTypedLiteralIV(
                 uri.getLocalName());
 
-        final URIExtensionIV iv = new URIExtensionIV(
+        final URIExtensionIV iv = new URIExtensionIV(
                 localNameIV, namespaceIV);
         
         return iv;
@@ -148,7 +148,7 @@ public void test_InlineURIIV() {
 
 	private void doTest(final URI uri) {
 
-        final URIExtensionIV iv = newFixture(uri);
+        final URIExtensionIV iv = newFixture(uri);
         
 		assertEquals(VTE.URI, iv.getVTE());
 		
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestVocabURIByteIV.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestVocabURIByteIV.java
index 8037fd94e6..e39db9bcda 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestVocabURIByteIV.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/TestVocabURIByteIV.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,7 +29,7 @@
 
 import com.bigdata.btree.keys.KeyBuilder;
 import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.vocab.Vocabulary;
 import com.bigdata.util.BytesUtil;
 
@@ -65,9 +65,9 @@ public void test_encodeDecode_URIByteIV() {
         final IV[] e = {//
 //                new VocabURIByteIV((byte) Byte.MIN_VALUE),//
 //                new VocabURIByteIV((byte) -1),//
-                new VocabURIByteIV((byte) 0),//
-                new VocabURIByteIV((byte) KeyBuilder.encodeByte(14)),//
-                new VocabURIByteIV((byte) 14),//
+                new VocabURIByteIV((byte) 0),//
+                new VocabURIByteIV((byte) KeyBuilder.encodeByte(14)),//
+                new VocabURIByteIV((byte) 14),//
 //                new VocabURIByteIV((byte) Byte.MAX_VALUE),//
         };
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/encoder/AbstractBindingSetEncoderTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/encoder/AbstractBindingSetEncoderTestCase.java
index 8c8e591019..00cae9ad14 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/encoder/AbstractBindingSetEncoderTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/internal/encoder/AbstractBindingSetEncoderTestCase.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -37,7 +37,7 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
@@ -72,7 +72,7 @@
 import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV;
 import com.bigdata.rdf.internal.impl.uri.VocabURIShortIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -170,13 +170,13 @@ public AbstractBindingSetEncoderTestCase(String name) {
     protected XSDUnsignedShortIV unsignedShortIV;
     
     /** Extension IVs (require materialization) and the like */
-    protected FullyInlineURIIV fullyInlineUriIV;
+    protected FullyInlineURIIV fullyInlineUriIV;
     protected LiteralExtensionIV literalExtensionIV;
     protected URIExtensionIV uriExtensionIV;
     
     /** Other IVs requiring materialization */
-    protected VocabURIByteIV vocabUriByteIV;
-    protected VocabURIShortIV vocabUriShortIV;
+    protected VocabURIByteIV vocabUriByteIV;
+    protected VocabURIShortIV vocabUriShortIV;
     
     
     /**
@@ -256,10 +256,10 @@ protected void setUp() throws Exception {
         
         // vocabUriByteIV and vocabUriShortIV both require materialization
         vocabUriByteIV = new VocabURIByteIV((byte)3);
-        vocabUriByteIV.setValue((BigdataURI) valueFactory.createURI("http://some.vocab.item1"));
+        vocabUriByteIV.setValue((BigdataIRI) valueFactory.createURI("http://some.vocab.item1"));
         
         vocabUriShortIV = new VocabURIShortIV((short)4);
-        vocabUriShortIV.setValue((BigdataURI) valueFactory.createURI("http://some.vocab.item2"));
+        vocabUriShortIV.setValue((BigdataIRI) valueFactory.createURI("http://some.vocab.item2"));
         
     }
 
@@ -436,7 +436,7 @@ public void test_encodeNonEmpty2() {
         expected.set(Var.var("x"), new Constant(
                 new XSDNumericIV(12)));
         expected.set(Var.var("y"), new Constant(
-                new FullyInlineURIIV(new URIImpl(
+                new FullyInlineURIIV(new URIImpl(
                         "http://www.bigdata.com"))));
 
         doEncodeDecodeTest(expected);
@@ -454,7 +454,7 @@ public void test_multipleSolutions() {
             expected.set(Var.var("x"), new Constant(
                     new XSDNumericIV(12)));
             expected.set(Var.var("y"), new Constant(
-                    new FullyInlineURIIV(new URIImpl(
+                    new FullyInlineURIIV(new URIImpl(
                             "http://www.bigdata.com"))));
 
             doEncodeDecodeTest(expected);
@@ -489,7 +489,7 @@ public void test_multipleSolutions2() {
             expected.set(Var.var("x"), new Constant(
                     new XSDNumericIV(99)));
             expected.set(Var.var("y"), new Constant(
-                    new FullyInlineURIIV(new URIImpl(
+                    new FullyInlineURIIV(new URIImpl(
                             "http://www.bigdata.com"))));
 
             doEncodeDecodeTest(expected);
@@ -523,7 +523,7 @@ public void test_multipleSolutions3() {
             expected.set(Var.var("x"), new Constant(
                     new XSDNumericIV(99)));
             expected.set(Var.var("y"), new Constant(
-                    new FullyInlineURIIV(new URIImpl(
+                    new FullyInlineURIIV(new URIImpl(
                             "http://www.bigdata.com"))));
 
             doEncodeDecodeTest(expected);
@@ -556,7 +556,7 @@ public void test_multipleSolutions4() {
             expected.set(Var.var("x"), new Constant(
                     new XSDNumericIV(99)));
             expected.set(Var.var("y"), new Constant(
-                    new FullyInlineURIIV(new URIImpl(
+                    new FullyInlineURIIV(new URIImpl(
                             "http://www.bigdata.com"))));
 
             doEncodeDecodeTest(expected);
@@ -583,7 +583,7 @@ public void test_multipleSolutions5() {
             expected.set(Var.var("x"), new Constant(
                     new XSDNumericIV(99)));
             expected.set(Var.var("y"), new Constant(
-                    new FullyInlineURIIV(new URIImpl(
+                    new FullyInlineURIIV(new URIImpl(
                             "http://www.bigdata.com"))));
 
             doEncodeDecodeTest(expected);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAccessPaths.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAccessPaths.java
index 93c9a2278a..94d81468c0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAccessPaths.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAccessPaths.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,7 +33,7 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IPredicate;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAddTerms.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAddTerms.java
index 6957a76191..e1061b8a99 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAddTerms.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestAddTerms.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -34,13 +34,13 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -278,13 +278,13 @@ public void test_duplicates_same_reference() {
             final BigdataValueFactory f = store.getValueFactory();
 
             // Add two instances of the same reference.
-            final BigdataURI type = f.asValue(RDF.TYPE);
+            final BigdataIRI type = f.asValue(RDF.TYPE);
             terms.add(type);
             terms.add(type);
             assertEquals(2,terms.size());
             
             // Add two instances of the same reference.
-            final BigdataURI largeURI = f.createURI(getVeryLargeURI());
+            final BigdataIRI largeURI = f.createURI(getVeryLargeURI());
             terms.add(largeURI);
             terms.add(largeURI);
             assertEquals(4,terms.size());
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsIndex.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsIndex.java
index a47a221894..1855e608fa 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsIndex.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsIndex.java
@@ -31,7 +31,7 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.btree.BTree;
 import com.bigdata.btree.IndexMetadata;
@@ -49,7 +49,7 @@
 import com.bigdata.rdf.lexicon.BlobsWriteTask.BlobsWriteProcResultHandler;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -90,7 +90,7 @@ public void test_generateSortKeys() {
 		final BigdataValue[] values;
 		{
 		
-			final BigdataURI uri1 = vf
+			final BigdataIRI uri1 = vf
 					.createURI("http://www.bigdata.com/testTerm");
 
 			final BigdataLiteral lit1 = vf.createLiteral("bigdata");
@@ -369,7 +369,7 @@ private void doTermsIndexAddLookupTest(final boolean toldBNodes) {
 			final BigdataValue[] values;
 			{
 			
-				final BigdataURI uri1 = vf
+				final BigdataIRI uri1 = vf
 						.createURI("http://www.bigdata.com/testTerm");
 
                 // Note: These three literals wind up with the same hash code.
@@ -972,7 +972,7 @@ public void test_TermsTupleSerializer() {
             final BigdataValue[] values;
             {
 
-                final BigdataURI uri1 = vf
+                final BigdataIRI uri1 = vf
                         .createURI("http://www.bigdata.com/testTerm");
 
                 final BigdataLiteral lit1 = vf.createLiteral("bigdata");
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsWriteTask.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsWriteTask.java
index 9ff16136c0..fa6b9274c2 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsWriteTask.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestBlobsWriteTask.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,11 +29,11 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.btree.BTree;
 import com.bigdata.btree.IIndex;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestCompletionScan.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestCompletionScan.java
index a28a5ef97f..0c1212fe05 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestCompletionScan.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestCompletionScan.java
@@ -50,8 +50,8 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import org.openrdf.model.Literal;
-import org.openrdf.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
@@ -60,7 +60,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 
 /**
  * Unit tests for
- * {@link LexiconRelation#prefixScan(org.openrdf.model.Literal[])}.
+ * {@link LexiconRelation#prefixScan(org.eclipse.rdf4j.model.Literal[])}.
  * 
  * @author Bryan Thompson
  */
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestFullTextIndex.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestFullTextIndex.java
index a7acb7bb4b..696a70e767 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestFullTextIndex.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestFullTextIndex.java
@@ -37,14 +37,14 @@
 
 import junit.framework.AssertionFailedError;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.util.iterators.Iterators;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.util.iterators.Iterators;
 
 import com.bigdata.btree.ChunkedLocalRangeIterator;
 import com.bigdata.btree.IIndex;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestIVCache.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestIVCache.java
index 02f71223f1..a195cb6bca 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestIVCache.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestIVCache.java
@@ -18,7 +18,7 @@
 import com.bigdata.rdf.internal.impl.literal.XSDNumericIV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -52,7 +52,7 @@ public void test_getValue() {
 
     		final BigdataValueFactory f = lex.getValueFactory();
     		
-    		final BigdataURI uri = f.createURI("http://www.bigdata.com");
+    		final BigdataIRI uri = f.createURI("http://www.bigdata.com");
     		final BigdataBNode bnd = f.createBNode();//"12");
     		final BigdataLiteral lit = f.createLiteral("bigdata");
     		
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
index d92a88a8af..c7c2a3735a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
@@ -1,6 +1,6 @@
 /**
 
- Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+ Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
  Contact:
  SYSTAP, LLC DBA Blazegraph
@@ -38,7 +38,7 @@
 import com.bigdata.rdf.internal.IVUtility;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
 import com.bigdata.util.BytesUtil;
 
@@ -72,13 +72,13 @@ public void test_id2key() {
 
         final TermId id1, id2, id3;
         if (IVUtility.PACK_TIDS) {
-            id1 = new TermId(VTE.URI, 0);
-            id2 = new TermId(VTE.URI, 1);
-            id3 = new TermId(VTE.URI, 2);
+            id1 = new TermId(VTE.URI, 0);
+            id2 = new TermId(VTE.URI, 1);
+            id3 = new TermId(VTE.URI, 2);
         } else {
-            id1 = new TermId(VTE.URI, -1);
-            id2 = new TermId(VTE.URI, 0);
-            id3 = new TermId(VTE.URI, 1);
+            id1 = new TermId(VTE.URI, -1);
+            id2 = new TermId(VTE.URI, 0);
+            id3 = new TermId(VTE.URI, 1);
         }
 
         final byte[] k1 = fixture.id2key(id1);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestInlining.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestInlining.java
index 9918b796e0..3b799cdf0d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestInlining.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestInlining.java
@@ -41,7 +41,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.ColorsEnumExtension;
@@ -53,7 +53,7 @@
 import com.bigdata.rdf.internal.impl.literal.LiteralExtensionIV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -474,7 +474,7 @@ public void test_epoch() {
             final BigdataLiteral l1 = f.createLiteral("1", EpochExtension.EPOCH);
             final BigdataLiteral l2 = f.createLiteral(String.valueOf(System.currentTimeMillis()), EpochExtension.EPOCH);
 //            final BigdataLiteral l3 = f.createLiteral("-100", EpochExtension.EPOCH);
-            final BigdataURI datatype = f.createURI(EpochExtension.EPOCH.stringValue());
+            final BigdataIRI datatype = f.createURI(EpochExtension.EPOCH.stringValue());
 
             terms.add(l1);
             terms.add(l2);
@@ -623,7 +623,7 @@ public void test_colorsEnum() {
             final BigdataLiteral l3 = f.createLiteral("Yellow", ColorsEnumExtension.COLOR);
             final BigdataLiteral l4 = f.createLiteral("Dog", ColorsEnumExtension.COLOR);
             final BigdataLiteral l5 = f.createLiteral("yellow", ColorsEnumExtension.COLOR);
-            final BigdataURI datatype = f.createURI(ColorsEnumExtension.COLOR.stringValue());
+            final BigdataIRI datatype = f.createURI(ColorsEnumExtension.COLOR.stringValue());
 
             terms.add(l1);
             terms.add(l2);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexAccessPatternEnum.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexAccessPatternEnum.java
index eb8ef0b813..9875a86c1a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexAccessPatternEnum.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexAccessPatternEnum.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -34,7 +34,7 @@
 import com.bigdata.bop.IVariableOrConstant;
 import com.bigdata.bop.Var;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
 import com.bigdata.test.MockTermIdFactory;
@@ -83,7 +83,7 @@ public void test_ValueBound_pattern() {
         final BigdataValueFactory vf = BigdataValueFactoryImpl
                 .getInstance(getName());
 
-        final IConstant value = new Constant(vf
+        final IConstant value = new Constant(vf
                 .createURI("http://www.bigdata.com"));
 
         final IVariableOrConstant[] args = new IVariableOrConstant[] {
@@ -107,7 +107,7 @@ public void test_FullyBound_pattern() {
         final BigdataValueFactory vf = BigdataValueFactoryImpl
                 .getInstance(getName());
 
-        final IConstant value = new Constant(vf
+        final IConstant value = new Constant(vf
                 .createURI("http://www.bigdata.com"));
 
         final IVariableOrConstant[] args = new IVariableOrConstant[] {
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexiconKeyBuilder.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexiconKeyBuilder.java
index 054ccca71f..4f33ffacc2 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexiconKeyBuilder.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestLexiconKeyBuilder.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -32,14 +32,14 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.btree.keys.DefaultKeyBuilderFactory;
 import com.bigdata.btree.keys.IKeyBuilder;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestSubjectCentricFullTextIndex.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestSubjectCentricFullTextIndex.java
index df4a67ef19..8d148590e3 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestSubjectCentricFullTextIndex.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestSubjectCentricFullTextIndex.java
@@ -36,14 +36,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.lexicon.ITextIndexer.FullTextQuery;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.spo.TestSPOKeyOrder;
@@ -229,9 +229,9 @@ public void test_SingleSubject() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI s = f.createURI(BD.NAMESPACE+"s");
+            final BigdataIRI s = f.createURI(BD.NAMESPACE+"s");
             
-            final BigdataURI p = f.createURI(BD.NAMESPACE+"p");
+            final BigdataIRI p = f.createURI(BD.NAMESPACE+"p");
             
             final LiteralImpl largeLiteral = getLargeLiteral(store);
 
@@ -391,13 +391,13 @@ public void test_MultiSubject() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI s1 = f.createURI(BD.NAMESPACE+"s1");
+            final BigdataIRI s1 = f.createURI(BD.NAMESPACE+"s1");
             
-            final BigdataURI s2 = f.createURI(BD.NAMESPACE+"s2");
+            final BigdataIRI s2 = f.createURI(BD.NAMESPACE+"s2");
             
-            final BigdataURI s3 = f.createURI(BD.NAMESPACE+"s3");
+            final BigdataIRI s3 = f.createURI(BD.NAMESPACE+"s3");
             
-            final BigdataURI p = f.createURI(BD.NAMESPACE+"p");
+            final BigdataIRI p = f.createURI(BD.NAMESPACE+"p");
             
             final LiteralImpl largeLiteral = getLargeLiteral(store);
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestTermIVComparator.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestTermIVComparator.java
index a743973b8b..80fa49740f 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestTermIVComparator.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestTermIVComparator.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -36,7 +36,7 @@
 import com.bigdata.rdf.internal.TermIVComparator;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
@@ -66,11 +66,11 @@ public TestTermIVComparator(String name) {
 
     public void test_termIdComparator() {
 
-        final TermId lmin = new TermId(VTE.URI, Long.MIN_VALUE);
-        final TermId lm1 = new TermId(VTE.URI, -1L);
-        final TermId l0 = new TermId(VTE.URI, 0L);
-        final TermId lp1 = new TermId(VTE.URI, 1L);
-        final TermId lmax = new TermId(VTE.URI, Long.MAX_VALUE);
+        final TermId lmin = new TermId(VTE.URI, Long.MIN_VALUE);
+        final TermId lm1 = new TermId(VTE.URI, -1L);
+        final TermId l0 = new TermId(VTE.URI, 0L);
+        final TermId lp1 = new TermId(VTE.URI, 1L);
+        final TermId lmax = new TermId(VTE.URI, Long.MAX_VALUE);
 
         final BigdataValueFactory f = BigdataValueFactoryImpl
                 .getInstance(getName()/*namespace*/);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestVocabulary.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestVocabulary.java
index c31dfa2284..0f3c03a22a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestVocabulary.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/lexicon/TestVocabulary.java
@@ -29,11 +29,11 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.io.SerializerUtil;
 import com.bigdata.rdf.axioms.NoAxioms;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -101,9 +101,9 @@ public void test_NoVocabulary() {
             // Must be using the same namespace.
             assertTrue(vocab.getNamespace()==f.getNamespace());
             
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfProperty = f.asValue(RDF.PROPERTY);
-            final BigdataURI unknownURI = f.createURI("http://www.bigdata.com/unknown");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfProperty = f.asValue(RDF.PROPERTY);
+            final BigdataIRI unknownURI = f.createURI("http://www.bigdata.com/unknown");
             
             // resolve term ids.
             store.addTerms(new BigdataValue[] { rdfType, rdfProperty, unknownURI });
@@ -193,9 +193,9 @@ public void test_RdfsVocabulary() {
             // lookup/add some values.
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfProperty = f.asValue(RDF.PROPERTY);
-            final BigdataURI unknownURI = f.createURI("http://www.bigdata.com/unknown");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfProperty = f.asValue(RDF.PROPERTY);
+            final BigdataIRI unknownURI = f.createURI("http://www.bigdata.com/unknown");
             
             // resolve term ids.
             store.addTerms(new BigdataValue[] { rdfType, rdfProperty, unknownURI });
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestBigdataValueSerialization.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestBigdataValueSerialization.java
index e4f1c04ce0..b7a3a9dd1e 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestBigdataValueSerialization.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestBigdataValueSerialization.java
@@ -4,15 +4,15 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.io.SerializerUtil;
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestEquals.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestEquals.java
index 1cc43eb5a6..f0c1c65329 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestEquals.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestEquals.java
@@ -2,14 +2,14 @@
 
 import junit.framework.TestCase;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
@@ -39,13 +39,13 @@ public void test_equalsURI() {
 	
 	    final BigdataValueFactory vf2 = BigdataValueFactoryImpl.getInstance(getName()+"2");
 		
-	    final BigdataURI v1 = vf.createURI("http://www.bigdata.com");
+	    final BigdataIRI v1 = vf.createURI("http://www.bigdata.com");
 	    
-	    final BigdataURI v2 = vf.createURI("http://www.bigdata.com");
+	    final BigdataIRI v2 = vf.createURI("http://www.bigdata.com");
 	    
 	    final URI v3 = new URIImpl("http://www.bigdata.com");
 
-	    final BigdataURI v4 = vf2.createURI("http://www.bigdata.com");
+	    final BigdataIRI v4 = vf2.createURI("http://www.bigdata.com");
 
 	    assertTrue( v1 != v2 );
 	    
@@ -77,7 +77,7 @@ public void test_equalsURI() {
 	    assertTrue(v2.equals(v4));
 	    assertTrue(v4.equals(v2));
 
-	    v1.setIV(new TermId(VTE.URI, 1));
+	    v1.setIV(new TermId(VTE.URI, 1));
 
 	    assertTrue(v1.equals(v2));
 	    assertTrue(v2.equals(v1));
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestFactory.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestFactory.java
index d4b8ce898d..95c45e1e50 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestFactory.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/model/TestFactory.java
@@ -33,10 +33,10 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
@@ -98,9 +98,9 @@ public void test_create_literal_xsdInt() {
      */
     public void test_create_xsdInt_canonical() {
         
-		final BigdataURI v1 = vf.createURI(XSD.INT.stringValue());
+		final BigdataIRI v1 = vf.createURI(XSD.INT.stringValue());
 
-		final BigdataURI v2 = vf.createURI(XSD.INT.stringValue());
+		final BigdataIRI v2 = vf.createURI(XSD.INT.stringValue());
 
 		// verify the URI.
 		assertEquals(v1.stringValue(),XSD.INT.stringValue());
@@ -150,7 +150,7 @@ public void test_gregorian() throws DatatypeConfigurationException {
 
 	/**
 	 * Unit test verifies that a new {@link BigdataValue} instance is returned
-	 * when {@link BigdataValueFactory#asValue(org.openrdf.model.Value)} is
+	 * when {@link BigdataValueFactory#asValue(org.eclipse.rdf4j.model.Value)} is
 	 * invoked with a {@link BigdataValue} whose {@link IV} is a "dummmy" IV
 	 * (aka a "mock" IV). A "dummy" or "mock" {@link IV} is an {@link IV} which
 	 * stands in for a "null" and is used to hold the place for an RDF
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
index b32434a9a0..8116b96d38 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -46,7 +46,7 @@
 
 import junit.framework.AssertionFailedError;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.load.IStatementBufferFactory;
 import com.bigdata.rdf.model.BigdataStatement;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
index 20c1fe3e7a..63369a666d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -32,7 +32,7 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.btree.IndexMetadata;
 import com.bigdata.journal.ITx;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
index f49483e85d..5249475807 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,7 +33,7 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.btree.ITupleIterator;
 import com.bigdata.btree.IndexMetadata;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
index ed01ac05ae..87316c7469 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
@@ -29,7 +29,7 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Statement;
+import org.eclipse.rdf4j.model.Statement;
 
 import com.bigdata.btree.UnisolatedReadWriteIndex;
 import com.bigdata.rdf.load.IStatementBufferFactory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestNTriplesWithSids.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestNTriplesWithSids.java
index 804a697ba6..77f5849c5a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestNTriplesWithSids.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestNTriplesWithSids.java
@@ -6,16 +6,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
 
 import com.bigdata.rdf.ServiceProviderHook;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.rio.ntriples.BigdataNTriplesParser;
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.store.AbstractTripleStoreTestCase;
@@ -117,13 +117,13 @@ public void test_ntriples_sids_00() throws RDFParseException, RDFHandlerExceptio
 			while (it.hasNext())
 				System.err.println(it.next());
 
-			final BigdataURI dcSource = store.getValueFactory().createURI(
+			final BigdataIRI dcSource = store.getValueFactory().createURI(
 					"http://purl.org/dc/terms/source");
 
-			final BigdataURI dcCreated = store.getValueFactory().createURI(
+			final BigdataIRI dcCreated = store.getValueFactory().createURI(
 					"http://purl.org/dc/terms/created");
 			
-			final BigdataURI bobSource = store.getValueFactory().createURI(
+			final BigdataIRI bobSource = store.getValueFactory().createURI(
 					"http://hr.example.com/employees#bob");
 			
 			assertEquals(1,
@@ -264,13 +264,13 @@ public void test_ntriples_sids_01() throws RDFParseException, RDFHandlerExceptio
 
 			assertEquals("toldTriples", 3L, store.getStatementCount());//loadStats.toldTriples.get());
 			
-			final BigdataURI dcSource = store.getValueFactory().createURI(
+			final BigdataIRI dcSource = store.getValueFactory().createURI(
 					"http://purl.org/dc/terms/source");
 
-			final BigdataURI dcCreated = store.getValueFactory().createURI(
+			final BigdataIRI dcCreated = store.getValueFactory().createURI(
 					"http://purl.org/dc/terms/created");
 			
-			final BigdataURI bobSource = store.getValueFactory().createURI(
+			final BigdataIRI bobSource = store.getValueFactory().createURI(
 					"http://hr.example.com/employees#bob");
 			
 			assertEquals(1,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStandaloneRDRParsers.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStandaloneRDRParsers.java
index c26df96e20..241a523818 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStandaloneRDRParsers.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStandaloneRDRParsers.java
@@ -6,12 +6,12 @@
 import java.io.InputStream;
 
 import org.junit.Test;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Statement;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 import com.bigdata.rdf.rio.ntriples.BigdataNTriplesParser;
 import com.bigdata.rdf.rio.turtle.BigdataTurtleParser;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStatementBuffer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStatementBuffer.java
index f03c366a45..83521a3ca3 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStatementBuffer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/TestStatementBuffer.java
@@ -29,13 +29,13 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.XSD;
@@ -44,7 +44,7 @@
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.sparql.ast.QueryHints;
@@ -343,12 +343,12 @@ public void test_reificationDoneRight_disabled() {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-			final BigdataURI SAP = vf.createURI("http://example.com/SAP");
-			final BigdataURI bought = vf.createURI("http://example.com/bought");
-			final BigdataURI sybase = vf.createURI("http://example.com/sybase");
-			final BigdataURI dcSource = vf.createURI("http://purl.org/dc/terms/source");
-			final BigdataURI dcCreated = vf.createURI("http://purl.org/dc/terms/created");
-			final BigdataURI newsSybase = vf.createURI("http://example.com/news/us-sybase");
+			final BigdataIRI SAP = vf.createURI("http://example.com/SAP");
+			final BigdataIRI bought = vf.createURI("http://example.com/bought");
+			final BigdataIRI sybase = vf.createURI("http://example.com/sybase");
+			final BigdataIRI dcSource = vf.createURI("http://purl.org/dc/terms/source");
+			final BigdataIRI dcCreated = vf.createURI("http://purl.org/dc/terms/created");
+			final BigdataIRI newsSybase = vf.createURI("http://example.com/news/us-sybase");
 			final BigdataLiteral createdDate = vf.createLiteral("2011-04-05T12:00:00Z",XSD.DATETIME);
 			final BigdataBNode s1 = vf.createBNode("s1");
 
@@ -512,12 +512,12 @@ public void test_reificationDoneRight_enabled() {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-			final BigdataURI SAP = vf.createURI("http://example.com/SAP");
-			final BigdataURI bought = vf.createURI("http://example.com/bought");
-			final BigdataURI sybase = vf.createURI("http://example.com/sybase");
-			final BigdataURI dcSource = vf.createURI("http://purl.org/dc/terms/source");
-			final BigdataURI dcCreated = vf.createURI("http://purl.org/dc/terms/created");
-			final BigdataURI newsSybase = vf.createURI("http://example.com/news/us-sybase");
+			final BigdataIRI SAP = vf.createURI("http://example.com/SAP");
+			final BigdataIRI bought = vf.createURI("http://example.com/bought");
+			final BigdataIRI sybase = vf.createURI("http://example.com/sybase");
+			final BigdataIRI dcSource = vf.createURI("http://purl.org/dc/terms/source");
+			final BigdataIRI dcCreated = vf.createURI("http://purl.org/dc/terms/created");
+			final BigdataIRI newsSybase = vf.createURI("http://example.com/news/us-sybase");
 			final BigdataLiteral createdDate = vf.createLiteral("2011-04-05T12:00:00Z",XSD.DATETIME);
 			final BigdataBNode s1 = vf.createBNode("s1");
 
@@ -647,10 +647,10 @@ public void test_context_stripping() {
 
           final BigdataValueFactory vf = store.getValueFactory();
 
-          final BigdataURI s = vf.createURI("http://example.com/s");
-          final BigdataURI p = vf.createURI("http://example.com/p");
-          final BigdataURI o = vf.createURI("http://example.com/o");
-          final BigdataURI c = vf.createURI("http://example.com/c");
+          final BigdataIRI s = vf.createURI("http://example.com/s");
+          final BigdataIRI p = vf.createURI("http://example.com/p");
+          final BigdataIRI o = vf.createURI("http://example.com/o");
+          final BigdataIRI c = vf.createURI("http://example.com/c");
 
           final StatementBuffer buffer = new StatementBuffer(
                 store, capacity);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTest.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTest.java
index dc97c3e012..6b620695ea 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTest.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTest.java
@@ -5,7 +5,7 @@
  */
 package com.bigdata.rdf.rio.ntriples;
 
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
 
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.BigdataValueFactoryImpl;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTestCase.java
index b7a924e783..a608e5f0b1 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParserTestCase.java
@@ -11,11 +11,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 /**
  * JUnit test for the N-Triples parser.
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
index bf5be08661..9d69c21e82 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
@@ -27,11 +27,11 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.bop.IVariableOrConstant;
 import com.bigdata.bop.ap.Predicate;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
index 2412df01af..04c8857485 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
@@ -28,12 +28,12 @@
 package com.bigdata.rdf.rules;
 
 import java.util.Properties;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.inf.BackchainTypeResourceIterator;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.IStatementBuffer;
@@ -94,9 +94,9 @@ public void test_subjectBound() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
 
             /*
              * add statements to the store.
@@ -181,9 +181,9 @@ public void test_subjectBound2() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
 
             /*
              * add statements to the store.
@@ -270,9 +270,9 @@ public void test_noneBound() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
 
             /*
              * add statements to the store.
@@ -382,9 +382,9 @@ public void test_otherBound_01() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
 
             /*
              * add statements to the store.
@@ -466,9 +466,9 @@ public void test_backchain_foo_type_resource() {
             
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI S = f.createURI("http://www.bigdata.com/s");
-            final BigdataURI P = f.createURI("http://www.bigdata.com/p");
-            final BigdataURI O = f.createURI("http://www.bigdata.com/o");
+            final BigdataIRI S = f.createURI("http://www.bigdata.com/s");
+            final BigdataIRI P = f.createURI("http://www.bigdata.com/p");
+            final BigdataIRI O = f.createURI("http://www.bigdata.com/o");
             
             final IV s = store.addTerm(S);
             final IV p = store.addTerm(P);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java
index 319f582e59..12e6c37f57 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java
@@ -50,7 +50,7 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.rio.LoadStats;
 import com.bigdata.rdf.store.AbstractTripleStore;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestContextAdvancer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestContextAdvancer.java
index 972c8c45c1..8a6b0a80c2 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestContextAdvancer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestContextAdvancer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,7 +31,7 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.NV;
@@ -44,7 +44,7 @@
 import com.bigdata.journal.ITx;
 import com.bigdata.journal.Journal;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -102,13 +102,13 @@ public void test_contextAdvancer() {
 
             final BigdataValueFactory f = db.getValueFactory();
             
-            final BigdataURI u1 = f.createURI("http://www.bigdata.com/u1");
-            final BigdataURI u2 = f.createURI("http://www.bigdata.com/u2");
-            final BigdataURI v1 = f.createURI("http://www.bigdata.com/v1");
-            final BigdataURI v2 = f.createURI("http://www.bigdata.com/v2");
-            final BigdataURI c1 = f.createURI("http://www.bigdata.com/c1");
-            final BigdataURI c2 = f.createURI("http://www.bigdata.com/c2");
-            final BigdataURI rdfType = f.createURI(RDF.TYPE.stringValue());
+            final BigdataIRI u1 = f.createURI("http://www.bigdata.com/u1");
+            final BigdataIRI u2 = f.createURI("http://www.bigdata.com/u2");
+            final BigdataIRI v1 = f.createURI("http://www.bigdata.com/v1");
+            final BigdataIRI v2 = f.createURI("http://www.bigdata.com/v2");
+            final BigdataIRI c1 = f.createURI("http://www.bigdata.com/c1");
+            final BigdataIRI c2 = f.createURI("http://www.bigdata.com/c2");
+            final BigdataIRI rdfType = f.createURI(RDF.TYPE.stringValue());
 
             final BigdataValue[] terms = new BigdataValue[] {
                     u1,u2,//
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
index ff38df0495..b30e9a96bd 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
@@ -15,20 +15,20 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.inferencer.fc.ForwardChainingRDFSInferencer;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingRDFSInferencer;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.axioms.RdfsAxioms;
 import com.bigdata.rdf.inf.ClosureStats;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -882,11 +882,11 @@ public void test_simpleFixPoint() throws Exception {
             
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.bigdata.com/a");
-            final BigdataURI B = f.createURI("http://www.bigdata.com/b");
-            final BigdataURI C = f.createURI("http://www.bigdata.com/c");
-            final BigdataURI D = f.createURI("http://www.bigdata.com/d");
-            final BigdataURI SCO = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI A = f.createURI("http://www.bigdata.com/a");
+            final BigdataIRI B = f.createURI("http://www.bigdata.com/b");
+            final BigdataIRI C = f.createURI("http://www.bigdata.com/c");
+            final BigdataIRI D = f.createURI("http://www.bigdata.com/d");
+            final BigdataIRI SCO = f.asValue(RDFS.SUBCLASSOF);
             
             final Vocabulary vocab = store.getVocabulary();
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java
index 35c803abd2..70403488e4 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java
@@ -49,8 +49,8 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 
 import java.util.Arrays;
 import java.util.Properties;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.rio.IStatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestJustifications.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestJustifications.java
index b8df287126..bdfdc18707 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestJustifications.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestJustifications.java
@@ -30,8 +30,8 @@
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestMatch.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestMatch.java
index c2a7a8d238..7d2cfc2756 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestMatch.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestMatch.java
@@ -50,13 +50,13 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.Var;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java
index ee01a849c6..b88aa93f8b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java
@@ -27,10 +27,10 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.rdf.store.AbstractTripleStore;
@@ -77,11 +77,11 @@ public void test_modelsEqual() throws Exception {
             {
                 final BigdataValueFactory f = store1.getValueFactory();
                 
-                final BigdataURI A = f.createURI("http://www.bigdata.com/a");
-                final BigdataURI B = f.createURI("http://www.bigdata.com/b");
-                final BigdataURI C = f.createURI("http://www.bigdata.com/c");
-                final BigdataURI D = f.createURI("http://www.bigdata.com/d");
-                final BigdataURI SCO = f.asValue(RDFS.SUBCLASSOF);
+                final BigdataIRI A = f.createURI("http://www.bigdata.com/a");
+                final BigdataIRI B = f.createURI("http://www.bigdata.com/b");
+                final BigdataIRI C = f.createURI("http://www.bigdata.com/c");
+                final BigdataIRI D = f.createURI("http://www.bigdata.com/d");
+                final BigdataIRI SCO = f.asValue(RDFS.SUBCLASSOF);
 
                 StatementBuffer buf = new StatementBuffer(store1, 10);
 
@@ -96,11 +96,11 @@ public void test_modelsEqual() throws Exception {
             {
                 final BigdataValueFactory f = store1.getValueFactory();
                 
-                final BigdataURI A = f.createURI("http://www.bigdata.com/a");
-                final BigdataURI B = f.createURI("http://www.bigdata.com/b");
-                final BigdataURI C = f.createURI("http://www.bigdata.com/c");
-                final BigdataURI D = f.createURI("http://www.bigdata.com/d");
-                final BigdataURI SCO = f.asValue(RDFS.SUBCLASSOF);
+                final BigdataIRI A = f.createURI("http://www.bigdata.com/a");
+                final BigdataIRI B = f.createURI("http://www.bigdata.com/b");
+                final BigdataIRI C = f.createURI("http://www.bigdata.com/c");
+                final BigdataIRI D = f.createURI("http://www.bigdata.com/d");
+                final BigdataIRI SCO = f.asValue(RDFS.SUBCLASSOF);
 
                 StatementBuffer buf = new StatementBuffer(store2, 10);
 
@@ -142,9 +142,9 @@ public void test_modelsEqual() throws Exception {
                 
                 final BigdataValueFactory f = store1.getValueFactory();
                 
-                final BigdataURI A = f.createURI("http://www.bigdata.com/a");
-                final BigdataURI B = f.createURI("http://www.bigdata.com/b");
-                final BigdataURI SCO = f.asValue(RDFS.SUBCLASSOF);
+                final BigdataIRI A = f.createURI("http://www.bigdata.com/a");
+                final BigdataIRI B = f.createURI("http://www.bigdata.com/b");
+                final BigdataIRI SCO = f.asValue(RDFS.SUBCLASSOF);
                 
                 assertEquals(1L, store2.removeStatements(A, SCO, B));
                 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOptionals.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
index b48872f8a8..88b462ceb5 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
@@ -31,13 +31,13 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IPredicate;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
index ab1cdb531f..7e287e0777 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
@@ -27,11 +27,11 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import com.bigdata.rdf.inf.OwlSameAsPropertiesExpandingIterator;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.StatementEnum;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java
index 45ca04f9cf..c418427cf6 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java
@@ -29,10 +29,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
index 1b7cb53284..2b30700300 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
@@ -27,8 +27,8 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
index d0fa0eab01..358c9b5f53 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
@@ -30,9 +30,9 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import com.bigdata.bop.IConstant;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java
index 1dc9482fb2..3d8148bc6e 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java
@@ -27,9 +27,9 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java
index 3c29375831..af66194a72 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java
@@ -27,9 +27,9 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlFunctionalProperty.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlFunctionalProperty.java
index 786e5e7b52..99510dac6c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlFunctionalProperty.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlFunctionalProperty.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -24,10 +24,10 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java
index 91153726a4..9987d6ba32 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -24,10 +24,10 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java
index ccfeea69c4..16834e5209 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java
@@ -27,9 +27,9 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java
index 90f7682585..d8b7443157 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java
@@ -27,9 +27,9 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSymmetricProperty.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSymmetricProperty.java
index 7284af96d3..9f6a6c341d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSymmetricProperty.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSymmetricProperty.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -24,10 +24,10 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java
index 63b84832bb..1dd2e55d18 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java
@@ -27,10 +27,10 @@
 
 package com.bigdata.rdf.rules;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.rio.IStatementBuffer;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java
index 6783772d00..273b61977b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java
@@ -29,8 +29,8 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataValueFactory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java
index 2cde940662..3cfdc17642 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java
@@ -29,12 +29,12 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.spo.ISPO;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java
index 94acac734e..edfad47ed0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java
@@ -29,12 +29,12 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.rules.InferenceEngine.Options;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java
index c88ad7e79f..3c8ac18740 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java
@@ -29,8 +29,8 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataValueFactory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java
index 974b83bf2e..1c765ef462 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java
@@ -29,10 +29,10 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.rio.IStatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java
index a3f243c604..6607487176 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java
@@ -29,8 +29,8 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataValueFactory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestSlice.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestSlice.java
index c5f5d33dcc..8587ee7ef0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestSlice.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestSlice.java
@@ -37,7 +37,7 @@
 import com.bigdata.bop.bindingSet.ListBindingSet;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -117,20 +117,20 @@ public void test_slice() throws Exception {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI foo = f.createURI("http://www.bigdata.com/foo");
-            final BigdataURI bar = f.createURI("http://www.bigdata.com/bar");
+            final BigdataIRI foo = f.createURI("http://www.bigdata.com/foo");
+            final BigdataIRI bar = f.createURI("http://www.bigdata.com/bar");
 
-            final BigdataURI x0 = f.createURI("http://www.bigdata.com/x0");
-            final BigdataURI x1 = f.createURI("http://www.bigdata.com/x1");
-            final BigdataURI x2 = f.createURI("http://www.bigdata.com/x2");
+            final BigdataIRI x0 = f.createURI("http://www.bigdata.com/x0");
+            final BigdataIRI x1 = f.createURI("http://www.bigdata.com/x1");
+            final BigdataIRI x2 = f.createURI("http://www.bigdata.com/x2");
 
-            final BigdataURI y0 = f.createURI("http://www.bigdata.com/y0");
-            final BigdataURI y1 = f.createURI("http://www.bigdata.com/y1");
-            final BigdataURI y2 = f.createURI("http://www.bigdata.com/y2");
+            final BigdataIRI y0 = f.createURI("http://www.bigdata.com/y0");
+            final BigdataIRI y1 = f.createURI("http://www.bigdata.com/y1");
+            final BigdataIRI y2 = f.createURI("http://www.bigdata.com/y2");
             
-            final BigdataURI z0 = f.createURI("http://www.bigdata.com/z0");
-            final BigdataURI z1 = f.createURI("http://www.bigdata.com/z1");
-            final BigdataURI z2 = f.createURI("http://www.bigdata.com/z2");
+            final BigdataIRI z0 = f.createURI("http://www.bigdata.com/z0");
+            final BigdataIRI z1 = f.createURI("http://www.bigdata.com/z1");
+            final BigdataIRI z2 = f.createURI("http://www.bigdata.com/z2");
             
             /*
              * Define the terms that we will be using.
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
index 4d08467261..f5d6a05d04 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
@@ -36,17 +36,17 @@
 import java.util.Set;
 
 import org.apache.logging.log4j.ThreadContext;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.inf.TruthMaintenance;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -112,9 +112,9 @@ public void test_filter_01() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI x = f.createURI("http://www.foo.org/x1");
-            final BigdataURI y = f.createURI("http://www.foo.org/y2");
-            final BigdataURI z = f.createURI("http://www.foo.org/z3");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x1");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y2");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z3");
             
             store.addTerms(new BigdataValue[] { x, y, z });
             
@@ -244,11 +244,11 @@ public void test_assertAll_01() {
             
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI U = f.createURI("http://www.bigdata.com/U");
-            final BigdataURI V = f.createURI("http://www.bigdata.com/V");
-            final BigdataURI X = f.createURI("http://www.bigdata.com/X");
+            final BigdataIRI U = f.createURI("http://www.bigdata.com/U");
+            final BigdataIRI V = f.createURI("http://www.bigdata.com/V");
+            final BigdataIRI X = f.createURI("http://www.bigdata.com/X");
 
-            final BigdataURI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
 
             tempStore = tm.newTempTripleStore();
 
@@ -320,11 +320,11 @@ public void test_retractAll_01() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI U = f.createURI("http://www.bigdata.com/U");
-            final BigdataURI V = f.createURI("http://www.bigdata.com/V");
-            final BigdataURI X = f.createURI("http://www.bigdata.com/X");
+            final BigdataIRI U = f.createURI("http://www.bigdata.com/U");
+            final BigdataIRI V = f.createURI("http://www.bigdata.com/V");
+            final BigdataIRI X = f.createURI("http://www.bigdata.com/X");
 
-            final BigdataURI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
 
             final InferenceEngine inf = store.getInferenceEngine();
 
@@ -463,11 +463,11 @@ public void test_downgradeExplicitToInference() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI U = f.createURI("http://www.bigdata.com/U");
-            final BigdataURI V = f.createURI("http://www.bigdata.com/V");
-            final BigdataURI X = f.createURI("http://www.bigdata.com/X");
+            final BigdataIRI U = f.createURI("http://www.bigdata.com/U");
+            final BigdataIRI V = f.createURI("http://www.bigdata.com/V");
+            final BigdataIRI X = f.createURI("http://www.bigdata.com/X");
 
-            final BigdataURI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
 
             {
 
@@ -1346,7 +1346,7 @@ public SPO[] selectRandomExplicitStatements(AbstractTripleStore db, int N) {
      * 

      * Pre-condition: The term identifiers for the graphs MUST be consistently
      * assigned since the statements are not being materialized as RDF
-     * {@link org.openrdf.model.Value} objects.
+     * {@link org.eclipse.rdf4j.model.Value} objects.
      * 
      * @param expected
      *            A copy of the statements made after the data set was loaded
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/AbstractBigdataExprBuilderTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/AbstractBigdataExprBuilderTestCase.java
index e8a8d5b034..aeca3c5547 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/AbstractBigdataExprBuilderTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/AbstractBigdataExprBuilderTestCase.java
@@ -34,7 +34,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpUtility;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/AbstractASTEvaluationTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/AbstractASTEvaluationTestCase.java
index 655140d4c2..27cca0e5de 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/AbstractASTEvaluationTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/AbstractASTEvaluationTestCase.java
@@ -40,7 +40,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpContextBase;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/BSBMQ5Setup.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/BSBMQ5Setup.java
index f92501a357..71870752ae 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/BSBMQ5Setup.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/BSBMQ5Setup.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,12 +31,12 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.eval.AST2BOpContext;
@@ -77,11 +77,11 @@ public class BSBMQ5Setup {
      */
     final AtomicInteger nextId = new AtomicInteger(-1); 
 
-    public final BigdataURI rdfsLabel; 
-    public final BigdataURI productFeature;
-    public final BigdataURI productPropertyNumeric1;
-    public final BigdataURI productPropertyNumeric2;
-    public final BigdataURI product53999;
+    public final BigdataIRI rdfsLabel; 
+    public final BigdataIRI productFeature;
+    public final BigdataIRI productPropertyNumeric1;
+    public final BigdataIRI productPropertyNumeric2;
+    public final BigdataIRI product53999;
     public final BigdataLiteral _120;
     public final BigdataLiteral _170;
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestAST.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestAST.java
index 06dc3c2980..12096628ad 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestAST.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestAST.java
@@ -31,7 +31,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.algebra.Compare.CompareOp;
+import org.eclipse.rdf4j.query.algebra.Compare.CompareOp;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java
index 00564a0a65..89a895b440 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java
@@ -31,11 +31,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
index 3f75e40beb..ce918974ee 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataAndSPARQLTestCase.java
@@ -61,18 +61,18 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 import com.bigdata.bop.engine.AbstractQueryEngineTestCase;
 import com.bigdata.rdf.model.StatementEnum;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
index 04230bc403..922350076f 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractDataDrivenSPARQLTestCase.java
@@ -74,23 +74,23 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Statement;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.dawg.DAWGTestResultSetUtil;
-import org.openrdf.query.impl.TupleQueryResultBuilder;
-import org.openrdf.query.resultio.BooleanQueryResultFormat;
-import org.openrdf.query.resultio.BooleanQueryResultParserRegistry;
-import org.openrdf.query.resultio.QueryResultIO;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultParser;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.dawg.DAWGTestResultSetUtil;
+import org.eclipse.rdf4j.query.impl.TupleQueryResultBuilder;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry;
+import org.eclipse.rdf4j.query.resultio.QueryResultIO;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.bop.engine.AbstractQueryEngineTestCase;
 import com.bigdata.bop.engine.QueryEngine;
@@ -101,7 +101,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
 import com.bigdata.rdf.sparql.ast.QueryRoot;
 import com.bigdata.rdf.store.AbstractTripleStore;
 
-import info.aduna.iteration.Iterations;
+import org.eclipse.rdf4j.common.iteration.Iterations;
 
 /**
  * Abstract base class for data driven test suites.
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractInlineSELECTTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractInlineSELECTTestCase.java
index 54a2ee1c7d..e0778c6cb7 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractInlineSELECTTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/AbstractInlineSELECTTestCase.java
@@ -58,7 +58,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
 
 package com.bigdata.rdf.sparql.ast.eval;
 
-import info.aduna.iteration.Iterations;
+import org.eclipse.rdf4j.common.iteration.Iterations;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -78,32 +78,32 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.dawg.DAWGTestResultSetUtil;
-import org.openrdf.query.impl.TupleQueryResultBuilder;
-import org.openrdf.query.resultio.BooleanQueryResultFormat;
-import org.openrdf.query.resultio.BooleanQueryResultParserRegistry;
-import org.openrdf.query.resultio.QueryResultIO;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultParser;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.RDFHandlerBase;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.dawg.DAWGTestResultSetUtil;
+import org.eclipse.rdf4j.query.impl.TupleQueryResultBuilder;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry;
+import org.eclipse.rdf4j.query.resultio.QueryResultIO;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.StatementBuffer;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestCustomFunction.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestCustomFunction.java
index 3cc60b4800..c31f92ab28 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestCustomFunction.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestCustomFunction.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,10 +29,10 @@
 
 import java.util.Map;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpContextBase;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestDescribe.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestDescribe.java
index 6d8db646bf..f01b1f5af0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestDescribe.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestDescribe.java
@@ -29,12 +29,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Statement;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.BigdataSail;
@@ -233,7 +233,7 @@ public void test_describe_1() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { dc };
 
@@ -309,8 +309,8 @@ public void test_describe_2() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI mike = f.createURI("http://www.bigdata.com/Mike");
-        final BigdataURI bryan = f.createURI("http://www.bigdata.com/Bryan");
+        final BigdataIRI mike = f.createURI("http://www.bigdata.com/Mike");
+        final BigdataIRI bryan = f.createURI("http://www.bigdata.com/Bryan");
 
         final BigdataValue[] values = new BigdataValue[] { mike, bryan};
 
@@ -372,9 +372,9 @@ public void test_describe_3() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
-        final BigdataURI mike = f.createURI("http://www.bigdata.com/Mike");
-        final BigdataURI bryan = f.createURI("http://www.bigdata.com/Bryan");
+        final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI mike = f.createURI("http://www.bigdata.com/Mike");
+        final BigdataIRI bryan = f.createURI("http://www.bigdata.com/Bryan");
 
         final BigdataValue[] values = new BigdataValue[] { dc, mike, bryan};
 
@@ -439,7 +439,7 @@ public void test_describe_4() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI mike = f.createURI("http://www.bigdata.com/mike");
+        final BigdataIRI mike = f.createURI("http://www.bigdata.com/mike");
 
         final BigdataValue[] values = new BigdataValue[] { mike };
 
@@ -497,8 +497,8 @@ public void test_describe_5() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI mike = f.createURI("http://www.bigdata.com/mike");
-        final BigdataURI rdf = f.createURI("http://www.bigdata.com/rdf");
+        final BigdataIRI mike = f.createURI("http://www.bigdata.com/mike");
+        final BigdataIRI rdf = f.createURI("http://www.bigdata.com/rdf");
 
         final BigdataValue[] values = new BigdataValue[] { mike, rdf };
 
@@ -557,11 +557,11 @@ public void test_describe_1_invalidation() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
 
-        final BigdataURI foafPerson = f.asValue(FOAFVocabularyDecl.Person);
+        final BigdataIRI foafPerson = f.asValue(FOAFVocabularyDecl.Person);
 
-        final BigdataURI rdfType = f.asValue(RDF.TYPE);
+        final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
         final BigdataValue[] values = new BigdataValue[] { //
                 dc, foafPerson, rdfType 
@@ -660,7 +660,7 @@ public void test_describe_SymmetricOneStep_1() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { dc };
 
@@ -741,7 +741,7 @@ public void test_describe_ForwardOneStep_1() throws Exception {
 
         final BigdataValueFactory f = h.getTripleStore().getValueFactory();
 
-        final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { dc };
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestHashJoin.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestHashJoin.java
index 5e2913e5c3..baffa52003 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestHashJoin.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestHashJoin.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,8 +29,8 @@
 
 import java.util.Iterator;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.IPredicate;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestInclude.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestInclude.java
index aa36b37b67..472804188a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestInclude.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestInclude.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -55,7 +55,7 @@
 import com.bigdata.journal.IBTreeManager;
 import com.bigdata.rdf.internal.impl.literal.XSDNumericIV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -298,9 +298,9 @@ public void test_include_03a() throws Exception {
         final IVariable y = Var.var("y");
 
         // Resolve terms pre-loaded into the kb.
-        final BigdataURI Mike = vf.createURI("http://www.bigdata.com/Mike"); 
-        final BigdataURI Bryan = vf.createURI("http://www.bigdata.com/Bryan");
-        final BigdataURI DC = vf.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI Mike = vf.createURI("http://www.bigdata.com/Mike"); 
+        final BigdataIRI Bryan = vf.createURI("http://www.bigdata.com/Bryan");
+        final BigdataIRI DC = vf.createURI("http://www.bigdata.com/DC");
         {
             tripleStore.addTerms(new BigdataValue[] { Mike, Bryan, DC });
             assertNotNull(Mike.getIV());
@@ -447,9 +447,9 @@ public void test_include_03() throws Exception {
         final IVariable y = Var.var("y");
 
         // Resolve terms pre-loaded into the kb.
-        final BigdataURI Mike = vf.createURI("http://www.bigdata.com/Mike"); 
-        final BigdataURI Bryan = vf.createURI("http://www.bigdata.com/Bryan");
-        final BigdataURI DC = vf.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI Mike = vf.createURI("http://www.bigdata.com/Mike"); 
+        final BigdataIRI Bryan = vf.createURI("http://www.bigdata.com/Bryan");
+        final BigdataIRI DC = vf.createURI("http://www.bigdata.com/DC");
 		{
 			tripleStore.addTerms(new BigdataValue[] { Mike, Bryan, DC });
 			assertNotNull(Mike.getIV());
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java
index 9c70918d7d..942112981e 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.eval;
 
-import org.openrdf.query.Dataset;
+import org.eclipse.rdf4j.query.Dataset;
 
 import com.bigdata.rdf.internal.IV;
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNegation.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNegation.java
index 5f49bd614f..256c6040ee 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNegation.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestNegation.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,9 +31,9 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.sparql.PrefixDeclProcessor;
@@ -481,17 +481,17 @@ public void test_filter_not_exists2() throws Exception {
             
             final BigdataValueFactory f = h.getTripleStore().getValueFactory();
             
-            final BigdataURI refEntity = f
+            final BigdataIRI refEntity = f
                     .createURI("os:prop/analysis/refEntity");
 
-            final BigdataURI Kriterion = f.createURI("os:elem/loc/Kriterion");
+            final BigdataIRI Kriterion = f.createURI("os:elem/loc/Kriterion");
             
-            final BigdataURI AnalysisResults = f
+            final BigdataIRI AnalysisResults = f
                     .createURI("os:class/AnalysisResults");
             
-            final BigdataURI Artis = f.createURI("os:elem/loc/Artis");
+            final BigdataIRI Artis = f.createURI("os:elem/loc/Artis");
             
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
             
             final BigdataValue[] values = new BigdataValue[] { refEntity,
                     Kriterion, AnalysisResults, Artis, rdfType };
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
index 0b9e036c8c..2ab334c748 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
@@ -35,12 +35,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpUtility;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestSubQuery.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestSubQuery.java
index 10aee10a16..5012ecd2f8 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestSubQuery.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestSubQuery.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.eval;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.bop.BOpUtility;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestTCK.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestTCK.java
index f6d79b4d5f..d03e1a9670 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestTCK.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/TestTCK.java
@@ -603,7 +603,7 @@ public void test_OPTIONAL_FILTER() throws Exception {
     }
 
     /**
-     * This is sesame TCK test sparql11-subquery-04. We picked it
+     * This is rdf4j TCK test sparql11-subquery-04. We picked it
      * up with Sesame 2.6.3. It fails in the TCK run, but it appears to be Ok
      * when run at this layer.
      * 

diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java
index 2c1f82d4a1..eff81f3aec 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java
@@ -38,7 +38,7 @@
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -112,20 +112,20 @@ public void test_reificationDoneRight_00() throws Exception {
 
 		final BigdataValueFactory vf = store.getValueFactory();
 
-		final BigdataURI SAP = vf.createURI("http://example.com/SAP");
-		final BigdataURI bought = vf.createURI("http://example.com/bought");
-		final BigdataURI sybase = vf.createURI("http://example.com/sybase");
-		final BigdataURI dcSource = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"source");
-		final BigdataURI dcCreated = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"created");
-		final BigdataURI newsSybase = vf.createURI("http://example.com/news/us-sybase");
+		final BigdataIRI SAP = vf.createURI("http://example.com/SAP");
+		final BigdataIRI bought = vf.createURI("http://example.com/bought");
+		final BigdataIRI sybase = vf.createURI("http://example.com/sybase");
+		final BigdataIRI dcSource = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"source");
+		final BigdataIRI dcCreated = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"created");
+		final BigdataIRI newsSybase = vf.createURI("http://example.com/news/us-sybase");
 		final BigdataLiteral createdDate = vf.createLiteral("2011-04-05T12:00:00Z",XSD.DATETIME);
-		final BigdataURI g1 = vf.createURI("http://example.com/g1");
+		final BigdataIRI g1 = vf.createURI("http://example.com/g1");
 
 		// Add/resolve the terms against the lexicon.
 		final BigdataValue[] terms = new BigdataValue[] { SAP, bought, sybase,
 				dcSource, dcCreated, newsSybase, createdDate, g1 };
 
-		final BigdataURI context = store.isQuads() ? g1 : null;
+		final BigdataIRI context = store.isQuads() ? g1 : null;
 		
 		store.addTerms(terms);
 		
@@ -191,20 +191,20 @@ public void test_reificationDoneRight_00a() throws Exception {
 
 		final BigdataValueFactory vf = store.getValueFactory();
 
-		final BigdataURI SAP = vf.createURI("http://example.com/SAP");
-		final BigdataURI bought = vf.createURI("http://example.com/bought");
-		final BigdataURI sybase = vf.createURI("http://example.com/sybase");
-		final BigdataURI dcSource = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"source");
-		final BigdataURI dcCreated = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"created");
-		final BigdataURI newsSybase = vf.createURI("http://example.com/news/us-sybase");
+		final BigdataIRI SAP = vf.createURI("http://example.com/SAP");
+		final BigdataIRI bought = vf.createURI("http://example.com/bought");
+		final BigdataIRI sybase = vf.createURI("http://example.com/sybase");
+		final BigdataIRI dcSource = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"source");
+		final BigdataIRI dcCreated = vf.createURI(DCTermsVocabularyDecl.NAMESPACE+"created");
+		final BigdataIRI newsSybase = vf.createURI("http://example.com/news/us-sybase");
 		final BigdataLiteral createdDate = vf.createLiteral("2011-04-05T12:00:00Z",XSD.DATETIME);
-		final BigdataURI g1 = vf.createURI("http://example.com/g1");
+		final BigdataIRI g1 = vf.createURI("http://example.com/g1");
 
 		// Add/resolve the terms against the lexicon.
 		final BigdataValue[] terms = new BigdataValue[] { SAP, bought, sybase,
 				dcSource, dcCreated, newsSybase, createdDate, g1 };
 
-		final BigdataURI context = store.isQuads() ? g1 : null;
+		final BigdataIRI context = store.isQuads() ? g1 : null;
 		
 		store.addTerms(terms);
 		
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestVocabulary.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestVocabulary.java
index d107fdf179..0d13886c95 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestVocabulary.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestVocabulary.java
@@ -24,7 +24,7 @@
 
 package com.bigdata.rdf.sparql.ast.eval.service;
 
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.vocab.BaseVocabularyDecl;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestWKTLiteralSerializer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestWKTLiteralSerializer.java
index c70ddd33a4..06b91a9f87 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestWKTLiteralSerializer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/GeoSpatialTestWKTLiteralSerializer.java
@@ -26,7 +26,7 @@
  */
 package com.bigdata.rdf.sparql.ast.eval.service;
 
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataValueFactory;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/OpenrdfNativeMockServiceFactory.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/OpenrdfNativeMockServiceFactory.java
index ea0d9640d5..20cec88cfd 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/OpenrdfNativeMockServiceFactory.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/OpenrdfNativeMockServiceFactory.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,7 +29,7 @@
 
 import java.util.List;
 
-import org.openrdf.query.BindingSet;
+import org.eclipse.rdf4j.query.BindingSet;
 
 import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
 import com.bigdata.rdf.sparql.ast.service.ExternalServiceCall;
@@ -103,4 +103,4 @@ public IServiceOptions getServiceOptions() {
 
     }
 
-}
+}
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestBigdataNativeServiceEvaluation.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestBigdataNativeServiceEvaluation.java
index e39cfa9ed5..15c0d1b7fa 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestBigdataNativeServiceEvaluation.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestBigdataNativeServiceEvaluation.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,8 +30,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestGeoSpatialServiceConfigurationParsing.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestGeoSpatialServiceConfigurationParsing.java
index 35b4d75cb1..76d0f60359 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestGeoSpatialServiceConfigurationParsing.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestGeoSpatialServiceConfigurationParsing.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -73,7 +73,7 @@ public void testAcceptSingleDatatypeConfig() {
         assertEquals(parsedDatatypeConfigs.size(),1);
         
         final GeoSpatialDatatypeConfiguration parsedDatatypeConfig = parsedDatatypeConfigs.get(0);
-        assertEquals(parsedDatatypeConfig.getUri().stringValue(), config1Uri);
+        assertEquals(parsedDatatypeConfig.getIri().stringValue(), config1Uri);
         
         final List fields = parsedDatatypeConfig.getFields();
         assertEquals(fields.size(), 5);
@@ -150,11 +150,11 @@ public void testAcceptMultipleDatatypeConfigs() {
             final GeoSpatialDatatypeConfiguration parsedDatatypeConfig = parsedDatatypeConfigs.get(i);
             
             if (i==0) {
-                assertEquals(parsedDatatypeConfig.getUri().stringValue(), config1Uri);
+                assertEquals(parsedDatatypeConfig.getIri().stringValue(), config1Uri);
             } else if (i==1) {
-                assertEquals(parsedDatatypeConfig.getUri().stringValue(), config2Uri);
+                assertEquals(parsedDatatypeConfig.getIri().stringValue(), config2Uri);
             } else if (i==2) {
-                assertEquals(parsedDatatypeConfig.getUri().stringValue(), config3Uri);
+                assertEquals(parsedDatatypeConfig.getIri().stringValue(), config3Uri);
             }
             
             final List fields = parsedDatatypeConfig.getFields();
@@ -459,4 +459,4 @@ String sampleConfigWithMissingServiceMapping(String uri) {
         return config;
     }
     
-}
+}
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestOpenrdfNativeServiceEvaluation.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestOpenrdfNativeServiceEvaluation.java
index 3e74306fd2..69b8e15255 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestOpenrdfNativeServiceEvaluation.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestOpenrdfNativeServiceEvaluation.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,10 +30,10 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
 
 import com.bigdata.rdf.sparql.ast.eval.AbstractDataDrivenSPARQLTestCase;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql10QueryBuilder.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql10QueryBuilder.java
index fed402e0f2..6a103e8b74 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql10QueryBuilder.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql10QueryBuilder.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -34,20 +34,20 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.algebra.StatementPattern.Scope;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
 
 import com.bigdata.bop.IVariable;
 import com.bigdata.bop.Var;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sail.sparql.PrefixDeclProcessor;
 import com.bigdata.rdf.sparql.AbstractBigdataExprBuilderTestCase;
@@ -147,7 +147,7 @@ private void addResolveIVs(final BigdataValue... values) {
      */
     public void test_service_001() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -219,7 +219,7 @@ public void test_service_001() throws Exception {
      */
     public void test_service_001b() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -298,15 +298,15 @@ public void test_service_002() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
-        final BigdataURI author1 = valueFactory.createURI("http://example.org/author/author1");
-        final BigdataURI author2 = valueFactory.createURI("http://example.org/author/author2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI author1 = valueFactory.createURI("http://example.org/author/author1");
+        final BigdataIRI author2 = valueFactory.createURI("http://example.org/author/author2");
 
         addResolveIVs(dcCreator, book1, book2, author1, author2);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -443,9 +443,9 @@ public void test_service_003() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
         final BigdataLiteral book3 = valueFactory.createLiteral("Semantic Web Primer");
         final BigdataLiteral book4 = valueFactory.createLiteral("Semantic Web Primer", "DE");
         final BigdataLiteral book5 = valueFactory.createLiteral("12", XSD.INT);
@@ -453,7 +453,7 @@ public void test_service_003() throws Exception {
 
         addResolveIVs(dcCreator, book1, book2, book3, book4, book5, book6);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -642,7 +642,7 @@ public void test_service_004() throws Exception {
 
         addResolveIVs(bnd1);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -753,7 +753,7 @@ public void test_service_004() throws Exception {
      */
     public void test_service_005() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -874,7 +874,7 @@ public void test_service_005() throws Exception {
      */
     public void test_service_006() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -1013,7 +1013,7 @@ public void test_service_007() throws Exception {
 
         addResolveIVs(book1);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -1139,7 +1139,7 @@ public void test_service_007() throws Exception {
      */
     public void test_service_008() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql11QueryBuilder.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql11QueryBuilder.java
index 13a91da647..99542d6181 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql11QueryBuilder.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql11QueryBuilder.java
@@ -36,14 +36,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.algebra.StatementPattern.Scope;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
@@ -54,7 +54,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sail.sparql.PrefixDeclProcessor;
 import com.bigdata.rdf.sparql.AbstractBigdataExprBuilderTestCase;
@@ -159,7 +159,7 @@ private IConstant asConstant(final IV iv) {
      */
     public void test_service_001() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -239,7 +239,7 @@ public void test_service_001() throws Exception {
      */
     public void test_service_001b() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -327,15 +327,15 @@ public void test_service_002() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
-        final BigdataURI author1 = valueFactory.createURI("http://example.org/author/author1");
-        final BigdataURI author2 = valueFactory.createURI("http://example.org/author/author2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI author1 = valueFactory.createURI("http://example.org/author/author1");
+        final BigdataIRI author2 = valueFactory.createURI("http://example.org/author/author2");
 
         addResolveIVs(dcCreator, book1, book2, author1, author2);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -457,9 +457,9 @@ public void test_service_003() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
         final BigdataLiteral book3 = valueFactory.createLiteral("Semantic Web Primer");
         final BigdataLiteral book4 = valueFactory.createLiteral("Semantic Web Primer", "DE");
         final BigdataLiteral book5 = valueFactory.createLiteral("12", XSD.INT);
@@ -467,7 +467,7 @@ public void test_service_003() throws Exception {
 
         addResolveIVs(dcCreator, book1, book2, book3, book4, book5, book6);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -614,7 +614,7 @@ public void test_service_003() throws Exception {
      */
     public void test_service_004() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -718,7 +718,7 @@ public void test_service_004() throws Exception {
      */
     public void test_service_005() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -840,7 +840,7 @@ public void test_service_005() throws Exception {
      */
     public void test_service_006() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -975,7 +975,7 @@ public void test_service_006() throws Exception {
      */
     public void test_service_007() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -1063,7 +1063,7 @@ public void test_service_007() throws Exception {
      */
     public void test_service_008() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparqlBuilderFactory.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparqlBuilderFactory.java
index be3bbe9ab8..cd4ae7ae3b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparqlBuilderFactory.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparqlBuilderFactory.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -34,19 +34,19 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
 
 import com.bigdata.bop.IVariable;
 import com.bigdata.bop.Var;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sparql.AbstractBigdataExprBuilderTestCase;
 import com.bigdata.rdf.sparql.ast.ConstantNode;
@@ -131,7 +131,7 @@ private void addResolveIVs(final BigdataValue... values) {
      */
     public void test_service_001() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -196,7 +196,7 @@ public void test_service_001() throws Exception {
      */
     public void test_service_001b() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -266,15 +266,15 @@ public void test_service_002() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
-        final BigdataURI author1 = valueFactory.createURI("http://example.org/author/author1");
-        final BigdataURI author2 = valueFactory.createURI("http://example.org/author/author2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI author1 = valueFactory.createURI("http://example.org/author/author1");
+        final BigdataIRI author2 = valueFactory.createURI("http://example.org/author/author2");
 
         addResolveIVs(dcCreator, book1, book2, author1, author2);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -358,9 +358,9 @@ public void test_service_003() throws Exception {
         /*
          * Resolve IVs that we will use below.
          */
-        final BigdataURI dcCreator = valueFactory.asValue(DC.CREATOR);
-        final BigdataURI book1 = valueFactory.createURI("http://example.org/book/book1");
-        final BigdataURI book2 = valueFactory.createURI("http://example.org/book/book2");
+        final BigdataIRI dcCreator = valueFactory.asValue(DC.CREATOR);
+        final BigdataIRI book1 = valueFactory.createURI("http://example.org/book/book1");
+        final BigdataIRI book2 = valueFactory.createURI("http://example.org/book/book2");
         final BigdataLiteral book3 = valueFactory.createLiteral("Semantic Web Primer");
         final BigdataLiteral book4 = valueFactory.createLiteral("Semantic Web Primer", "DE");
         final BigdataLiteral book5 = valueFactory.createLiteral("12", XSD.INT);
@@ -368,7 +368,7 @@ public void test_service_003() throws Exception {
 
         addResolveIVs(dcCreator, book1, book2, book3, book4, book5, book6);
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -464,7 +464,7 @@ public void test_service_003() throws Exception {
      */
     public void test_service_004() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -538,7 +538,7 @@ public void test_service_004() throws Exception {
      */
     public void test_service_005() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -624,7 +624,7 @@ public void test_service_005() throws Exception {
      */
     public void test_service_006() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -712,7 +712,7 @@ public void test_service_006() throws Exception {
      */
     public void test_service_007() throws Exception {
 
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -813,7 +813,7 @@ public void test_service_007() throws Exception {
      */
     public void test_service_008() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
 
         final GraphPatternGroup groupNode = new JoinGroupNode();
@@ -904,7 +904,7 @@ public void test_service_008() throws Exception {
     
     public void test_service_009() throws Exception {
         
-        final BigdataURI serviceURI = valueFactory
+        final BigdataIRI serviceURI = valueFactory
                 .createURI("http://www.bigdata.com/myService");
         
         final String exprImage = "SERVICE <" + serviceURI + "> { ?s ?p ?o }";
@@ -937,7 +937,7 @@ public void test_service_009() throws Exception {
        
         { 
         	final MapBindingSet bset = new MapBindingSet();
-            final BigdataURI tmp1 = valueFactory.createURI("p:p1");
+            final BigdataIRI tmp1 = valueFactory.createURI("p:p1");
             // @see https://jira.blazegraph.com/browse/BLZG-1951 (Strings in federated query not escaped)
             // this literal tests proper escaping of string literals in prepared SPARQL.
             final BigdataLiteral tmp2 = valueFactory.createLiteral("\"lit1\"");
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java
index 9d9db1891d..f39bf4a8ae 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/service/TestServiceRegistry.java
@@ -31,15 +31,15 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.jetty.client.HttpClient;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.bop.engine.QueryEngine;
 import com.bigdata.bop.fed.QueryEngineFactory;
 import com.bigdata.journal.BufferMode;
 import com.bigdata.rdf.axioms.NoAxioms;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.BigdataSail;
@@ -272,11 +272,11 @@ public void test_serviceAlias2() {
             
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI serviceURI1 = f
+            final BigdataIRI serviceURI1 = f
                     .createURI("http://www.bigdata.com/myService/" + getName()
                             + "/" + UUID.randomUUID());
 
-            final BigdataURI serviceURI2 = f
+            final BigdataIRI serviceURI2 = f
                     .createURI("http://www.bigdata.com/myService2/" + getName()
                             + "/" + UUID.randomUUID());
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/update/TestUpdateBootstrap.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/update/TestUpdateBootstrap.java
index 88d5b1dbeb..0546b373c9 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/update/TestUpdateBootstrap.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/eval/update/TestUpdateBootstrap.java
@@ -34,9 +34,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
@@ -54,7 +54,7 @@
 import com.bigdata.journal.ITx;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -257,13 +257,13 @@ public void test_insert_data() throws Exception {
         
         {
             final BigdataValueFactory f = store.getValueFactory();
-            final BigdataURI mike = f.createURI("http://www.bigdata.com/Mike");
-            final BigdataURI bryan = f.createURI("http://www.bigdata.com/Bryan");
-            final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
-            final BigdataURI g1 = f.createURI("http://www.bigdata.com/g1");
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfsLabel = f.asValue(RDFS.LABEL);
-            final BigdataURI foafPerson = f.createURI("http://xmlns.com/foaf/0.1/Person");
+            final BigdataIRI mike = f.createURI("http://www.bigdata.com/Mike");
+            final BigdataIRI bryan = f.createURI("http://www.bigdata.com/Bryan");
+            final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
+            final BigdataIRI g1 = f.createURI("http://www.bigdata.com/g1");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfsLabel = f.asValue(RDFS.LABEL);
+            final BigdataIRI foafPerson = f.createURI("http://xmlns.com/foaf/0.1/Person");
             final BigdataLiteral mikeL = f.createLiteral("Mike");
             final BigdataLiteral bryanL = f.createLiteral("Bryan");
             final BigdataLiteral DCL = f.createLiteral("DC");
@@ -458,13 +458,13 @@ public void test_load_data() throws Exception {
         
         {
             final BigdataValueFactory f = store.getValueFactory();
-            final BigdataURI mike = f.createURI("http://www.bigdata.com/Mike");
-            final BigdataURI bryan = f.createURI("http://www.bigdata.com/Bryan");
-            final BigdataURI dc = f.createURI("http://www.bigdata.com/DC");
-            final BigdataURI g1 = f.createURI("http://www.bigdata.com/g1");
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfsLabel = f.asValue(RDFS.LABEL);
-            final BigdataURI foafPerson = f.createURI("http://xmlns.com/foaf/0.1/Person");
+            final BigdataIRI mike = f.createURI("http://www.bigdata.com/Mike");
+            final BigdataIRI bryan = f.createURI("http://www.bigdata.com/Bryan");
+            final BigdataIRI dc = f.createURI("http://www.bigdata.com/DC");
+            final BigdataIRI g1 = f.createURI("http://www.bigdata.com/g1");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfsLabel = f.asValue(RDFS.LABEL);
+            final BigdataIRI foafPerson = f.createURI("http://xmlns.com/foaf/0.1/Person");
             final BigdataLiteral mikeL = f.createLiteral("Mike");
             final BigdataLiteral bryanL = f.createLiteral("Bryan");
             final BigdataLiteral DCL = f.createLiteral("DC");
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
index d752f1dc64..06e7be6c7b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java
@@ -24,9 +24,9 @@
 package com.bigdata.rdf.sparql.ast.optimizers;
 
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IConstant;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCaseWithUtilityMethods.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCaseWithUtilityMethods.java
index 0285048442..519d8e532a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCaseWithUtilityMethods.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCaseWithUtilityMethods.java
@@ -41,7 +41,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -439,7 +439,7 @@ ServiceNode serviceSparql11WithConstant(final String... varNames) {
       final JoinGroupNode jgn = joinGroupWithVars(varNames);
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI serviceEndpoint = f.createURI("http://custom.endpoint");
+      final BigdataIRI serviceEndpoint = f.createURI("http://custom.endpoint");
       final IV serviceEndpointIV = makeIV(serviceEndpoint);
       
       final BigdataValue[] values = new BigdataValue[] { serviceEndpoint };       
@@ -478,10 +478,10 @@ ServiceNode serviceSparql11WithVariable(
    ServiceNode serviceBDSWithVariable(final String inputVar) {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI bdsSearch = f.createURI(BDS.NAMESPACE + "search");
-      final BigdataURI predSearch = f.createURI(BDS.SEARCH.toString());
-      final BigdataURI predSearchTimeout = f.createURI(BDS.SEARCH_TIMEOUT.toString());
-      final BigdataURI predMatchExact = f.createURI(BDS.MATCH_EXACT.toString());
+      final BigdataIRI bdsSearch = f.createURI(BDS.NAMESPACE + "search");
+      final BigdataIRI predSearch = f.createURI(BDS.SEARCH.toString());
+      final BigdataIRI predSearchTimeout = f.createURI(BDS.SEARCH_TIMEOUT.toString());
+      final BigdataIRI predMatchExact = f.createURI(BDS.MATCH_EXACT.toString());
       
       final BigdataValue[] values = 
          new BigdataValue[] { bdsSearch, predSearch, predSearchTimeout, predMatchExact };       
@@ -511,10 +511,10 @@ ServiceNode serviceFTSWithVariable(
       final String searchVar, final String endpointVar, final String paramsVar) {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI ftsSearch = f.createURI(FTS.NAMESPACE + "search");
-      final BigdataURI predSearch = f.createURI(FTS.SEARCH.toString());
-      final BigdataURI predEndpoint = f.createURI(FTS.ENDPOINT.toString());
-      final BigdataURI predParams = f.createURI(FTS.PARAMS.toString());
+      final BigdataIRI ftsSearch = f.createURI(FTS.NAMESPACE + "search");
+      final BigdataIRI predSearch = f.createURI(FTS.SEARCH.toString());
+      final BigdataIRI predEndpoint = f.createURI(FTS.ENDPOINT.toString());
+      final BigdataIRI predParams = f.createURI(FTS.PARAMS.toString());
       
       final BigdataValue[] values = 
          new BigdataValue[] { 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTAttachJoinFiltersOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTAttachJoinFiltersOptimizer.java
index 84804ec187..3894d6d9bc 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTAttachJoinFiltersOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTAttachJoinFiltersOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -32,7 +32,7 @@
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.IBindingSet;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
 import com.bigdata.rdf.sparql.ast.AbstractASTEvaluationTestCase;
@@ -193,7 +193,7 @@ public void test_attachFilters() {
 	public void test_redundantFilter() {
 
         final String sampleInstance = "http://www.example.com/I";
-        final BigdataURI someUri = valueFactory.createURI(sampleInstance);
+        final BigdataIRI someUri = valueFactory.createURI(sampleInstance);
         final BigdataValue[] terms = new BigdataValue[] { someUri };
 
         // resolve terms.
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBatchResolveTermsOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBatchResolveTermsOptimizer.java
index 5544a1929d..63e3d6723e 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBatchResolveTermsOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBatchResolveTermsOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,8 +29,8 @@
 
 import java.util.Collections;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
@@ -39,7 +39,7 @@
 import com.bigdata.bop.bindingSet.ListBindingSet;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -108,13 +108,13 @@ public void test_batchResolveTerms_01() throws MalformedQueryException {
     		final BigdataValueFactory f = store.getValueFactory();
 
     		// A version where a mock IV is associated with the term. 
-    		final BigdataURI unknown1 = f.createURI("http://example/out");
+    		final BigdataIRI unknown1 = f.createURI("http://example/out");
     		unknown1.setIV(TermId.mockIV(VTE.URI));
     		assertFalse(unknown1.isRealIV());
     		unknown1.getIV().setValue(unknown1);
     		
     		// A version where a real IV is associated with the term. 
-    		final BigdataURI known1 = f.createURI("http://example/out");
+    		final BigdataIRI known1 = f.createURI("http://example/out");
     		store.addTerms(new BigdataValue[]{known1});
     		assertTrue(known1.isRealIV());
     		
@@ -221,13 +221,13 @@ public void test_batchResolveTerms_02() throws MalformedQueryException {
     		final BigdataValueFactory f = store.getValueFactory();
 
     		// A version where a mock IV is associated with the term. 
-    		final BigdataURI unknown1 = f.createURI("http://example/out");
+    		final BigdataIRI unknown1 = f.createURI("http://example/out");
     		unknown1.setIV(TermId.mockIV(VTE.URI));
     		assertFalse(unknown1.isRealIV());
     		unknown1.getIV().setValue(unknown1);
     		
     		// A version where a real IV is associated with the term. 
-    		final BigdataURI known1 = f.createURI("http://example/out");
+    		final BigdataIRI known1 = f.createURI("http://example/out");
     		store.addTerms(new BigdataValue[]{known1});
     		assertTrue(known1.isRealIV());
     		
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBottomUpOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBottomUpOptimizer.java
index 4ed69fa554..9464279010 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBottomUpOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTBottomUpOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -35,9 +35,9 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.Constant;
@@ -49,7 +49,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
@@ -145,11 +145,11 @@ public void test_bottomUpOptimizer_nested_optionals_1()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x1 = f.createURI("http://example/x1");
-        final BigdataURI x2 = f.createURI("http://example/x2");
-        final BigdataURI x3 = f.createURI("http://example/x3");
-        final BigdataURI p = f.createURI("http://example/p");
-        final BigdataURI q = f.createURI("http://example/q");
+        final BigdataIRI x1 = f.createURI("http://example/x1");
+        final BigdataIRI x2 = f.createURI("http://example/x2");
+        final BigdataIRI x3 = f.createURI("http://example/x3");
+        final BigdataIRI p = f.createURI("http://example/p");
+        final BigdataIRI q = f.createURI("http://example/q");
         final BigdataValue[] values = new BigdataValue[] { x1, x2, x3, p, q };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
@@ -295,13 +295,13 @@ public void test_bottomUpOptimizer_nested_optionals_1_correctRejection()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x1 = f.createURI("http://example/x1");
-        final BigdataURI x2 = f.createURI("http://example/x2");
-        final BigdataURI x3 = f.createURI("http://example/x3");
-        final BigdataURI p = f.createURI("http://example/p");
-        final BigdataURI q = f.createURI("http://example/q");
-        final BigdataURI c1 = f.createURI("http://example/c1");
-        final BigdataURI c2 = f.createURI("http://example/c2");
+        final BigdataIRI x1 = f.createURI("http://example/x1");
+        final BigdataIRI x2 = f.createURI("http://example/x2");
+        final BigdataIRI x3 = f.createURI("http://example/x3");
+        final BigdataIRI p = f.createURI("http://example/p");
+        final BigdataIRI q = f.createURI("http://example/q");
+        final BigdataIRI c1 = f.createURI("http://example/c1");
+        final BigdataIRI c2 = f.createURI("http://example/c2");
         final BigdataValue[] values = new BigdataValue[] { x1, x2, x3, p, q, c1, c2 };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
@@ -427,9 +427,9 @@ public void test_bottomUpOptimizer_filter_scope_1()
          * verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x = f.createURI("http://example/x");
-        final BigdataURI p = f.createURI("http://example/p");
-        final BigdataURI q = f.createURI("http://example/q");
+        final BigdataIRI x = f.createURI("http://example/x");
+        final BigdataIRI p = f.createURI("http://example/p");
+        final BigdataIRI q = f.createURI("http://example/q");
         final BigdataLiteral ONE = f.createLiteral("1", XSD.INTEGER);
         final BigdataValue[] values = new BigdataValue[] { x, p, q, ONE };
         store.getLexiconRelation()
@@ -619,8 +619,8 @@ public void test_bottomUpOptimizer_join_scope_1()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI name = f.createURI("http://example/name");
-        final BigdataURI email = f.createURI("http://example/email");
+        final BigdataIRI name = f.createURI("http://example/name");
+        final BigdataIRI email = f.createURI("http://example/email");
         final BigdataLiteral paul = f.createLiteral("paul");
         final BigdataLiteral george = f.createLiteral("george");
         final BigdataValue[] values = new BigdataValue[] { name, email, paul,
@@ -756,8 +756,8 @@ public void test_wellDesigned01()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI name = f.createURI("http://example/name");
-        final BigdataURI email = f.createURI("http://example/email");
+        final BigdataIRI name = f.createURI("http://example/name");
+        final BigdataIRI email = f.createURI("http://example/email");
         final BigdataLiteral paul = f.createLiteral("paul");
         final BigdataLiteral george = f.createLiteral("george");
         final BigdataValue[] values = new BigdataValue[] { name, email, paul,
@@ -810,8 +810,8 @@ public void test_wellDesigned02() throws MalformedQueryException {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI name = f.createURI("http://example/name");
-        final BigdataURI email = f.createURI("http://example/email");
+        final BigdataIRI name = f.createURI("http://example/name");
+        final BigdataIRI email = f.createURI("http://example/email");
         final BigdataLiteral paul = f.createLiteral("paul");
         final BigdataLiteral george = f.createLiteral("george");
         final BigdataValue[] values = new BigdataValue[] { name, email, paul,
@@ -864,8 +864,8 @@ public void test_wellDesigned03() throws MalformedQueryException {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI name = f.createURI("http://example/name");
-        final BigdataURI email = f.createURI("http://example/email");
+        final BigdataIRI name = f.createURI("http://example/name");
+        final BigdataIRI email = f.createURI("http://example/email");
         final BigdataLiteral paul = f.createLiteral("paul");
         final BigdataLiteral george = f.createLiteral("george");
         final BigdataValue[] values = new BigdataValue[] { name, email, paul,
@@ -930,9 +930,9 @@ public void test_illDesignedOptUnionCombo() throws MalformedQueryException {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI p1 = f.createURI("http://example/p1");
-        final BigdataURI p2 = f.createURI("http://example/p2");
-        final BigdataURI p3 = f.createURI("http://example/p3");
+        final BigdataIRI p1 = f.createURI("http://example/p1");
+        final BigdataIRI p2 = f.createURI("http://example/p2");
+        final BigdataIRI p3 = f.createURI("http://example/p3");
         final BigdataValue[] values = new BigdataValue[] { p1, p2, p3 };
         store.getLexiconRelation().
             addTerms(values, values.length, false/* readOnly */);
@@ -987,8 +987,8 @@ public void test_bottomUpOptimizer_filter_nested_2()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x = f.createURI("http://example/x");
-        final BigdataURI p = f.createURI("http://example/p");
+        final BigdataIRI x = f.createURI("http://example/x");
+        final BigdataIRI p = f.createURI("http://example/p");
         final BigdataLiteral ONE = f.createLiteral("1", XSD.INTEGER);
         final BigdataValue[] values = new BigdataValue[] { x, p, ONE };
         store.getLexiconRelation()
@@ -1083,8 +1083,8 @@ public void test_bottomUpOptimizer_filter_nested_2_withBindings()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x = f.createURI("http://example/x");
-        final BigdataURI p = f.createURI("http://example/p");
+        final BigdataIRI x = f.createURI("http://example/x");
+        final BigdataIRI p = f.createURI("http://example/p");
         final BigdataValue[] values = new BigdataValue[] { x, p };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
@@ -1148,8 +1148,8 @@ public void test_bottomUpOptimizer_filter_unboundVar()
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x = f.createURI("http://example/x");
-        final BigdataURI p = f.createURI("http://example/p");
+        final BigdataIRI x = f.createURI("http://example/x");
+        final BigdataIRI p = f.createURI("http://example/p");
         final BigdataLiteral ONE = f.createLiteral("1", XSD.INTEGER);
         final BigdataValue[] values = new BigdataValue[] { x, p, ONE };
         store.getLexiconRelation()
@@ -1265,10 +1265,10 @@ public void test_opt_filter_1() throws Exception {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI x = f.createURI("http://example/x");
-        final BigdataURI y = f.createURI("http://example/y");
-        final BigdataURI p = f.createURI("http://example/p");
-        final BigdataURI q = f.createURI("http://example/q");
+        final BigdataIRI x = f.createURI("http://example/x");
+        final BigdataIRI y = f.createURI("http://example/y");
+        final BigdataIRI p = f.createURI("http://example/p");
+        final BigdataIRI q = f.createURI("http://example/q");
         final BigdataValue[] values = new BigdataValue[] { x, y, p, q };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTComplexOptionalOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTComplexOptionalOptimizer.java
index 4a2cb9b4b4..8821911096 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTComplexOptionalOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTComplexOptionalOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,9 +27,9 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTConstructOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTConstructOptimizer.java
index f725d945ed..8827bc3def 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTConstructOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTConstructOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,15 +29,15 @@
 
 import java.util.Arrays;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
 import com.bigdata.rdf.model.BigdataStatementImpl;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -103,7 +103,7 @@ public void test_construct_rewrite() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
 
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -169,24 +169,24 @@ public void test_construct_rewrite() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -411,7 +411,7 @@ public void test_construct_withSolutionModifiers_none() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
 
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -478,24 +478,24 @@ public void test_construct_withSolutionModifiers_none() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -651,7 +651,7 @@ public void test_construct_withSolutionModifiers_offsetLimit() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
 
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -718,24 +718,24 @@ public void test_construct_withSolutionModifiers_offsetLimit() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -932,7 +932,7 @@ public void test_construct_withSolutionModifiers_offsetLimit_orderBy() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
 
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -999,24 +999,24 @@ public void test_construct_withSolutionModifiers_offsetLimit_orderBy() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -1221,7 +1221,7 @@ public void test_construct_withSolutionModifiers_orderBy() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
 
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -1288,24 +1288,24 @@ public void test_construct_withSolutionModifiers_orderBy() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTDescribeOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTDescribeOptimizer.java
index 53a70b3285..2eb3bd6fe2 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTDescribeOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTDescribeOptimizer.java
@@ -29,14 +29,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
 import com.bigdata.rdf.model.BigdataStatementImpl;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -95,7 +95,7 @@ public void test_describeOptimizer_iri_only() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
             
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -160,17 +160,17 @@ public void test_describeOptimizer_iri_only() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
@@ -310,7 +310,7 @@ public void test_describeOptimizer_iri_only_describeMode_forwardOneStep() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
             
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -375,17 +375,17 @@ public void test_describeOptimizer_iri_only_describeMode_forwardOneStep() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
@@ -528,7 +528,7 @@ public void test_describeOptimizer_iri_only_describeMode_CBD() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
             
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -593,24 +593,24 @@ public void test_describeOptimizer_iri_only_describeMode_CBD() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI rdfSubject = f.createURI(RDF.SUBJECT.toString());
+        final BigdataIRI rdfSubject = f.createURI(RDF.SUBJECT.toString());
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -754,7 +754,7 @@ public void test_describeOptimizer_iri_and_var() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
             
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -819,24 +819,24 @@ public void test_describeOptimizer_iri_and_var() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
@@ -998,7 +998,7 @@ public void test_describeOptimizer_star() {
         // Add some data.
         {
 
-            final BigdataURI g = f.createURI("http://www.bigdata.com");
+            final BigdataIRI g = f.createURI("http://www.bigdata.com");
             
             final BigdataStatement[] stmts = new BigdataStatement[] {//
 
@@ -1063,24 +1063,24 @@ public void test_describeOptimizer_star() {
 
         }
 
-        final BigdataURI rdfType = f.createURI(RDF.TYPE.toString());
+        final BigdataIRI rdfType = f.createURI(RDF.TYPE.toString());
 
-        final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL.toString());
+        final BigdataIRI rdfsLabel = f.createURI(RDFS.LABEL.toString());
 
-        final BigdataURI foafPerson = f.createURI(FOAFVocabularyDecl.Person
+        final BigdataIRI foafPerson = f.createURI(FOAFVocabularyDecl.Person
                 .toString());
 
-        final BigdataURI mikeURI = f
+        final BigdataIRI mikeURI = f
                 .createURI("http://www.bigdata.com/Mike");
 
-        final BigdataURI bryanURI = f
+        final BigdataIRI bryanURI = f
                 .createURI("http://www.bigdata.com/Bryan");
 
         final BigdataLiteral mikeLabel = f.createLiteral("Mike");
 
         final BigdataLiteral bryanLabel = f.createLiteral("Bryan");
 
-        final BigdataURI dcURI = f.createURI("http://www.bigdata.com/DC");
+        final BigdataIRI dcURI = f.createURI("http://www.bigdata.com/DC");
 
         final BigdataValue[] values = new BigdataValue[] { rdfType,
                 rdfsLabel, foafPerson, mikeURI, bryanURI, mikeLabel,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTEmptyGroupOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTEmptyGroupOptimizer.java
index a9a2157644..950909a7ea 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTEmptyGroupOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTEmptyGroupOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,12 +27,12 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFilterNormalizationOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFilterNormalizationOptimizer.java
index 8feed30d8e..0fd6d45a1f 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFilterNormalizationOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFilterNormalizationOptimizer.java
@@ -29,12 +29,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.bindingSet.ListBindingSet;
 import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -336,7 +336,7 @@ public void testSimpleConjunctiveFilter() {
         * Note: DO NOT share structures in this test!!!!
         */
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI testUri = f.createURI("http://www.test.com");
+      final BigdataIRI testUri = f.createURI("http://www.test.com");
 
       final IV test = makeIV(testUri);
       
@@ -1683,7 +1683,7 @@ public void testRemoveDuplicateGeneratedFilter() {
        * Note: DO NOT share structures in this test!!!!
        */
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI testUri = f.createURI("http://www.test.com");
+      final BigdataIRI testUri = f.createURI("http://www.test.com");
 
       final IV test = makeIV(testUri);
       
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFlattenUnionsOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFlattenUnionsOptimizer.java
index d18e296cec..e0d55a3b2c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFlattenUnionsOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFlattenUnionsOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,8 +27,8 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFulltextSearchOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFulltextSearchOptimizer.java
index 1cfcd65ee6..3d7e8ff684 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFulltextSearchOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTFulltextSearchOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.bindingSet.ListBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTGraphGroupOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTGraphGroupOptimizer.java
index 6b1f49b41f..4d95082a68 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTGraphGroupOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTGraphGroupOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,12 +27,12 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.Constant;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
@@ -111,9 +111,9 @@ public void test_graphGroupOptimizer_01() throws MalformedQueryException {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI p = f.createURI("http://example.org/p");
-        final BigdataURI p2= f.createURI("http://example.org/p2");
-        final BigdataURI o = f.createURI("http://example.org/o");
+        final BigdataIRI p = f.createURI("http://example.org/p");
+        final BigdataIRI p2= f.createURI("http://example.org/p2");
+        final BigdataIRI o = f.createURI("http://example.org/o");
         final BigdataValue[] values = new BigdataValue[] { p, p2, o };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
@@ -210,9 +210,9 @@ public void test_graphGroupOptimizer_02() throws MalformedQueryException {
         * the verify it using equals().
         */
        final BigdataValueFactory f = store.getValueFactory();
-       final BigdataURI p = f.createURI("http://example.org/p");
-       final BigdataURI p2= f.createURI("http://example.org/p2");
-       final BigdataURI o = f.createURI("http://example.org/o");
+       final BigdataIRI p = f.createURI("http://example.org/p");
+       final BigdataIRI p2= f.createURI("http://example.org/p2");
+       final BigdataIRI o = f.createURI("http://example.org/o");
        final BigdataValue[] values = new BigdataValue[] { p, p2, o };
        store.getLexiconRelation()
                .addTerms(values, values.length, false/* readOnly */);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTHashJoinOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTHashJoinOptimizer.java
index 213650b985..482d10958a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTHashJoinOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTHashJoinOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,13 +27,13 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -125,18 +125,18 @@ public void test_hashJoinOptimizer_BSBM_Q5() {
 
         final String productInstance = "http://www4.wiwiss.fu-berlin.de/bizer/bsbm/v01/instances/dataFromProducer1/Product22";
         
-        final BigdataURI rdfsLabel = valueFactory.createURI(rdfs + "label");
+        final BigdataIRI rdfsLabel = valueFactory.createURI(rdfs + "label");
 
-        final BigdataURI productFeature = valueFactory.createURI(bsbm
+        final BigdataIRI productFeature = valueFactory.createURI(bsbm
                 + "productFeature");
 
-        final BigdataURI productPropertyNumeric1 = valueFactory.createURI(bsbm
+        final BigdataIRI productPropertyNumeric1 = valueFactory.createURI(bsbm
                 + "productPropertyNumeric1");
 
-        final BigdataURI productPropertyNumeric2 = valueFactory.createURI(bsbm
+        final BigdataIRI productPropertyNumeric2 = valueFactory.createURI(bsbm
                 + "productPropertyNumeric2");
 
-        final BigdataURI product53999 = valueFactory.createURI(productInstance);
+        final BigdataIRI product53999 = valueFactory.createURI(productInstance);
         
         final BigdataLiteral _120 = valueFactory.createLiteral("120",
                 XSD.INTEGER);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTNamedSubqueryOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTNamedSubqueryOptimizer.java
index 4bbc054c64..b49ef196e3 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTNamedSubqueryOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTNamedSubqueryOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,10 +29,10 @@
 
 import java.util.LinkedHashSet;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IVariable;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTOrderByAggregateFlatteningOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTOrderByAggregateFlatteningOptimizer.java
index 31334c7607..8692f7e507 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTOrderByAggregateFlatteningOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTOrderByAggregateFlatteningOptimizer.java
@@ -53,7 +53,7 @@
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertSame;
 import static junit.framework.TestCase.assertTrue;
-import org.openrdf.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
 
 /**
  * Test suite for {@link ASTOrderByAggregateFlatteningOptimizer}. All test
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTQueryHintOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTQueryHintOptimizer.java
index 2b1d1bde20..8391be4bc3 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTQueryHintOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTQueryHintOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,11 +29,11 @@
 
 import java.util.Collections;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BufferAnnotations;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRangeOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRangeOptimizer.java
index 1e22172fa0..d11ddb53fc 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRangeOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRangeOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRunFirstRunLastOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRunFirstRunLastOptimizer.java
index 88f198a849..e4f185b828 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRunFirstRunLastOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTRunFirstRunLastOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,8 +27,8 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSearchOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSearchOptimizer.java
index c3919a0662..37835fd41f 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSearchOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSearchOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.bindingSet.ListBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTServiceNodeOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTServiceNodeOptimizer.java
index a6d209461b..b28f721dcc 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTServiceNodeOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTServiceNodeOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.bindingSet.ListBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSetValueExpressionOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSetValueExpressionOptimizer.java
index 7dccca17b4..d85332410b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSetValueExpressionOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSetValueExpressionOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,7 +29,7 @@
 
 import java.util.UUID;
 
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOpContext;
 import com.bigdata.bop.Constant;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSimpleOptionalOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSimpleOptionalOptimizer.java
index 901e5292ea..18e9a2903a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSimpleOptionalOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSimpleOptionalOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,12 +31,12 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.BOpUtility;
 import com.bigdata.bop.Constant;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
@@ -194,8 +194,8 @@ public void test_sparql_bev_5() throws Exception {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI p = f.createURI("http://example.org/ns#p");
-        final BigdataURI q = f.createURI("http://example.org/ns#q");
+        final BigdataIRI p = f.createURI("http://example.org/ns#p");
+        final BigdataIRI q = f.createURI("http://example.org/ns#q");
         final BigdataValue[] values = new BigdataValue[] { p, q };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
@@ -281,8 +281,8 @@ public void test_sparql_bev_5_withFilterInOptionalGroup() throws Exception {
          * the verify it using equals().
          */
         final BigdataValueFactory f = store.getValueFactory();
-        final BigdataURI p = f.createURI("http://example.org/ns#p");
-        final BigdataURI q = f.createURI("http://example.org/ns#q");
+        final BigdataIRI p = f.createURI("http://example.org/ns#p");
+        final BigdataIRI q = f.createURI("http://example.org/ns#q");
         final BigdataValue[] values = new BigdataValue[] { p, q };
         store.getLexiconRelation()
                 .addTerms(values, values.length, false/* readOnly */);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSparql11SubqueryOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSparql11SubqueryOptimizer.java
index 7cf3673491..8007df259c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSparql11SubqueryOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSparql11SubqueryOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,9 +30,9 @@
 import java.util.Collections;
 import java.util.LinkedList;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticBindingsOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticBindingsOptimizer.java
index 56fe221ae6..fa64ecc664 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticBindingsOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticBindingsOptimizer.java
@@ -30,8 +30,8 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
@@ -43,7 +43,7 @@
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -286,7 +286,7 @@ public void testMultiInlineFromExogeneousBindings() {
    public void testInlineFromBind() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -378,7 +378,7 @@ public void testInlineFromBind() {
    public void testInlineFromBindNested1() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -476,7 +476,7 @@ public void testInlineFromBindNested1() {
    public void testInlineFromBindNested2() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -573,7 +573,7 @@ public void testInlineFromBindNested2() {
    public void testInlineFromTopLevelValues() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -676,7 +676,7 @@ public void testInlineFromTopLevelValues() {
    public void testInlineFromValues() {
 
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -1157,7 +1157,7 @@ public void testSimpleSameTermFilter() {
    public void testInlineSimpleFilterEqURI() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI fooLit = f.createURI(":foo");
+      final BigdataIRI fooLit = f.createURI(":foo");
 
       final IV foo = makeIV(fooLit);
       
@@ -1250,7 +1250,7 @@ public void testInlineSimpleFilterEqURI() {
    public void testInlineSimpleFilterINURI() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI fooLit = f.createURI(":foo");
+      final BigdataIRI fooLit = f.createURI(":foo");
 
       final IV foo = makeIV(fooLit);
       
@@ -1327,7 +1327,7 @@ public void testInlineSimpleFilterINURI() {
    public void testInlineSimpleFilterEqURIRev() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI fooLit = f.createURI(":foo");
+      final BigdataIRI fooLit = f.createURI(":foo");
 
       final IV foo = makeIV(fooLit);
       
@@ -1785,7 +1785,7 @@ public void testValuesComplexExogeneousMappingInSubquery() {
    public void testInlineFromBindInFilter() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
 
       final IV cTest = makeIV(cTestUri);
       
@@ -1878,8 +1878,8 @@ public void testInlineFromBindInFilter() {
    public void testInlineFromBindInComplexFilter() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
-      final BigdataURI cTestUri2 = f.createURI("http://www.test2.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri2 = f.createURI("http://www.test2.com");
 
       final IV cTest = makeIV(cTestUri);
       final IV cTest2 = makeIV(cTestUri2);
@@ -1992,8 +1992,8 @@ public void testInlineFromBindInComplexFilter() {
    public void testInlineWithSubquery() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
-      final BigdataURI cTestUri2 = f.createURI("http://www.test2.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri2 = f.createURI("http://www.test2.com");
 
       final IV cTest = makeIV(cTestUri);
       final IV cTest2 = makeIV(cTestUri2);
@@ -2140,7 +2140,7 @@ public void testInlineWithSubquery() {
    public void testSubqueryWithValues() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI c1BD = f.createURI("http://www.test.com");
+      final BigdataIRI c1BD = f.createURI("http://www.test.com");
       final BigdataLiteral c2BD = f.createLiteral("X");
       final BigdataLiteral c3BD = f.createLiteral("Y");
 
@@ -2309,9 +2309,9 @@ public void testSubqueryWithValues() {
    public void testTicket653() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.yso.fi/onto/ysa/Y141994");
-      final BigdataURI rdfTypeUri = f.createURI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
-      final BigdataURI rdfsLabelUri = f.createURI("http://www.w3.org/2000/01/rdf-schema#label");
+      final BigdataIRI cTestUri = f.createURI("http://www.yso.fi/onto/ysa/Y141994");
+      final BigdataIRI rdfTypeUri = f.createURI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+      final BigdataIRI rdfsLabelUri = f.createURI("http://www.w3.org/2000/01/rdf-schema#label");
       
       final IV cTest = makeIV(cTestUri);
       final IV rdfType = makeIV(cTestUri);
@@ -2428,7 +2428,7 @@ public void testTicket653() {
    public void testTicketBLZG2042() {
       
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI cTestUri = f.createURI("http://www.test.com");
+      final BigdataIRI cTestUri = f.createURI("http://www.test.com");
       final BigdataValue bv1 = store.getValueFactory().asValue(new URIImpl("http://p1"));
       final BigdataValue bv2 = store.getValueFactory().asValue(new URIImpl("http://p2"));
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java
index ecffc33d47..2862cff3d1 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,9 +30,9 @@
 import static com.bigdata.rdf.sparql.ast.optimizers.AbstractOptimizerTestCase.HelperFlag.DISTINCT;
 import static com.bigdata.rdf.sparql.ast.optimizers.AbstractOptimizerTestCase.HelperFlag.OPTIONAL;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSubGroupJoinVarOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSubGroupJoinVarOptimizer.java
index f97d1794b1..1d9622b321 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSubGroupJoinVarOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTSubGroupJoinVarOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,11 +29,11 @@
 
 import java.util.Collections;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IVariable;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTUnionFiltersOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTUnionFiltersOptimizer.java
index 4f390397a2..7c084437ab 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTUnionFiltersOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTUnionFiltersOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,8 +27,8 @@
 
 package com.bigdata.rdf.sparql.ast.optimizers;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTWildcardProjectionOptimizer.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTWildcardProjectionOptimizer.java
index 3dc2b2d7f5..7fb0e45b6a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTWildcardProjectionOptimizer.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestASTWildcardProjectionOptimizer.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,8 +29,8 @@
 
 import java.util.Collections;
 
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestIVariableBindingRequirements.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestIVariableBindingRequirements.java
index 86a5625b21..39285d6d2e 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestIVariableBindingRequirements.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/optimizers/TestIVariableBindingRequirements.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -43,7 +43,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
@@ -612,7 +612,7 @@ public void testComplexJoinGroup02() {
     public void testServiceSparql11Constant() {
        
       final BigdataValueFactory f = store.getValueFactory();
-      final BigdataURI serviceEndpoint = f.createURI("http://custom.endpoint");
+      final BigdataIRI serviceEndpoint = f.createURI("http://custom.endpoint");
       final IV serviceEndpointIV = makeIV(serviceEndpoint);
       
       final BigdataValue[] values = new BigdataValue[] { serviceEndpoint };       
@@ -678,10 +678,10 @@ public void testServiceSparql11Variable() {
     public void testServiceBDS() {
        
        final BigdataValueFactory f = store.getValueFactory();
-       final BigdataURI bdsSearch = f.createURI(BDS.NAMESPACE + "search");
-       final BigdataURI predSearch = f.createURI(BDS.SEARCH.toString());
-       final BigdataURI predSearchTimeout = f.createURI(BDS.SEARCH_TIMEOUT.toString());
-       final BigdataURI predMatchExact = f.createURI(BDS.MATCH_EXACT.toString());
+       final BigdataIRI bdsSearch = f.createURI(BDS.NAMESPACE + "search");
+       final BigdataIRI predSearch = f.createURI(BDS.SEARCH.toString());
+       final BigdataIRI predSearchTimeout = f.createURI(BDS.SEARCH_TIMEOUT.toString());
+       final BigdataIRI predMatchExact = f.createURI(BDS.MATCH_EXACT.toString());
        
        final BigdataValue[] values = 
           new BigdataValue[] { bdsSearch, predSearch, predSearchTimeout, predMatchExact };       
@@ -718,18 +718,18 @@ public void testServiceBDS() {
    public void testServiceFTS() {
        
        final BigdataValueFactory f = store.getValueFactory();
-       final BigdataURI ftsSearch = f.createURI(FTS.NAMESPACE + "search");
-       final BigdataURI predSearch = f.createURI(FTS.SEARCH.toString());
-       final BigdataURI predEndpoint = f.createURI(FTS.ENDPOINT.toString());
-       final BigdataURI predEndpointType = f.createURI(FTS.ENDPOINT_TYPE.toString());
-       final BigdataURI predParams = f.createURI(FTS.PARAMS.toString());
-       final BigdataURI predScore = f.createURI(FTS.SCORE.toString());
-       final BigdataURI predScoreField = f.createURI(FTS.SCORE_FIELD.toString());
-       final BigdataURI predSearchField = f.createURI(FTS.SEARCH_FIELD.toString());
-       final BigdataURI predSnippet = f.createURI(FTS.SNIPPET.toString());
-       final BigdataURI predSnippetField = f.createURI(FTS.SNIPPET_FIELD.toString());
-       final BigdataURI predTimeout = f.createURI(FTS.TIMEOUT.toString());
-       final BigdataURI predSearchResultType = f.createURI(FTS.SEARCH_RESULT_TYPE.toString());
+       final BigdataIRI ftsSearch = f.createURI(FTS.NAMESPACE + "search");
+       final BigdataIRI predSearch = f.createURI(FTS.SEARCH.toString());
+       final BigdataIRI predEndpoint = f.createURI(FTS.ENDPOINT.toString());
+       final BigdataIRI predEndpointType = f.createURI(FTS.ENDPOINT_TYPE.toString());
+       final BigdataIRI predParams = f.createURI(FTS.PARAMS.toString());
+       final BigdataIRI predScore = f.createURI(FTS.SCORE.toString());
+       final BigdataIRI predScoreField = f.createURI(FTS.SCORE_FIELD.toString());
+       final BigdataIRI predSearchField = f.createURI(FTS.SEARCH_FIELD.toString());
+       final BigdataIRI predSnippet = f.createURI(FTS.SNIPPET.toString());
+       final BigdataIRI predSnippetField = f.createURI(FTS.SNIPPET_FIELD.toString());
+       final BigdataIRI predTimeout = f.createURI(FTS.TIMEOUT.toString());
+       final BigdataIRI predSearchResultType = f.createURI(FTS.SEARCH_RESULT_TYPE.toString());
        
        final BigdataValue[] values = 
           new BigdataValue[] { 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java
index b6e30f3a02..96a7db6daa 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/sparql/ast/service/storedquery/TestStoredQueryService.java
@@ -26,10 +26,10 @@
  */
 package com.bigdata.rdf.sparql.ast.service.storedquery;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.rdf.sail.BigdataSailRepositoryConnection;
 import com.bigdata.rdf.sail.BigdataSailTupleQuery;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPO.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPO.java
index 709d3145fb..d3c958670b 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPO.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPO.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,7 +33,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
 import com.bigdata.rdf.internal.impl.TermId;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.StatementEnum;
 
 /**
@@ -63,9 +63,9 @@ public void test1() {
 
     public void test_serializable() {
 
-    	final IV s = new TermId(VTE.URI, 1);
-    	final IV p = new TermId(VTE.URI, 2);
-    	final IV o = new TermId(VTE.URI, 3);
+    	final IV s = new TermId(VTE.URI, 1);
+    	final IV p = new TermId(VTE.URI, 2);
+    	final IV o = new TermId(VTE.URI, 3);
     	
     	final SPO expected = new SPO(s, p, o);
     	
@@ -75,9 +75,9 @@ public void test_serializable() {
     
     public void test_serializable_sidIV() {
 
-    	final IV s = new TermId(VTE.URI, 1);
-    	final IV p = new TermId(VTE.URI, 2);
-    	final IV o = new TermId(VTE.URI, 3);
+    	final IV s = new TermId(VTE.URI, 1);
+    	final IV p = new TermId(VTE.URI, 2);
+    	final IV o = new TermId(VTE.URI, 3);
     	
     	final SPO expected = new SPO(s, p, o, StatementEnum.Explicit);
     	
@@ -87,8 +87,8 @@ public void test_serializable_sidIV() {
     	
     	doRoundTripTest(expected);
 
-    	final IV p1 = new TermId(VTE.URI, 4);
-    	final IV o1 = new TermId(VTE.URI, 5);
+    	final IV p1 = new TermId(VTE.URI, 4);
+    	final IV o1 = new TermId(VTE.URI, 5);
     	
 		final SPO expected2 = new SPO(expected.c(), p1, o1,
 				StatementEnum.Explicit);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOAccessPath.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOAccessPath.java
index 2cc55650ff..d898b8d38a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOAccessPath.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOAccessPath.java
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.spo;
 
-import org.openrdf.model.Statement;
+import org.eclipse.rdf4j.model.Statement;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
@@ -36,7 +36,7 @@
 import com.bigdata.bop.Var;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.VTE;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.StatementBuffer;
@@ -206,12 +206,12 @@ public void test_sameVariableConstraint_triples() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI s1 = f.createURI("http://www.bigdata.com/rdf#s1");
-            final BigdataURI s2 = f.createURI("http://www.bigdata.com/rdf#s2");
-            final BigdataURI p1 = f.createURI("http://www.bigdata.com/rdf#p1");
-            final BigdataURI o1 = f.createURI("http://www.bigdata.com/rdf#o1");
-            final BigdataURI p2 = f.createURI("http://www.bigdata.com/rdf#p2");
-            final BigdataURI o2 = f.createURI("http://www.bigdata.com/rdf#o2");
+            final BigdataIRI s1 = f.createURI("http://www.bigdata.com/rdf#s1");
+            final BigdataIRI s2 = f.createURI("http://www.bigdata.com/rdf#s2");
+            final BigdataIRI p1 = f.createURI("http://www.bigdata.com/rdf#p1");
+            final BigdataIRI o1 = f.createURI("http://www.bigdata.com/rdf#o1");
+            final BigdataIRI p2 = f.createURI("http://www.bigdata.com/rdf#p2");
+            final BigdataIRI o2 = f.createURI("http://www.bigdata.com/rdf#o2");
 
             {
 
@@ -313,13 +313,13 @@ public void test_sameVariableConstraint_quads() {
             
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI graphA = f.createURI("http://www.bigdata.com/graphA");
-            final BigdataURI graphB = f.createURI("http://www.bigdata.com/graphB");
-            final BigdataURI s = f.createURI("http://www.bigdata.com/rdf#s");
-            final BigdataURI p1 = f.createURI("http://www.bigdata.com/rdf#p1");
-            final BigdataURI o1 = f.createURI("http://www.bigdata.com/rdf#o1");
-            final BigdataURI p2 = f.createURI("http://www.bigdata.com/rdf#p2");
-            final BigdataURI o2 = f.createURI("http://www.bigdata.com/rdf#o2");
+            final BigdataIRI graphA = f.createURI("http://www.bigdata.com/graphA");
+            final BigdataIRI graphB = f.createURI("http://www.bigdata.com/graphB");
+            final BigdataIRI s = f.createURI("http://www.bigdata.com/rdf#s");
+            final BigdataIRI p1 = f.createURI("http://www.bigdata.com/rdf#p1");
+            final BigdataIRI o1 = f.createURI("http://www.bigdata.com/rdf#o1");
+            final BigdataIRI p2 = f.createURI("http://www.bigdata.com/rdf#p2");
+            final BigdataIRI o2 = f.createURI("http://www.bigdata.com/rdf#o2");
 
             {
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOStarJoin.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOStarJoin.java
index 52e5f104db..b829cfa162 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOStarJoin.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/spo/TestSPOStarJoin.java
@@ -5,10 +5,10 @@
 import java.util.LinkedList;
 import java.util.Properties;
 
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryEvaluationException;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
index a81cb82c4f..9090ffa96d 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
@@ -43,10 +43,10 @@
 import junit.framework.TestCase;
 import junit.framework.TestCase2;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.rio.RDFHandler;
-import org.openrdf.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.rio.RDFHandler;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
 
 import com.bigdata.btree.IIndex;
 import com.bigdata.btree.ITupleIterator;
@@ -63,7 +63,7 @@
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.IVUtility;
 import com.bigdata.rdf.model.BigdataResource;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueSerializer;
 import com.bigdata.rdf.model.StatementEnum;
@@ -1153,7 +1153,7 @@ private void verifyStatements(final int n, final Statement[] a) {
                     final BigdataResource s = (BigdataResource) db
                             .asValue(termSet.get(stmt.getSubject()));
 
-                    final BigdataURI p = (BigdataURI) db.asValue(termSet
+                    final BigdataIRI p = (BigdataIRI) db.asValue(termSet
                             .get(stmt.getPredicate()));
 
                     final BigdataValue o = (BigdataValue) db.asValue(termSet
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/StressTestCentos.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/StressTestCentos.java
index 9206948648..5fd7c344c0 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/StressTestCentos.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/StressTestCentos.java
@@ -5,7 +5,7 @@
 import com.bigdata.journal.TimestampUtility;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.rdf.vocab.NoVocabulary;
@@ -67,18 +67,18 @@ public void test_stress() {
                 StatementBuffer sb = new StatementBuffer(
                         store, 20000);
                 
-                BigdataURI g = store.getValueFactory().createURI(
+                BigdataIRI g = store.getValueFactory().createURI(
                         "http://test/g" + k);
 
                 for (int l = 0; l < M; l++) {
 
-                    BigdataURI s = store.getValueFactory().createURI(
+                    BigdataIRI s = store.getValueFactory().createURI(
                             "http://test/s" + (l % 99));
                     
-                    BigdataURI p = store.getValueFactory().createURI(
+                    BigdataIRI p = store.getValueFactory().createURI(
                             "http://test/p" + (l % 37));
                     
-                    BigdataURI o = store.getValueFactory().createURI(
+                    BigdataIRI o = store.getValueFactory().createURI(
                             "http://test/o" + (l % 399));
                     
                     sb.add(store.getValueFactory().createStatement(s, p, o, g,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestBulkFilter.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestBulkFilter.java
index 11eab5e5cd..a5b002baa6 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestBulkFilter.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestBulkFilter.java
@@ -28,8 +28,8 @@
 
 package com.bigdata.rdf.store;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.spo.ISPO;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestDataLoader.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestDataLoader.java
index 0b717fe14c..84a144dd53 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestDataLoader.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestDataLoader.java
@@ -31,8 +31,8 @@
 import java.nio.file.Files;
 import java.util.Properties;
 
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.rdf.store.DataLoader.ClosureEnum;
 import com.bigdata.rdf.store.DataLoader.CommitEnum;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInlineURIs.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInlineURIs.java
index b27e3b10ec..99af7f0b33 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInlineURIs.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInlineURIs.java
@@ -32,8 +32,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.DTE;
@@ -55,7 +55,7 @@
 import com.bigdata.rdf.internal.impl.uri.URIExtensionIV;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.rdf.sail.BigdataSail;
@@ -111,9 +111,9 @@ public void testInlineUUIDs() throws Exception {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-			final BigdataURI uri1 = vf.createURI("urn:uuid:" + UUID.randomUUID().toString());
-			final BigdataURI uri2 = vf.createURI("urn:uuid:" + UUID.randomUUID().toString());
-			final BigdataURI uri3 = vf.createURI("urn:uuid:foo");
+			final BigdataIRI uri1 = vf.createURI("urn:uuid:" + UUID.randomUUID().toString());
+			final BigdataIRI uri2 = vf.createURI("urn:uuid:" + UUID.randomUUID().toString());
+			final BigdataIRI uri3 = vf.createURI("urn:uuid:foo");
 
 			final StatementBuffer sb = new StatementBuffer(store, 10/* capacity */);
 
@@ -147,10 +147,10 @@ public void testInlineIPv4s() throws Exception {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-            final BigdataURI uri1 = vf.createURI("urn:ipv4:10.128.1.2");
-            final BigdataURI uri2 = vf.createURI("urn:ipv4:10.128.1.2/24");
-            final BigdataURI uri3 = vf.createURI("urn:ipv4:500.425.1.2");
-            final BigdataURI uri4 = vf.createURI("urn:ipv4");
+            final BigdataIRI uri1 = vf.createURI("urn:ipv4:10.128.1.2");
+            final BigdataIRI uri2 = vf.createURI("urn:ipv4:10.128.1.2/24");
+            final BigdataIRI uri3 = vf.createURI("urn:ipv4:500.425.1.2");
+            final BigdataIRI uri4 = vf.createURI("urn:ipv4");
 
             final BigdataLiteral l = vf.createLiteral("10.128.1.2", XSD.IPV4);
             
@@ -195,9 +195,9 @@ public void testCustomUUIDNamespace() throws Exception {
         
                 final BigdataValueFactory vf = store.getValueFactory();
 
-                final BigdataURI uri1 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
-                final BigdataURI uri2 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
-                final BigdataURI uri3 = vf.createURI(CUSTOM_NAMESPACE + "foo");
+                final BigdataIRI uri1 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
+                final BigdataIRI uri2 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
+                final BigdataIRI uri3 = vf.createURI(CUSTOM_NAMESPACE + "foo");
     
     			final StatementBuffer sb = new StatementBuffer(store, 10/* capacity */);
 
@@ -283,12 +283,12 @@ private void uriRoundtripTestCase(final Object... options) throws Exception {
 		try {
         
 			final BigdataValueFactory vf = store.getValueFactory();
-			final ArrayList uris = new ArrayList<>();
+			final ArrayList uris = new ArrayList<>();
 			{
 				final StatementBuffer sb = new StatementBuffer(store,
 						10/* capacity */);
 				for (int i = 0; i < options.length; i += 2) {
-					final BigdataURI uri = vf.createURI((String) options[i]);
+					final BigdataIRI uri = vf.createURI((String) options[i]);
 					uris.add(uri);
 					sb.add(uri, RDF.TYPE, vf.createLiteral("doesn't matter"));
 				}
@@ -305,7 +305,7 @@ private void uriRoundtripTestCase(final Object... options) throws Exception {
 				
 				final boolean isInline = (Boolean) options[i + 1];
 
-				final BigdataURI uri = uris.get(j);
+				final BigdataIRI uri = uris.get(j);
 
 				assertEquals("String representation different for:  " + givenOption, givenOption, uri.stringValue());
 
@@ -336,13 +336,13 @@ public void testMultipurposeIDNamespace() throws Exception {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-			final BigdataURI uri1 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
-			final BigdataURI uri2 = vf.createURI(CUSTOM_NAMESPACE + "1");
-			final BigdataURI uri3 = vf.createURI(CUSTOM_NAMESPACE + Short.MAX_VALUE);
-			final BigdataURI uri4 = vf.createURI(CUSTOM_NAMESPACE + Integer.MAX_VALUE);
-			final BigdataURI uri5 = vf.createURI(CUSTOM_NAMESPACE + Long.MAX_VALUE);
-			final BigdataURI uri6 = vf.createURI(CUSTOM_NAMESPACE + "2.3");
-			final BigdataURI uri7 = vf.createURI(CUSTOM_NAMESPACE + "foo");
+			final BigdataIRI uri1 = vf.createURI(CUSTOM_NAMESPACE + UUID.randomUUID().toString());
+			final BigdataIRI uri2 = vf.createURI(CUSTOM_NAMESPACE + "1");
+			final BigdataIRI uri3 = vf.createURI(CUSTOM_NAMESPACE + Short.MAX_VALUE);
+			final BigdataIRI uri4 = vf.createURI(CUSTOM_NAMESPACE + Integer.MAX_VALUE);
+			final BigdataIRI uri5 = vf.createURI(CUSTOM_NAMESPACE + Long.MAX_VALUE);
+			final BigdataIRI uri6 = vf.createURI(CUSTOM_NAMESPACE + "2.3");
+			final BigdataIRI uri7 = vf.createURI(CUSTOM_NAMESPACE + "foo");
 
 			{
 				final StatementBuffer sb = new StatementBuffer(store,
@@ -361,7 +361,7 @@ public void testMultipurposeIDNamespace() throws Exception {
 					log.debug(store.dumpStore());
 			}
 
-			for (BigdataURI uri : new BigdataURI[] { uri1, uri2, uri3, uri4, uri5, uri6, uri7 }) {
+			for (BigdataIRI uri : new BigdataIRI[] { uri1, uri2, uri3, uri4, uri5, uri6, uri7 }) {
 
 				assertTrue(uri.getIV().isInline());
 				
@@ -417,7 +417,7 @@ public void testInlineArray() throws Exception {
             }
             sb.setLength(sb.length()-1);
             
-            final BigdataURI uri1 = vf.createURI(sb.toString());
+            final BigdataIRI uri1 = vf.createURI(sb.toString());
 
             {
                 final StatementBuffer buf = new StatementBuffer(store,
@@ -430,7 +430,7 @@ public void testInlineArray() throws Exception {
                     log.debug(store.dumpStore());
             }
 
-            for (BigdataURI uri : new BigdataURI[] { uri1 }) {
+            for (BigdataIRI uri : new BigdataIRI[] { uri1 }) {
 
                 assertTrue(uri.getIV().isInline());
                 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInsertRate.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInsertRate.java
index 8c720918a5..4bf4d4636c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInsertRate.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestInsertRate.java
@@ -28,10 +28,10 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.util.BytesUtil.UnsignedByteArrayComparator;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestIsModified.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestIsModified.java
index cc334f4b39..25b8844dc8 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestIsModified.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestIsModified.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,12 +29,12 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -87,17 +87,17 @@ public void test_reportMutation() {
 
             final BigdataValueFactory valueFactory = store.getValueFactory();
 
-            final BigdataURI x = valueFactory.createURI("http://www.foo.org/x");
-            final BigdataURI y = valueFactory.createURI("http://www.foo.org/y");
-            final BigdataURI z = valueFactory.createURI("http://www.foo.org/z");
+            final BigdataIRI x = valueFactory.createURI("http://www.foo.org/x");
+            final BigdataIRI y = valueFactory.createURI("http://www.foo.org/y");
+            final BigdataIRI z = valueFactory.createURI("http://www.foo.org/z");
 
-            final BigdataURI A = valueFactory.createURI("http://www.foo.org/A");
-            final BigdataURI B = valueFactory.createURI("http://www.foo.org/B");
-            final BigdataURI C = valueFactory.createURI("http://www.foo.org/C");
+            final BigdataIRI A = valueFactory.createURI("http://www.foo.org/A");
+            final BigdataIRI B = valueFactory.createURI("http://www.foo.org/B");
+            final BigdataIRI C = valueFactory.createURI("http://www.foo.org/C");
 
-            final BigdataURI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
+            final BigdataIRI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
 
-            final BigdataURI rdfsSubClassOf = valueFactory.createURI(RDFS.SUBCLASSOF.stringValue());
+            final BigdataIRI rdfsSubClassOf = valueFactory.createURI(RDFS.SUBCLASSOF.stringValue());
 
             // resolve term identifiers.
             store.addTerms(new BigdataValue[] { x, y, z, A, B, C, rdfType,
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
index dc52d503ce..b60a409c47 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
@@ -3,14 +3,14 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.model.Statement;
+import org.eclipse.rdf4j.model.Statement;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.journal.ITransactionService;
 import com.bigdata.journal.ITx;
 import com.bigdata.journal.Journal;
 import com.bigdata.rdf.axioms.NoAxioms;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -306,10 +306,10 @@ public void test_txIsolation() throws IOException {
             
             final BigdataValueFactory f = unisolatedStore.getValueFactory();
 
-            final BigdataURI john = f.createURI("http://www.bigdata.com/john");
-            final BigdataURI loves = f
+            final BigdataIRI john = f.createURI("http://www.bigdata.com/john");
+            final BigdataIRI loves = f
                     .createURI("http://www.bigdata.com/loves");
-            final BigdataURI mary = f.createURI("http://www.bigdata.com/mary");
+            final BigdataIRI mary = f.createURI("http://www.bigdata.com/mary");
 
             final BigdataValue[] terms = new BigdataValue[] {
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestRestartSafe.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestRestartSafe.java
index 772e03e3ca..323c751c5c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestRestartSafe.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestRestartSafe.java
@@ -31,14 +31,14 @@
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.UUID;
-import org.openrdf.model.BNode;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.spo.SPOKeyOrder;
 import com.bigdata.rdf.vocab.NoVocabulary;
@@ -78,17 +78,17 @@ public void test_restartSafe() throws IOException {
             
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI x = f.createURI("http://www.foo.org/x");
-            final BigdataURI y = f.createURI("http://www.foo.org/y");
-            final BigdataURI z = f.createURI("http://www.foo.org/z");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z");
 
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
 
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
-            final BigdataURI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
 
             final BigdataLiteral lit1 = f.createLiteral("abc");
             final BigdataLiteral lit2 = f.createLiteral("abc", A);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestSharedLexiconTempStore.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestSharedLexiconTempStore.java
index 4ad94e7a74..cf822f20eb 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestSharedLexiconTempStore.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestSharedLexiconTempStore.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,7 +31,7 @@
 import java.util.Set;
 
 import com.bigdata.rdf.lexicon.LexiconRelation;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 
 /**
@@ -72,9 +72,9 @@ public void test_TempTripleStore_noLexicon() {
 
             final BigdataValueFactory vf = store.getValueFactory();
 
-            final BigdataURI uri1 = vf.createURI(uriString1);
+            final BigdataIRI uri1 = vf.createURI(uriString1);
 //            final BigdataURI uri2 = vf.createURI(uriString2);
-            final BigdataURI uri3 = vf.createURI(uriString3);
+            final BigdataIRI uri3 = vf.createURI(uriString3);
             
             // add term to lexicon.
             store.addTerm(uri1);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestStatementIdentifiers.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestStatementIdentifiers.java
index 07562f8a6e..3b5789f770 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestStatementIdentifiers.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestStatementIdentifiers.java
@@ -53,14 +53,14 @@ Portions Copyright (c) 2002-2003 Bryan Thompson.
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -123,17 +123,17 @@ public void test_statementIdentifiers() {
             
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI x = f.createURI("http://www.foo.org/x");
-            final BigdataURI y = f.createURI("http://www.foo.org/y");
-            final BigdataURI z = f.createURI("http://www.foo.org/z");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z");
     
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
     
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI rdfsLabel = f.asValue(RDFS.LABEL);
-            final BigdataURI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfsLabel = f.asValue(RDFS.LABEL);
+            final BigdataIRI rdfsSubClassOf = f.asValue(RDFS.SUBCLASSOF);
     
             final BigdataLiteral lit1 = f.createLiteral("abc");
             final BigdataLiteral lit2 = f.createLiteral("abc", A);
@@ -435,17 +435,17 @@ public void test_retractionOfStatementsAboutStatements() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI x = f.createURI("http://www.foo.org/x");
-            final BigdataURI y = f.createURI("http://www.foo.org/y");
-            final BigdataURI z = f.createURI("http://www.foo.org/z");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z");
     
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
     
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 //            final BigdataURI rdfsLabel = f.createURI(RDFS.LABEL);
-            final BigdataURI dcCreator = f.createURI("http://purl.org/dc/terms/creator");
+            final BigdataIRI dcCreator = f.createURI("http://purl.org/dc/terms/creator");
     
             BigdataLiteral lit1 = f.createLiteral("bryan");
             BigdataLiteral lit2 = f.createLiteral("mike");
@@ -552,16 +552,16 @@ public void test_retractionOfStatementsAboutStatements2() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI x = f.createURI("http://www.foo.org/x");
-            final BigdataURI y = f.createURI("http://www.foo.org/y");
-            final BigdataURI z = f.createURI("http://www.foo.org/z");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z");
     
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
     
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI dcCreator = f.createURI("http://purl.org/dc/terms/creator");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI dcCreator = f.createURI("http://purl.org/dc/terms/creator");
     
             final BigdataLiteral lit1 = f.createLiteral("bryan");
             final BigdataLiteral lit2 = f.createLiteral("mike");
@@ -744,8 +744,8 @@ public void test_correctRejection_cycles01() {
             }
 
             final BigdataValueFactory valueFactory = store.getValueFactory();
-            final BigdataURI A = valueFactory.createURI("http://www.foo.org/A");
-            final BigdataURI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
+            final BigdataIRI A = valueFactory.createURI("http://www.foo.org/A");
+            final BigdataIRI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
             final BigdataBNode sid1 = valueFactory.createBNode("_S1");
 
             /*
@@ -809,8 +809,8 @@ public void test_correctRejection_cycles02() {
             }
 
             final BigdataValueFactory valueFactory = store.getValueFactory();
-            final BigdataURI B = valueFactory.createURI("http://www.foo.org/B");
-            final BigdataURI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
+            final BigdataIRI B = valueFactory.createURI("http://www.foo.org/B");
+            final BigdataIRI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
             final BigdataBNode sid1 = valueFactory.createBNode("_S1");
             final BigdataBNode sid2 = valueFactory.createBNode("_S2");
 
@@ -882,10 +882,10 @@ public void test_correctRejection_unificationError() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI A = f.createURI("http://www.foo.org/A");
-            final BigdataURI B = f.createURI("http://www.foo.org/B");
-            final BigdataURI C = f.createURI("http://www.foo.org/C");
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI A = f.createURI("http://www.foo.org/A");
+            final BigdataIRI B = f.createURI("http://www.foo.org/B");
+            final BigdataIRI C = f.createURI("http://www.foo.org/C");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
             final BigdataBNode sid1 = f.createBNode("_S1");
 
             StatementBuffer buf = new StatementBuffer(store, 100/* capacity */);
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestTripleStore.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestTripleStore.java
index ef2c8072a0..dbc8f6cd5a 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestTripleStore.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/store/TestTripleStore.java
@@ -34,20 +34,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.IV;
@@ -56,7 +56,7 @@
 import com.bigdata.rdf.lexicon.Term2IdWriteProc;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
@@ -417,8 +417,8 @@ public void test_addTermsFiltersDuplicates() {
         try {
         
             final BigdataValueFactory valueFactory = store.getValueFactory();
-            final BigdataURI x = valueFactory.createURI("http://www.foo.org/x");
-            final BigdataURI y = valueFactory.createURI("http://www.foo.org/y");
+            final BigdataIRI x = valueFactory.createURI("http://www.foo.org/x");
+            final BigdataIRI y = valueFactory.createURI("http://www.foo.org/y");
             final BigdataLiteral z = valueFactory.createLiteral("z");
             final BigdataBNode b = valueFactory.createBNode();
             final BigdataBNode c = valueFactory.createBNode("_c");
@@ -488,8 +488,8 @@ public void test_addTermsFiltersAlreadyAssigned() {
         
             final BigdataValueFactory valueFactory = store.getValueFactory();
             
-            final BigdataURI x = valueFactory.createURI("http://www.foo.org/x");
-            final BigdataURI y = valueFactory.createURI("http://www.foo.org/y");
+            final BigdataIRI x = valueFactory.createURI("http://www.foo.org/x");
+            final BigdataIRI y = valueFactory.createURI("http://www.foo.org/y");
             final BigdataLiteral z = valueFactory.createLiteral("z");
             
             // add terms - lots of duplicates here.
@@ -538,8 +538,8 @@ public void test_addTermsFiltersAlreadyAssigned() {
              */
             {
 
-                final BigdataURI x1 = valueFactory.createURI("http://www.foo.org/x");
-                final BigdataURI y1 = valueFactory.createURI("http://www.foo.org/y");
+                final BigdataIRI x1 = valueFactory.createURI("http://www.foo.org/x");
+                final BigdataIRI y1 = valueFactory.createURI("http://www.foo.org/y");
                 final BigdataLiteral z1 = valueFactory.createLiteral("z");
                 
                 // add terms - lots of duplicates here.
@@ -987,10 +987,10 @@ public void test_addLookup_nativeAPI() {
                     store.getAccessPath(NULL,NULL,NULL).iterator());
             
             final BigdataValueFactory valueFactory = store.getValueFactory();
-            final BigdataURI A = valueFactory.createURI("http://www.bigdata.com/A");
-            final BigdataURI B = valueFactory.createURI("http://www.bigdata.com/B");
-            final BigdataURI C = valueFactory.createURI("http://www.bigdata.com/C");
-            final BigdataURI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
+            final BigdataIRI A = valueFactory.createURI("http://www.bigdata.com/A");
+            final BigdataIRI B = valueFactory.createURI("http://www.bigdata.com/B");
+            final BigdataIRI C = valueFactory.createURI("http://www.bigdata.com/C");
+            final BigdataIRI rdfType = valueFactory.createURI(RDF.TYPE.stringValue());
 
             store.addTerms(new BigdataValue[] { A, B, C, rdfType });
             
@@ -1198,10 +1198,10 @@ public void test_addRemove_nativeAPI() {
 
             final BigdataValueFactory f = store.getValueFactory();
             
-            final BigdataURI A = f.createURI("http://www.bigdata.com/A");
-            final BigdataURI B = f.createURI("http://www.bigdata.com/B");
-            final BigdataURI C = f.createURI("http://www.bigdata.com/C");
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI A = f.createURI("http://www.bigdata.com/A");
+            final BigdataIRI B = f.createURI("http://www.bigdata.com/B");
+            final BigdataIRI C = f.createURI("http://www.bigdata.com/C");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
             
             // assign term identifiers for reuse below.
             store.addTerms(new BigdataValue[] { A, B, C, rdfType });
@@ -1275,9 +1275,9 @@ public void test_addInferredExplicitAxiom() {
             
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI v1 = f.createURI("http://www.bigdata.com/1"); 
-            final BigdataURI v2 = f.createURI("http://www.bigdata.com/2"); 
-            final BigdataURI v3 = f.createURI("http://www.bigdata.com/3"); 
+            final BigdataIRI v1 = f.createURI("http://www.bigdata.com/1"); 
+            final BigdataIRI v2 = f.createURI("http://www.bigdata.com/2"); 
+            final BigdataIRI v3 = f.createURI("http://www.bigdata.com/3"); 
             
             // assign term identifiers.
             store.addTerms(new BigdataValue[]{v1,v2,v3});
@@ -1333,10 +1333,10 @@ public void test_addRemove_sesameAPI(){
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI A = f.createURI("http://www.bigdata.com/A");
-            final BigdataURI B = f.createURI("http://www.bigdata.com/B");
-            final BigdataURI C = f.createURI("http://www.bigdata.com/C");
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI A = f.createURI("http://www.bigdata.com/A");
+            final BigdataIRI B = f.createURI("http://www.bigdata.com/B");
+            final BigdataIRI C = f.createURI("http://www.bigdata.com/C");
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
             {
 
@@ -1406,9 +1406,9 @@ public void test_removeStatements() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI x = f.createURI("http://www.foo.org/x1");
-            final BigdataURI y = f.createURI("http://www.foo.org/y2");
-            final BigdataURI z = f.createURI("http://www.foo.org/z3");
+            final BigdataIRI x = f.createURI("http://www.foo.org/x1");
+            final BigdataIRI y = f.createURI("http://www.foo.org/y2");
+            final BigdataIRI z = f.createURI("http://www.foo.org/z3");
     
             store.addTerms(new BigdataValue[] { x, y, z });
             
@@ -1483,12 +1483,12 @@ public void test_getStatementsUsingTriplePatterns() {
 
             final BigdataValueFactory f = store.getValueFactory();
 
-            final BigdataURI A = f.createURI("http://www.bigdata.com/A");
-            final BigdataURI B = f.createURI("http://www.bigdata.com/B");
-            final BigdataURI C = f.createURI("http://www.bigdata.com/C");
-            final BigdataURI Person = f.asValue(FOAF.PERSON);
-            final BigdataURI rdfType = f.asValue(RDF.TYPE);
-            final BigdataURI foafKnows = f.asValue(FOAF.KNOWS);
+            final BigdataIRI A = f.createURI("http://www.bigdata.com/A");
+            final BigdataIRI B = f.createURI("http://www.bigdata.com/B");
+            final BigdataIRI C = f.createURI("http://www.bigdata.com/C");
+            final BigdataIRI Person = f.asValue(FOAF.PERSON);
+            final BigdataIRI rdfType = f.asValue(RDF.TYPE);
+            final BigdataIRI foafKnows = f.asValue(FOAF.KNOWS);
 
             {
 
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestMultiVocabulary.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestMultiVocabulary.java
index 153b4ad6e5..b8f5029f73 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestMultiVocabulary.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestMultiVocabulary.java
@@ -4,8 +4,8 @@
 import java.util.Collections;
 import java.util.Iterator;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.vocab.core.BigdataCoreVocabulary_v20151210;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabulary.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabulary.java
index 14587f69cd..003b6774da 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabulary.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabulary.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,10 +33,10 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
 
 import com.bigdata.io.SerializerUtil;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabularyDecl_BLZG1591.java b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabularyDecl_BLZG1591.java
index c8f5e7cb78..ae73389b7c 100644
--- a/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabularyDecl_BLZG1591.java
+++ b/bigdata-rdf-test/src/test/java/com/bigdata/rdf/vocab/TestVocabularyDecl_BLZG1591.java
@@ -4,8 +4,8 @@
 import java.util.Collections;
 import java.util.Iterator;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 public class TestVocabularyDecl_BLZG1591 implements VocabularyDecl {
 
diff --git a/bigdata-sails-test/pom.xml b/bigdata-sails-test/pom.xml
index cea242dfa7..53a6784d71 100644
--- a/bigdata-sails-test/pom.xml
+++ b/bigdata-sails-test/pom.xml
@@ -271,6 +271,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       org.eclipse.rdf4j
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/DavidsTestBOps.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/DavidsTestBOps.java
index d480df29a0..e573752357 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/DavidsTestBOps.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/DavidsTestBOps.java
@@ -34,20 +34,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java
index 43ef80a3d7..68ebd8e89e 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sail;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -37,12 +37,12 @@
 import junit.extensions.proxy.IProxyTest;
 import junit.framework.Test;
 
-import org.openrdf.model.Resource;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
 
 
 /**
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java
index 2766534948..7291f050bb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java
@@ -11,19 +11,19 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 public class StressTest_ClosedByInterrupt_RW extends TestCase {
     
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBOps.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBOps.java
index 05348558cb..509a452de2 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBOps.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBOps.java
@@ -32,20 +32,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBigdataValueReplacer.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBigdataValueReplacer.java
index e52942e98f..2bfbcd48a4 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBigdataValueReplacer.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBigdataValueReplacer.java
@@ -31,18 +31,18 @@
 import java.util.LinkedList;
 import java.util.Properties;
 
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.MapBindingSet;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataValue;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBootstrapBigdataSail.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBootstrapBigdataSail.java
index e51d319f20..e6899ce33a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBootstrapBigdataSail.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestBootstrapBigdataSail.java
@@ -26,7 +26,7 @@
 
 package com.bigdata.rdf.sail;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,13 +44,13 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.journal.ITx;
 import com.bigdata.journal.Journal;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestChangeSets.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestChangeSets.java
index 2b122111b8..6e9e784fcf 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestChangeSets.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestChangeSets.java
@@ -33,9 +33,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.axioms.OwlAxioms;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestCnxnCreate.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestCnxnCreate.java
index 7a42b2a8de..d94c477962 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestCnxnCreate.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestCnxnCreate.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -32,7 +32,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestConcurrentKBCreate.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestConcurrentKBCreate.java
index 65ad1c0a30..6073cf4940 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestConcurrentKBCreate.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestConcurrentKBCreate.java
@@ -34,8 +34,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestHistoryIndex.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestHistoryIndex.java
index f5fd05a9fc..555b4fe931 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestHistoryIndex.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestHistoryIndex.java
@@ -31,14 +31,14 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.btree.IIndex;
 import com.bigdata.btree.ITuple;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.changesets.ChangeAction;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
@@ -216,13 +216,13 @@ public void test_historyIndex01() throws SailException {
                     final BigdataValueFactory f = (BigdataValueFactory) sail
                             .getValueFactory();
 
-                    final BigdataURI A = f
+                    final BigdataIRI A = f
                             .createURI("http://www.bigdata.com/A");
-                    final BigdataURI B = f
+                    final BigdataIRI B = f
                             .createURI("http://www.bigdata.com/B");
-                    final BigdataURI C = f
+                    final BigdataIRI C = f
                             .createURI("http://www.bigdata.com/C");
-                    final BigdataURI rdfType = f.asValue(RDF.TYPE);
+                    final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
                     conn.addStatement(A, rdfType, B);
                     conn.addStatement(A, rdfType, C);
@@ -301,13 +301,13 @@ protected Object resolve(final Object obj) {
                     final BigdataValueFactory f = (BigdataValueFactory) sail
                             .getValueFactory();
 
-                    final BigdataURI A = f
+                    final BigdataIRI A = f
                             .createURI("http://www.bigdata.com/A");
-                    final BigdataURI B = f
+                    final BigdataIRI B = f
                             .createURI("http://www.bigdata.com/B");
 //                    final BigdataURI C = f
 //                            .createURI("http://www.bigdata.com/C");
-                    final BigdataURI rdfType = f.asValue(RDF.TYPE);
+                    final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
                     conn.removeStatements(A, rdfType, B);
 
@@ -425,13 +425,13 @@ public void test_historyIndexWithPruning01() throws SailException {
                     final BigdataValueFactory f = (BigdataValueFactory) sail
                             .getValueFactory();
 
-                    final BigdataURI A = f
+                    final BigdataIRI A = f
                             .createURI("http://www.bigdata.com/A");
-                    final BigdataURI B = f
+                    final BigdataIRI B = f
                             .createURI("http://www.bigdata.com/B");
-                    final BigdataURI C = f
+                    final BigdataIRI C = f
                             .createURI("http://www.bigdata.com/C");
-                    final BigdataURI rdfType = f.asValue(RDF.TYPE);
+                    final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
                     conn.addStatement(A, rdfType, B);
                     conn.addStatement(A, rdfType, C);
@@ -510,13 +510,13 @@ protected Object resolve(final Object obj) {
                     final BigdataValueFactory f = (BigdataValueFactory) sail
                             .getValueFactory();
 
-                    final BigdataURI A = f
+                    final BigdataIRI A = f
                             .createURI("http://www.bigdata.com/A");
-                    final BigdataURI B = f
+                    final BigdataIRI B = f
                             .createURI("http://www.bigdata.com/B");
 //                    final BigdataURI C = f
 //                            .createURI("http://www.bigdata.com/C");
-                    final BigdataURI rdfType = f.asValue(RDF.TYPE);
+                    final BigdataIRI rdfType = f.asValue(RDF.TYPE);
 
                     conn.removeStatements(A, rdfType, B);
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestInlineValues.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestInlineValues.java
index 9d32386739..8e6dee552a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestInlineValues.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestInlineValues.java
@@ -32,16 +32,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestJoinScope.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestJoinScope.java
index 586b02c69b..2c77b5d878 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestJoinScope.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestJoinScope.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,16 +29,16 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.LinkedList;
-import org.openrdf.model.BNode;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 /**
  * Unit tests the quads aspects of the {@link BigdataSail} implementation.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestLexJoinOps.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestLexJoinOps.java
index 21af54a797..d69111adf0 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestLexJoinOps.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestLexJoinOps.java
@@ -29,17 +29,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.XSD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMROWTransactions.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMROWTransactions.java
index e0baf4513e..29e5faef3f 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMROWTransactions.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMROWTransactions.java
@@ -26,7 +26,7 @@
  */
 package com.bigdata.rdf.sail;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 import java.io.FileInputStream;
 import java.util.Properties;
@@ -39,12 +39,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.btree.AbstractNode;
 import com.bigdata.btree.BTree;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMaterialization.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMaterialization.java
index 700410bf5c..e46227f674 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMaterialization.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMaterialization.java
@@ -27,15 +27,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
 
 import com.bigdata.rdf.store.BD;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMillisecondPrecisionForInlineDateTimes.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMillisecondPrecisionForInlineDateTimes.java
index 906b5aa8ab..636ee0d4b6 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMillisecondPrecisionForInlineDateTimes.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMillisecondPrecisionForInlineDateTimes.java
@@ -29,18 +29,18 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.rdf.axioms.NoAxioms;
@@ -208,7 +208,7 @@ public void testBug() throws Exception {
 	            	final TupleQueryResult result = tupleQuery.evaluate();
 	            	
 	            	if (log.isInfoEnabled()) {
-	            		log.info("sesame results:");
+	            		log.info("rdf4j results:");
 	            		if (!result.hasNext()) {
 	            			log.info("no results.");
 	            		}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMultiGraphs.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMultiGraphs.java
index 64449ad4ce..8366193952 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMultiGraphs.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestMultiGraphs.java
@@ -32,21 +32,21 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestNoExceptions.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestNoExceptions.java
index c19c2387c7..8a8891f904 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestNoExceptions.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestNoExceptions.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,17 +31,17 @@
 import java.util.Properties;
 
 import org.apache.commons.io.IOUtils;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOptionals.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOptionals.java
index d817725e3f..ce20865ec8 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOptionals.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOptionals.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,15 +30,15 @@
 import java.util.LinkedList;
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 
 /**
  * Unit tests the optionals aspects of the {@link BigdataSail} implementation.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOrderBy.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOrderBy.java
index 4ba43fe697..29e0527076 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOrderBy.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestOrderBy.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,11 +28,11 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java
index ab5b994076..94504823db 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java
@@ -33,22 +33,22 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RDFWriterFactory;
-import org.openrdf.rio.RDFWriterRegistry;
-import org.openrdf.sail.SailConnection;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFWriter;
+import org.eclipse.rdf4j.rio.RDFWriterFactory;
+import org.eclipse.rdf4j.rio.RDFWriterRegistry;
+import org.eclipse.rdf4j.sail.SailConnection;
 
 import com.bigdata.rdf.ServiceProviderHook;
 import com.bigdata.rdf.model.BigdataStatementImpl;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestPruneBindingSets.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestPruneBindingSets.java
index be7ba4ec94..c13ac204e5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestPruneBindingSets.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestPruneBindingSets.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,14 +29,14 @@
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Properties;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestQuadsAPI.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestQuadsAPI.java
index 35d7c5d75f..72b9984bfb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestQuadsAPI.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestQuadsAPI.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,17 +28,17 @@
 
 import java.util.Collection;
 import java.util.LinkedList;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 
 /**
  * Unit tests the quads aspects of the {@link BigdataSail} implementation.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRDRHistory.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRDRHistory.java
index 9ea57f32db..ec26034be4 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRDRHistory.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRDRHistory.java
@@ -30,13 +30,13 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.changesets.IChangeRecord;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestReadWriteTransactions.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestReadWriteTransactions.java
index 4754b7cee9..6f5bba8c94 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestReadWriteTransactions.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestReadWriteTransactions.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -25,17 +25,17 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.ContextStatementImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.ContextStatementImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRollbacks.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRollbacks.java
index 46a54344c9..e6f8fd86a9 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRollbacks.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestRollbacks.java
@@ -35,17 +35,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.OpenRDFException;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
+import org.eclipse.rdf4j.OpenRDFException;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.axioms.NoAxioms;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSearchQuery.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSearchQuery.java
index f62bea6682..492943b273 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSearchQuery.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSearchQuery.java
@@ -39,25 +39,25 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameFilters.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameFilters.java
index f5e80e7aac..5545beb827 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameFilters.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameFilters.java
@@ -32,17 +32,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameMultiGraphs.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameMultiGraphs.java
index 94448cced5..3b395a2ab0 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameMultiGraphs.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSesameMultiGraphs.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -26,17 +26,17 @@
 
 package com.bigdata.rdf.sail;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * @author Mike Personick
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSetBinding.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSetBinding.java
index 24cf176716..977c373b6d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSetBinding.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSetBinding.java
@@ -30,17 +30,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.AbstractQuery;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.AbstractQuery;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataLiteral;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSids.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSids.java
index ca604ee6d6..63b63b73ed 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSids.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSids.java
@@ -29,15 +29,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
 
 import com.bigdata.rdf.ServiceProviderHook;
 import com.bigdata.rdf.axioms.NoAxioms;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSingleTailRule.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSingleTailRule.java
index 995f21f501..8087b54b87 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSingleTailRule.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSingleTailRule.java
@@ -32,33 +32,33 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.query.impl.EmptyBindingSet;
-import org.openrdf.query.parser.ParsedTupleQuery;
-import org.openrdf.query.parser.QueryParserUtil;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.query.impl.EmptyBindingSet;
+import org.eclipse.rdf4j.query.parser.ParsedTupleQuery;
+import org.eclipse.rdf4j.query.parser.QueryParserUtil;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BD;
 import com.bigdata.rdf.vocab.NoVocabulary;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 /**
  * @author Mike Personick
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlStar.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlStar.java
index 1f47b3f4e8..f229a74415 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlStar.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlStar.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC 2006-2015.  All rights reserved.
+Copyright (C) SYSTAP, LLC 2006-2015.  All rights reserved.
 
 Contact:
      SYSTAP, LLC
@@ -28,24 +28,24 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.BooleanQuery;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataBNode;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.BigdataValueFactory;
 
@@ -123,7 +123,7 @@ public void testSubject() throws Exception {
                 final URI p = vf.createURI("x:p");
                 final Literal o = vf.createLiteral("d");
 
-                final BigdataURI p1 = vf.createURI("x:order");
+                final BigdataIRI p1 = vf.createURI("x:order");
                 final BigdataLiteral o1 = vf.createLiteral(5);
             	
             	final RepositoryResult result = cxn.getStatements(s,p,o,true);
@@ -272,8 +272,8 @@ public void testObject() throws Exception {
                 final URI p = vf.createURI("x:p");
                 final Literal o = vf.createLiteral("d");
 
-                final BigdataURI s1 = vf.createURI("x:r");
-                final BigdataURI p1 = vf.createURI("x:refers");
+                final BigdataIRI s1 = vf.createURI("x:r");
+                final BigdataIRI p1 = vf.createURI("x:refers");
             	
                 final RepositoryResult result = cxn.getStatements(s,p,o,true);
                 try {
@@ -307,7 +307,7 @@ public void testObject() throws Exception {
 	            final TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, selectStr);
 				final TupleQueryResult tqr = tq.evaluate();
 				try {
-	            final BigdataURI s2 = vf.createURI("x:r");
+	            final BigdataIRI s2 = vf.createURI("x:r");
 					int cnt = 0;
 					while (tqr.hasNext()) {
 					    final BindingSet bs = tqr.next();
@@ -329,7 +329,7 @@ public void testObject() throws Exception {
 	            final TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, selectStr);
 				final TupleQueryResult tqr = tq.evaluate();
 				try {
-	            final BigdataURI s2 = vf.createURI("x:r");
+	            final BigdataIRI s2 = vf.createURI("x:r");
 					int cnt = 0;
 					while (tqr.hasNext()) {
 					    final BindingSet bs = tqr.next();
@@ -351,7 +351,7 @@ public void testObject() throws Exception {
 					"}";
 	            final GraphQuery tg = cxn.prepareGraphQuery(QueryLanguage.SPARQL, selectStr);
 				GraphQueryResult tgr = tg.evaluate();
-	            final BigdataURI s2 = vf.createURI("x:r");
+	            final BigdataIRI s2 = vf.createURI("x:r");
 				try {
 					int cnt = 0;
 					while (tgr.hasNext()) {
@@ -421,11 +421,11 @@ public void testRecursion() throws Exception {
                 final URI p = vf.createURI("x:p");
                 final Literal o = vf.createLiteral("d");
 
-                final BigdataURI s1 = vf.createURI("x:r");
-                final BigdataURI p1 = vf.createURI("x:refers");
+                final BigdataIRI s1 = vf.createURI("x:r");
+                final BigdataIRI p1 = vf.createURI("x:refers");
 
-                final BigdataURI s2 = vf.createURI("x:z");
-                final BigdataURI p2 = vf.createURI("x:recurs");
+                final BigdataIRI s2 = vf.createURI("x:z");
+                final BigdataIRI p2 = vf.createURI("x:recurs");
 
             	final RepositoryResult result = cxn.getStatements(s,p,o,true);
             	try {
@@ -467,7 +467,7 @@ public void testRecursion() throws Exception {
 					"}";
 	            final TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, selectStr);
 				TupleQueryResult tqr = tq.evaluate();
-	            final BigdataURI s2 = vf.createURI("x:z");
+	            final BigdataIRI s2 = vf.createURI("x:z");
 				try {
 					int cnt = 0;
 					while (tqr.hasNext()) {
@@ -489,7 +489,7 @@ public void testRecursion() throws Exception {
 					"}";
 	            final TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, selectStr);
 				TupleQueryResult tqr = tq.evaluate();
-	            final BigdataURI s2 = vf.createURI("x:z");
+	            final BigdataIRI s2 = vf.createURI("x:z");
 				try {
 					int cnt = 0;
 					while (tqr.hasNext()) {
@@ -512,7 +512,7 @@ public void testRecursion() throws Exception {
 					"}";
 	            final GraphQuery tg = cxn.prepareGraphQuery(QueryLanguage.SPARQL, selectStr);
 				GraphQueryResult tgr = tg.evaluate();
-	            final BigdataURI s2 = vf.createURI("x:z");
+	            final BigdataIRI s2 = vf.createURI("x:z");
 				try {
 					int cnt = 0;
 					while (tgr.hasNext()) {
@@ -548,4 +548,4 @@ public void testRecursion() throws Exception {
         }
     }
 
-}
+}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlUpdateCommit.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlUpdateCommit.java
index ce219d1012..cc24a812a9 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlUpdateCommit.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestSparqlUpdateCommit.java
@@ -28,7 +28,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryLanguage;
 
 import com.bigdata.rdf.changesets.IChangeLog;
 import com.bigdata.rdf.changesets.IChangeRecord;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestStrBOp.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestStrBOp.java
index 3c2cc28d3d..08889b71f2 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestStrBOp.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestStrBOp.java
@@ -27,15 +27,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.XSD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTemplate.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTemplate.java
index d6eebcadbc..67033525d8 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTemplate.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTemplate.java
@@ -29,18 +29,18 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BD;
@@ -204,7 +204,7 @@ public void testBug() throws Exception {
 	            	final TupleQueryResult result = tupleQuery.evaluate();
 	            	
 	            	if (log.isInfoEnabled()) {
-	            		log.info("sesame results:");
+	            		log.info("rdf4j results:");
 	            		if (!result.hasNext()) {
 	            			log.info("no results.");
 	            		}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1086.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1086.java
index 7dfba13eb7..d1dbc3993e 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1086.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1086.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,10 +28,10 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
@@ -179,4 +179,4 @@ public void testQuadStrippingRejected() throws Exception {
       
       assertTrue(exceptionEncountered);
    }    
-}
+}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1388.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1388.java
index 9cd50fd3a9..f877a893ae 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1388.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1388.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -35,16 +35,16 @@
 import java.util.LinkedList;
 import java.util.Properties;
 
-import org.openrdf.OpenRDFException;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.OpenRDFException;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
@@ -161,4 +161,4 @@ public void testDateFunction() throws Exception {
         }
     }
 
-}
+}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1518.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1518.java
index c5ab481e36..572154a521 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1518.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1518.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,10 +28,10 @@
 
 import java.util.Properties;
 
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.sparql.ast.QuadsOperationInTriplesModeException;
@@ -271,4 +271,4 @@ public void testGRAPHConstructInQueryBody() throws Exception {
         }
     }
 
-}
+}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1681.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1681.java
index 911e30c70e..791715bf7b 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1681.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1681.java
@@ -28,17 +28,17 @@
 
 import junit.framework.Assert;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * Unit test template for use in submission of bugs.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1682.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1682.java
index 0c9070f20a..029c8bad6a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1682.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1682.java
@@ -28,17 +28,17 @@
 
 import junit.framework.Assert;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * Unit test template for use in submission of bugs.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1716.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1716.java
index 8f2752cd54..b7917bd7fe 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1716.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1716.java
@@ -23,11 +23,11 @@
 
 package com.bigdata.rdf.sail;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 /**
  * Test suite for an issue where IV resolution of invalid numeric literal fails
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1747.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1747.java
index a5af5af61d..ba2eb7bd84 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1747.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1747.java
@@ -25,11 +25,11 @@
 
 import java.io.IOException;
 import java.util.List;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1753.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1753.java
index 296ca8f4d2..32dfc17525 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1753.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1753.java
@@ -23,12 +23,12 @@
 
 package com.bigdata.rdf.sail;
 
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataValueFactory;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1755.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1755.java
index 99a45826d4..c06c3c6894 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1755.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1755.java
@@ -29,18 +29,18 @@
 
 import junit.framework.Assert;
 
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1785.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1785.java
index 2338481ded..c20187e1bd 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1785.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1785.java
@@ -29,19 +29,19 @@
 
 import junit.framework.Assert;
 
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1788.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1788.java
index 2b4079d3b2..f4ae6251a4 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1788.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1788.java
@@ -29,19 +29,19 @@
 
 import junit.framework.Assert;
 
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.Constant;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1875.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1875.java
index cb6b459d56..78b9f7b513 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1875.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1875.java
@@ -23,11 +23,11 @@
 
 package com.bigdata.rdf.sail;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 /**
  * Test suite for an issue where IV resolution of RDR statements was not completed
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889.java
index 6536d683cc..a6498a2ae9 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889.java
@@ -28,14 +28,14 @@
 import java.util.Properties;
 import java.util.UUID;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.rdf.sail.BigdataSail.Options;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889_2.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889_2.java
index eb29a786a7..c49d1df78b 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889_2.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1889_2.java
@@ -27,14 +27,14 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.rdf.sail.BigdataSail.Options;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1893.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1893.java
index 3ffa2cbc58..b3a22bf6ab 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1893.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket1893.java
@@ -29,11 +29,11 @@
 import java.util.Properties;
 import java.util.UUID;
 
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.journal.IJournal;
 import com.bigdata.rdf.internal.XSD;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043.java
index b7df336fa5..6db6e6e5b5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043.java
@@ -27,15 +27,15 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043b.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043b.java
index 41d538dbb8..2a50fe387d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043b.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2043b.java
@@ -27,15 +27,15 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2083.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2083.java
index 177c032e96..190c0c99dc 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2083.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket2083.java
@@ -26,15 +26,15 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 /**
  * Unit test template for use in submission of bugs.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket275.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket275.java
index a5afc3c32b..8f1b3b0229 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket275.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket275.java
@@ -26,17 +26,17 @@
 import java.io.IOException;
 import java.util.Set;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * Unit test template for use in submission of bugs.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket276.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket276.java
index 63b4b74648..c68ac5f638 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket276.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket276.java
@@ -27,24 +27,24 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.openrdf.OpenRDFException;
-import org.openrdf.model.Statement;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.RDFHandlerBase;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.OpenRDFException;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket348.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket348.java
index c112c18294..7fcec901fd 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket348.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket348.java
@@ -25,24 +25,24 @@
 
 import java.io.IOException;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * Unit test template for use in submission of bugs.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket353.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket353.java
index 91f8f0f02c..e308000853 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket353.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket353.java
@@ -26,18 +26,18 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket355.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket355.java
index 3015c1a9ae..89dfb6cfb5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket355.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket355.java
@@ -26,18 +26,18 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket422.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket422.java
index c06b3ea695..2101e1528e 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket422.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket422.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -31,17 +31,17 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.sail.BigdataSail.BigdataSailConnection;
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.store.TempTripleStore;
 
-import info.aduna.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 
 /**
  * Test suite for wrapping a {@link TempTripleStore} as a {@link BigdataSail}.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket4249.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket4249.java
index dde56172c9..8964184142 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket4249.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket4249.java
@@ -27,19 +27,19 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.bop.BOp;
 import com.bigdata.rdf.internal.IV;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket473.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket473.java
index a9372fe518..c064a276a2 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket473.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket473.java
@@ -34,17 +34,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.RDFHandlerBase;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.btree.BTree;
 import com.bigdata.btree.IndexMetadata;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket581.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket581.java
index d5863166c3..c3d11bbb54 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket581.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket581.java
@@ -27,11 +27,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailGraphQuery;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailGraphQuery;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.store.BDS;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket610.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket610.java
index d7eade53c1..1b956d7f53 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket610.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket610.java
@@ -28,15 +28,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Model;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.repository.RepositoryConnection;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
 
 import com.bigdata.rdf.axioms.OwlAxioms;
 import com.bigdata.rdf.store.AbstractTripleStore;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket632.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket632.java
index 3861bfc63f..10150e863d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket632.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket632.java
@@ -29,20 +29,20 @@
 import java.util.Properties;
 import java.util.UUID;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.rdf.sail.BigdataSail.Options;
 import com.bigdata.rdf.sparql.ast.eval.service.OpenrdfNativeMockServiceFactory;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket647.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket647.java
index 386ab1be3c..fcbc2c8a05 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket647.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket647.java
@@ -29,23 +29,23 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Graph;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.ContextStatementImpl;
-import org.openrdf.model.impl.GraphImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.ContextStatementImpl;
+import org.eclipse.rdf4j.model.impl.GraphImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
@@ -245,7 +245,7 @@ public void testBug() throws Exception {
 //	            	final TupleQueryResult result = tupleQuery.evaluate();
 //	            	
 //	            	if (log.isInfoEnabled()) {
-//	            		log.info("sesame results:");
+//	            		log.info("rdf4j results:");
 //	            		if (!result.hasNext()) {
 //	            			log.info("no results.");
 //	            		}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket669.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket669.java
index 2cdca97037..01cf546e0e 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket669.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket669.java
@@ -29,20 +29,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Graph;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.GraphImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.GraphImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
@@ -219,7 +219,7 @@ public void testBug() throws Exception {
 	            	final TupleQueryResult result = tupleQuery.evaluate();
 	            	
 	            	if (log.isInfoEnabled()) {
-	            		log.info("sesame results:");
+	            		log.info("rdf4j results:");
 	            		if (!result.hasNext()) {
 	            			log.info("no results.");
 	            		}
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket693.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket693.java
index 0144805eae..871db2d1af 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket693.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket693.java
@@ -30,14 +30,14 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailTupleQuery;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailTupleQuery;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.vocab.NoVocabulary;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket967.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket967.java
index 4159a1e8e6..65f5aeed35 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket967.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTicket967.java
@@ -3,24 +3,24 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTxCreate.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTxCreate.java
index 61d6fc50f1..6671f79588 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTxCreate.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestTxCreate.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,7 +29,7 @@
 
 import java.util.Properties;
 
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.internal.LexiconConfiguration;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestUnions.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestUnions.java
index 2ab37bf478..ca08946be3 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestUnions.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/TestUnions.java
@@ -26,24 +26,24 @@
 
 package com.bigdata.rdf.sail;
 
-import info.aduna.xml.XMLWriter;
+import org.eclipse.rdf4j.common.xml.XMLWriter;
 import java.io.StringWriter;
 import java.util.Collection;
 import java.util.LinkedList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.BNode;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.BNodeImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter;
 
 /**
  * Unit tests the UNION aspects of the {@link BigdataSail} implementation.
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/contrib/TestOOMBug.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/contrib/TestOOMBug.java
index db322d67f4..213affc636 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/contrib/TestOOMBug.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/contrib/TestOOMBug.java
@@ -122,16 +122,16 @@ public void testOOM() throws Exception {
 			
 				// first add the data
 				for(int index = 0; index < triples.length; index++){
-					org.openrdf.model.URI 	s = vf.createURI(triples[index][0]);
-					org.openrdf.model.URI 	p = vf.createURI(triples[index][1]);
+					org.eclipse.rdf4j.model.URI 	s = vf.createURI(triples[index][0]);
+					org.eclipse.rdf4j.model.URI 	p = vf.createURI(triples[index][1]);
 					if (triples[index][3] != null){
-						org.openrdf.model.Literal 	l = vf.createLiteral(triples[index][2],vf.createURI(triples[index][3]));
+						org.eclipse.rdf4j.model.Literal 	l = vf.createLiteral(triples[index][2],vf.createURI(triples[index][3]));
 						if (log.isInfoEnabled())
 							log.info("Adding("+index+" of "+triples.length+") "+s+" "+p+" "+l);
 						cxn.add(s,p,l);
 					}
 					else {
-						org.openrdf.model.URI 		o = vf.createURI(triples[index][2]);
+						org.eclipse.rdf4j.model.URI 		o = vf.createURI(triples[index][2]);
 						if (log.isInfoEnabled())
 							log.info("Adding("+index+" of "+triples.length+") "+s+" "+p+" "+o);
 						cxn.add(s,p,o);
@@ -146,16 +146,16 @@ public void testOOM() throws Exception {
 				if (log.isInfoEnabled())
 					log.info("Start data processing...");
 				for(int index = 0; index < triples.length; index++){
-					org.openrdf.model.URI 	s = vf.createURI(triples[index][0]);
-					org.openrdf.model.URI 	p = vf.createURI(triples[index][1]);
+					org.eclipse.rdf4j.model.URI 	s = vf.createURI(triples[index][0]);
+					org.eclipse.rdf4j.model.URI 	p = vf.createURI(triples[index][1]);
 					if (triples[index][3] != null){
-						org.openrdf.model.Literal 	l = vf.createLiteral(triples[index][2],vf.createURI(triples[index][3]));
+						org.eclipse.rdf4j.model.Literal 	l = vf.createLiteral(triples[index][2],vf.createURI(triples[index][3]));
 						if (log.isInfoEnabled())
 							log.info("Processing("+index+" of "+triples.length+") "+s+" "+p+" "+l);
 						cxn.remove(s, p, null);		cxn.add(s,p,l);
 					}
 					else {
-						org.openrdf.model.URI 		o = vf.createURI(triples[index][2]);
+						org.eclipse.rdf4j.model.URI 		o = vf.createURI(triples[index][2]);
 						if (log.isInfoEnabled())
 							log.info("Processing("+index+" of "+triples.length+") "+s+" "+p+" "+o);
 						cxn.remove(s, p, null);		cxn.add(s,p,o);
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/graph/TestPaths.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/graph/TestPaths.java
index 6083a6378a..a933d4b018 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/graph/TestPaths.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/graph/TestPaths.java
@@ -36,12 +36,12 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
index 1bb7ee60d2..2417c9c2fb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -35,12 +35,12 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.parser.ParsedOperation;
-import org.openrdf.query.parser.QueryParserUtil;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11SyntaxTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQLSyntaxTest;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.parser.ParsedOperation;
+import org.eclipse.rdf4j.query.parser.QueryParserUtil;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11SyntaxTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLSyntaxTest;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.ITx;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLSyntaxTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLSyntaxTest.java
index b83be5d2b3..6c25427477 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLSyntaxTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLSyntaxTest.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,8 +29,8 @@
 
 import java.util.Properties;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.parser.sparql.manifest.SPARQLSyntaxTest;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLSyntaxTest;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.ITx;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
index f2d1dc6fb9..422d6e609e 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/BigdataSPARQL2ASTParserTest.java
@@ -25,9 +25,9 @@
  */
 package com.bigdata.rdf.sail.sparql;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.parser.QueryParserUtil;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.parser.QueryParserUtil;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.rdf.sparql.AbstractBigdataExprBuilderTestCase;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java
index 97cbbe8056..efd06ff298 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -28,13 +28,13 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
-import org.openrdf.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
 
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
 import com.bigdata.rdf.sail.sparql.ast.TokenMgrError;
@@ -989,13 +989,13 @@ public void test_from_and_from_named() throws MalformedQueryException,
             }
 
             {
-                final BigdataURI uri1 = valueFactory
+                final BigdataIRI uri1 = valueFactory
                         .createURI("http://example.org/dft.ttl");
 
-                final BigdataURI uri2 = valueFactory
+                final BigdataIRI uri2 = valueFactory
                         .createURI("http://example.org/alice");
                 
-                final BigdataURI uri3 = valueFactory
+                final BigdataIRI uri3 = valueFactory
                         .createURI("http://example.org/bob"); 
 
                 final BigdataValue[] values = new BigdataValue[] { uri1, uri2,
@@ -1083,13 +1083,13 @@ public void test_from_and_from_named_with_unknown_graph()
             }
 
             {
-                final BigdataURI uri1 = valueFactory
+                final BigdataIRI uri1 = valueFactory
                         .createURI("http://example.org/dft.ttl");
 
-                final BigdataURI uri2 = valueFactory
+                final BigdataIRI uri2 = valueFactory
                         .createURI("http://example.org/alice");
 
-                final BigdataURI uri3 = valueFactory
+                final BigdataIRI uri3 = valueFactory
                         .createURI("http://example.org/bob");
 
                 final BigdataValue[] values = new BigdataValue[] { //
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBindingsClause.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBindingsClause.java
index e2d911758f..55fef1a389 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBindingsClause.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestBindingsClause.java
@@ -33,8 +33,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
index 231ec573ec..d31d5bfb88 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,9 +30,9 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.rdf.internal.DTE;
 import com.bigdata.rdf.internal.ILexiconConfiguration;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java
index 0008673b2b..5fc9ad5b63 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java
@@ -33,9 +33,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.journal.BufferMode;
@@ -45,7 +45,7 @@
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataResource;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
@@ -921,9 +921,9 @@ public void test_update_insert_data_RDR() throws MalformedQueryException,
 
             expected.addChild(op);
 
-            final BigdataURI s = valueFactory.createURI("http://example/s");
-            final BigdataURI p = valueFactory.createURI("http://example/p");
-            final BigdataURI order = valueFactory.createURI("http://example/order");
+            final BigdataIRI s = valueFactory.createURI("http://example/s");
+            final BigdataIRI p = valueFactory.createURI("http://example/p");
+            final BigdataIRI order = valueFactory.createURI("http://example/order");
             final BigdataLiteral d = valueFactory.createLiteral("d");
             final BigdataLiteral five = valueFactory.createLiteral(5);
 
@@ -938,14 +938,14 @@ public void test_update_insert_data_RDR() throws MalformedQueryException,
             // SP(:s :p d) as ?sid1) .
             final BigdataStatement s1 = valueFactory.createStatement(//
                   (BigdataResource)s,//
-                  (BigdataURI)p,//
+                  (BigdataIRI)p,//
                   (BigdataValue)d);
             final BigdataBNode sid1 = valueFactory.createBNode(s1);
 
             // SP(?sid, :p, 5).
             final BigdataStatement s2 = valueFactory.createStatement(//
                   (Resource)sid1, //
-                  (BigdataURI)order, //
+                  (BigdataIRI)order, //
                   (BigdataValue) five);
             final BigdataStatement[] data = new BigdataStatement[] { //
                   s1, s2
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
index 0df5f5d20f..194a4d0c97 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,12 +30,12 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java
index 92724dc084..fb97855a02 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,14 +27,14 @@
 
 package com.bigdata.rdf.sail.sparql;
 
-import info.aduna.net.ParsedURI;
+import org.eclipse.rdf4j.common.net.ParsedURI;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
@@ -53,7 +53,7 @@
 /**
  * Test suite for building up triple patterns, including those which are covered
  * by the property paths extension in SPARQL 1.1 (a triple pattern which a
- * constant in the predicate position is treated by the sesame SPARQL grammar as
+ * constant in the predicate position is treated by the rdf4j SPARQL grammar as
  * a degenerate case of a property path.)
  * 
  * @author Bryan Thompson
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java
index 8bd0f182b9..2c266c52c6 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,11 +29,11 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.XSD;
@@ -41,7 +41,7 @@
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataResource;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.RDFParserOptions;
@@ -1392,22 +1392,22 @@ public void test_insert_data() throws MalformedQueryException,
 
             expected.addChild(op);
 
-            final BigdataURI book1 = valueFactory.createURI("http://example/book1");
-            final BigdataURI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
-            final BigdataURI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
+            final BigdataIRI book1 = valueFactory.createURI("http://example/book1");
+            final BigdataIRI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
+            final BigdataIRI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
             final BigdataLiteral label1 = valueFactory.createLiteral("A new book");
             final BigdataLiteral label2 = valueFactory.createLiteral("A.N.Other");
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcTitle,//
+                            (BigdataIRI)dcTitle,//
                             (BigdataValue)label1, //
                             null,
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)book1, //
-                            (BigdataURI)dcCreator, //
+                            (BigdataIRI)dcCreator, //
                             (BigdataValue) label2, //
                             null,//
                             StatementEnum.Explicit),//
@@ -1450,15 +1450,15 @@ public void test_insert_data_quads() throws MalformedQueryException,
 
             expected.addChild(op);
 
-            final BigdataURI bookstore = valueFactory.createURI("http://example/bookStore");
-            final BigdataURI book1 = valueFactory.createURI("http://example/book1");
-            final BigdataURI price = valueFactory.createURI("http://example.org/ns#price");
+            final BigdataIRI bookstore = valueFactory.createURI("http://example/bookStore");
+            final BigdataIRI book1 = valueFactory.createURI("http://example/book1");
+            final BigdataIRI price = valueFactory.createURI("http://example.org/ns#price");
             final BigdataLiteral i42 = valueFactory.createLiteral("42",XSD.INTEGER);
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)price, //
+                            (BigdataIRI)price, //
                             (BigdataValue)i42, //
                             (BigdataResource)bookstore, //
                             StatementEnum.Explicit),//
@@ -1497,8 +1497,8 @@ public void test_insert_data_ticket573() throws MalformedQueryException {
 
             final BigdataBNode bnode = valueFactory.createBNode("-anon-1");
 //            final BigdataBNode bnode = valueFactory.createBNode("bnode");
-            final BigdataURI rdfType = valueFactory.createURI(RDF.TYPE.toString());
-            final BigdataURI foo = valueFactory.createURI("http://example/Foo");
+            final BigdataIRI rdfType = valueFactory.createURI(RDF.TYPE.toString());
+            final BigdataIRI foo = valueFactory.createURI("http://example/Foo");
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     valueFactory.createStatement(//
@@ -1553,31 +1553,31 @@ public void test_insert_data_triples_then_quads() throws MalformedQueryException
 
             expected.addChild(op);
 
-            final BigdataURI book1 = valueFactory.createURI("http://example/book1");
-            final BigdataURI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
-            final BigdataURI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
+            final BigdataIRI book1 = valueFactory.createURI("http://example/book1");
+            final BigdataIRI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
+            final BigdataIRI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
             final BigdataLiteral label1 = valueFactory.createLiteral("A new book");
             final BigdataLiteral label2 = valueFactory.createLiteral("A.N.Other");
-            final BigdataURI bookstore = valueFactory.createURI("http://example/bookStore");
-            final BigdataURI price = valueFactory.createURI("http://example.org/ns#price");
+            final BigdataIRI bookstore = valueFactory.createURI("http://example/bookStore");
+            final BigdataIRI price = valueFactory.createURI("http://example.org/ns#price");
             final BigdataLiteral i42 = valueFactory.createLiteral("42",XSD.INTEGER);
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcTitle,//
+                            (BigdataIRI)dcTitle,//
                             (BigdataValue)label1,//
                             null,//
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcCreator, //
+                            (BigdataIRI)dcCreator, //
                             (BigdataValue)label2,//
                             null,//
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)book1, //
-                            (BigdataURI)price, //
+                            (BigdataIRI)price, //
                             (BigdataValue)i42, //
                             (BigdataResource)bookstore,//
                             StatementEnum.Explicit),//
@@ -1642,31 +1642,31 @@ public void test_insert_data_quads_then_triples() throws MalformedQueryException
 
             expected.addChild(op);
 
-            final BigdataURI book1 = valueFactory.createURI("http://example/book1");
-            final BigdataURI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
-            final BigdataURI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
+            final BigdataIRI book1 = valueFactory.createURI("http://example/book1");
+            final BigdataIRI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
+            final BigdataIRI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
             final BigdataLiteral label1 = valueFactory.createLiteral("A new book");
             final BigdataLiteral label2 = valueFactory.createLiteral("A.N.Other");
-            final BigdataURI bookstore = valueFactory.createURI("http://example/bookStore");
-            final BigdataURI price = valueFactory.createURI("http://example.org/ns#price");
+            final BigdataIRI bookstore = valueFactory.createURI("http://example/bookStore");
+            final BigdataIRI price = valueFactory.createURI("http://example.org/ns#price");
             final BigdataLiteral i42 = valueFactory.createLiteral("42",XSD.INTEGER);
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     valueFactory.createStatement(//
                             (BigdataResource)book1, //
-                            (BigdataURI)price, //
+                            (BigdataIRI)price, //
                             (BigdataValue)i42, //
                             (BigdataResource)bookstore,//
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcTitle,//
+                            (BigdataIRI)dcTitle,//
                             (BigdataValue)label1,//
                             null,//
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)book1, //
-                            (BigdataURI)dcCreator,//
+                            (BigdataIRI)dcCreator,//
                             (BigdataValue)label2, //
                             null,//
                             StatementEnum.Explicit),//
@@ -1713,34 +1713,34 @@ public void test_insert_data_triples_quads_triples() throws MalformedQueryExcept
 
             expected.addChild(op);
 
-            final BigdataURI book1 = valueFactory.createURI("http://example/book1");
-            final BigdataURI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
-            final BigdataURI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
+            final BigdataIRI book1 = valueFactory.createURI("http://example/book1");
+            final BigdataIRI dcCreator = valueFactory.createURI("http://purl.org/dc/elements/1.1/creator");
+            final BigdataIRI dcTitle = valueFactory.createURI("http://purl.org/dc/elements/1.1/title");
             final BigdataLiteral label1 = valueFactory.createLiteral("A new book");
             final BigdataLiteral label2 = valueFactory.createLiteral("A.N.Other");
-            final BigdataURI bookstore = valueFactory.createURI("http://example/bookStore");
-            final BigdataURI price = valueFactory.createURI("http://example.org/ns#price");
+            final BigdataIRI bookstore = valueFactory.createURI("http://example/bookStore");
+            final BigdataIRI price = valueFactory.createURI("http://example.org/ns#price");
             final BigdataLiteral i42 = valueFactory.createLiteral("42",XSD.INTEGER);
 
             final BigdataStatement[] data = new BigdataStatement[] { //
                     
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcTitle,//
+                            (BigdataIRI)dcTitle,//
                             (BigdataValue)label1, //
                             null, //
                             StatementEnum.Explicit),//
                     
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)price,//
+                            (BigdataIRI)price,//
                             (BigdataValue)i42,//
                             (BigdataResource)bookstore,//
                             StatementEnum.Explicit),//
                     
                     valueFactory.createStatement(//
                             (BigdataResource)book1,//
-                            (BigdataURI)dcCreator,//
+                            (BigdataIRI)dcCreator,//
                             (BigdataValue)label2,//
                             null,// 
                             StatementEnum.Explicit),//
@@ -1796,7 +1796,7 @@ public void test_delete_data_quads_insert_data_quads()
                     
             valueFactory.createStatement(//
                     (BigdataResource) book1.getValue(),//
-                    (BigdataURI) dcTitle.getValue(),//
+                    (BigdataIRI) dcTitle.getValue(),//
                     (BigdataValue) label1.getValue(),//
                     (BigdataResource) bookstore.getValue(),//
                     StatementEnum.Explicit//
@@ -1817,7 +1817,7 @@ public void test_delete_data_quads_insert_data_quads()
                     
                     valueFactory.createStatement(//
                             (BigdataResource) book1.getValue(),//
-                            (BigdataURI) dcTitle.getValue(),//
+                            (BigdataIRI) dcTitle.getValue(),//
                             (BigdataValue) label2.getValue(),//
                             (BigdataResource) bookstore.getValue(),//
                             StatementEnum.Explicit//
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder2.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder2.java
index e51b6d6842..eaa30d4b7c 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder2.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder2.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -25,15 +25,15 @@
  */
 package com.bigdata.rdf.sail.sparql;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.internal.XSD;
 import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataResource;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
@@ -380,22 +380,22 @@ public void test_create_solutions_silent_params()
 //                    new ConstantNode(hintQuery), new ConstantNode(hintExpireAge),
 //                    new ConstantNode(millis)));
 
-          final BigdataURI hintQuery = valueFactory.createURI(QueryHints.NAMESPACE+QueryHintScope.Query);
-          final BigdataURI hintEngine = valueFactory.createURI(QueryHints.NAMESPACE+"engine");
-          final BigdataURI hintExpireAge = valueFactory.createURI(QueryHints.NAMESPACE+"expireAge");
+          final BigdataIRI hintQuery = valueFactory.createURI(QueryHints.NAMESPACE+QueryHintScope.Query);
+          final BigdataIRI hintEngine = valueFactory.createURI(QueryHints.NAMESPACE+"engine");
+          final BigdataIRI hintExpireAge = valueFactory.createURI(QueryHints.NAMESPACE+"expireAge");
           final BigdataLiteral cache = valueFactory.createLiteral("cache");
           final BigdataLiteral millis = valueFactory.createLiteral("100000",XSD.LONG);
 
             final BigdataStatement[] params = new BigdataStatement[] {
                     valueFactory.createStatement(//
                             (BigdataResource)hintQuery, //
-                            (BigdataURI)hintEngine,//
+                            (BigdataIRI)hintEngine,//
                             (BigdataValue)cache, //
                             null, // c
                             StatementEnum.Explicit),//
                     valueFactory.createStatement(//
                             (BigdataResource)hintQuery,//
-                            (BigdataURI)hintExpireAge,//
+                            (BigdataIRI)hintExpireAge,//
                             (BigdataValue)millis,//
                             null,// c 
                             StatementEnum.Explicit),//
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java
index 5012d725f2..6a9d9d90bb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java
@@ -1,5 +1,5 @@
 /**
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,8 +29,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 
 import com.bigdata.bop.aggregate.AggregateBase;
 import com.bigdata.rdf.sail.sparql.ast.ParseException;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java
index 6a11e33247..4b7105c34d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -33,14 +33,14 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.algebra.StatementPattern.Scope;
-import org.openrdf.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
 
 import com.bigdata.rdf.internal.IV;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValue;
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.StatementBuffer;
@@ -137,21 +137,21 @@ public void test_virtualGraphs_01() throws MalformedQueryException,
         /*
          * Setup the virtual graph associations in the data.
          */
-        final BigdataURI virtualGraph = valueFactory.asValue(BD.VIRTUAL_GRAPH);
+        final BigdataIRI virtualGraph = valueFactory.asValue(BD.VIRTUAL_GRAPH);
 
-        final BigdataURI vg = valueFactory
+        final BigdataIRI vg = valueFactory
                 .createURI("http://example.org/vg");
 
-        final BigdataURI context = valueFactory
+        final BigdataIRI context = valueFactory
                 .createURI("http://www.bigdata.com/context");
 
-        final BigdataURI uri1 = valueFactory
+        final BigdataIRI uri1 = valueFactory
                 .createURI("http://example.org/dft.ttl");
 
-        final BigdataURI alice = valueFactory
+        final BigdataIRI alice = valueFactory
                 .createURI("http://example.org/alice");
 
-        final BigdataURI bob = valueFactory.createURI("http://example.org/bob");
+        final BigdataIRI bob = valueFactory.createURI("http://example.org/bob");
         
         /*
          * Most URIs wind up declared when we insert the statements, but not
@@ -291,21 +291,21 @@ public void test_virtualGraphs_02() throws MalformedQueryException,
         /*
          * Setup the virtual graph associations in the data.
          */
-        final BigdataURI virtualGraph = valueFactory.asValue(BD.VIRTUAL_GRAPH);
+        final BigdataIRI virtualGraph = valueFactory.asValue(BD.VIRTUAL_GRAPH);
 
-        final BigdataURI vg = valueFactory
+        final BigdataIRI vg = valueFactory
                 .createURI("http://example.org/vg");
 
-        final BigdataURI context = valueFactory
+        final BigdataIRI context = valueFactory
                 .createURI("http://www.bigdata.com/context");
 
-        final BigdataURI uri1 = valueFactory
+        final BigdataIRI uri1 = valueFactory
                 .createURI("http://example.org/dft.ttl");
 
-        final BigdataURI alice = valueFactory
+        final BigdataIRI alice = valueFactory
                 .createURI("http://example.org/alice");
 
-        final BigdataURI bob = valueFactory.createURI("http://example.org/bob");
+        final BigdataIRI bob = valueFactory.createURI("http://example.org/bob");
         
         /*
          * Most URIs wind up declared when we insert the statements, but not
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataArbitraryLengthPathTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataArbitraryLengthPathTest.java
index e1e573a899..b79535b5df 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataArbitraryLengthPathTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataArbitraryLengthPathTest.java
@@ -9,13 +9,13 @@
 
 import junit.framework.TestCase;
 
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java
index c005fed1cd..86d79346ee 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java
@@ -34,18 +34,18 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.Test;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.parser.sparql.ComplexSPARQLQueryTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.parser.sparql.ComplexSPARQLQueryTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.bop.BOpUtility;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
index f3afbca30b..3f71e574ba 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
@@ -43,13 +43,13 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryInterruptedException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnectionTest;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryInterruptedException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnectionTest;
 
 import com.bigdata.bop.fed.QueryEngineFactory;
 import com.bigdata.btree.keys.CollatorEnum;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java
index 519e07b4c5..ba915e3a03 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java
@@ -35,12 +35,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.parser.sparql.manifest.ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQLQueryTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLQueryTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 import com.bigdata.btree.keys.CollatorEnum;
 import com.bigdata.btree.keys.StrengthEnum;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
index 38857f925c..a636098897 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java
@@ -32,12 +32,12 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.parser.sparql.manifest.ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQLQueryTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.dataset.DatasetRepository;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLQueryTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.btree.keys.CollatorEnum;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java
index b1d63da1ef..a47407daf1 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java
@@ -28,7 +28,7 @@
  */
 package com.bigdata.rdf.sail.tck;
 
-import info.aduna.iteration.Iterations;
+import org.eclipse.rdf4j.common.iteration.Iterations;
 
 import java.net.URL;
 import java.util.Arrays;
@@ -41,21 +41,21 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.util.ModelUtil;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.Update;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQLUpdateConformanceTest;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.contextaware.ContextAwareConnection;
-import org.openrdf.repository.contextaware.ContextAwareRepository;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.util.ModelUtil;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLUpdateConformanceTest;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.contextaware.ContextAwareConnection;
+import org.eclipse.rdf4j.repository.contextaware.ContextAwareRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.journal.BufferMode;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest.java
index 55eb893c0c..1d32d858c5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest.java
@@ -35,21 +35,21 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.query.parser.sparql.SPARQLUpdateTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLUpdateTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java
index edb92b182c..15f3f73a80 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java
@@ -48,18 +48,18 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.query.impl.TupleQueryResultBuilder;
-import org.openrdf.query.resultio.QueryResultIO;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultParser;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.query.impl.TupleQueryResultBuilder;
+import org.eclipse.rdf4j.query.resultio.QueryResultIO;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 import com.bigdata.bop.engine.AbstractQueryEngineTestCase;
 import com.bigdata.journal.AbstractTask;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlFullRWTxTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlFullRWTxTest.java
index baea89bf52..033e0b62cd 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlFullRWTxTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlFullRWTxTest.java
@@ -29,7 +29,7 @@
 
 import java.util.Properties;
 
-import org.openrdf.query.Dataset;
+import org.eclipse.rdf4j.query.Dataset;
 
 import com.bigdata.journal.Journal;
 import com.bigdata.rdf.sail.BigdataSail.Options;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
index c8a908421c..3ea83113fe 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
@@ -27,8 +27,8 @@
  */
 package com.bigdata.rdf.sail.tck;
 
-import info.aduna.io.IOUtil;
-import info.aduna.iteration.Iterations;
+import org.eclipse.rdf4j.common.io.IOUtil;
+import org.eclipse.rdf4j.common.iteration.Iterations;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -45,31 +45,31 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.util.ModelUtil;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.Query;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResults;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.MutableTupleQueryResult;
-import org.openrdf.query.parser.sparql.manifest.ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11ManifestTest;
-import org.openrdf.query.parser.sparql.manifest.SPARQLQueryTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.dataset.DatasetRepository;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.helpers.BasicParserSettings;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.util.ModelUtil;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.BooleanQuery;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.Query;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResults;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11ManifestTest;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQLQueryTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.btree.keys.CollatorEnum;
@@ -148,7 +148,7 @@ public class BigdataSparqlTest
 
         /*
          * This one fails because our bnode() function uses a different bnode
-         * id naming scheme than the sesame one.  Not technically a failure.
+         * id naming scheme than the rdf4j one.  Not technically a failure.
          */
         "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#bnode01",
 
@@ -177,7 +177,7 @@ public class BigdataSparqlTest
          * which is deemed incorrect because sparql11-sum-02.srx in 
          * the Sesame Test Suite v2.7.12 is wrong: it specifies {totalPrice=0} 
          * as the correct result (see TestTCK.test_sparql11_sum_02()). Note that 
-         * the latest release sesame-sparql-testsuite 4.1.1 still contains 
+         * the latest release rdf4j-sparql-testsuite 4.1.1 still contains 
          * the wrong result file.
          * See https://openrdf.atlassian.net/browse/SES-884
          */ 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTest.java
index 3e160e0b7a..deee70f359 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTest.java
@@ -33,9 +33,9 @@
  */
 package com.bigdata.rdf.sail.tck;
 
-import info.aduna.iteration.CloseableIteration;
-import info.aduna.iteration.Iteration;
-import info.aduna.iteration.Iterations;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.Iteration;
+import org.eclipse.rdf4j.common.iteration.Iterations;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,22 +43,22 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.impl.EmptyBindingSet;
-import org.openrdf.query.impl.MapBindingSet;
-import org.openrdf.sail.RDFStoreTest;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailConnection;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.impl.EmptyBindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.sail.RDFStoreTest;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.SailConnection;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.btree.keys.CollatorEnum;
 import com.bigdata.btree.keys.StrengthEnum;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java
index 2b20f4c72c..1126e76c2a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java
@@ -54,17 +54,17 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007
 
 package com.bigdata.rdf.sail.webapp;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 import com.bigdata.journal.IIndexManager;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractTestNanoSparqlClient.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractTestNanoSparqlClient.java
index f2bdeeeda9..49cec75edf 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractTestNanoSparqlClient.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/AbstractTestNanoSparqlClient.java
@@ -43,34 +43,34 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.server.Server;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RDFWriterFactory;
-import org.openrdf.rio.RDFWriterRegistry;
-import org.openrdf.rio.helpers.StatementCollector;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.RDFWriter;
+import org.eclipse.rdf4j.rio.RDFWriterFactory;
+import org.eclipse.rdf4j.rio.RDFWriterRegistry;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/ProxyTestCase.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/ProxyTestCase.java
index 891fe7bc1d..efa090eee2 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/ProxyTestCase.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/ProxyTestCase.java
@@ -35,14 +35,14 @@
 import junit.extensions.proxy.IProxyTest;
 import junit.framework.Test;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.GraphImpl;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.GraphImpl;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.journal.AbstractJournalTestCase;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTestConcurrentRestApiRequests.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTestConcurrentRestApiRequests.java
index 0a5673d216..431553356a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTestConcurrentRestApiRequests.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTestConcurrentRestApiRequests.java
@@ -53,17 +53,17 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.parser.sparql.SPARQLUpdateTest;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLUpdateTest;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.bop.engine.QueryTimeoutException;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTest_REST_MultiTenancy.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTest_REST_MultiTenancy.java
index 2d68b0126f..1c92eb69e5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTest_REST_MultiTenancy.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/StressTest_REST_MultiTenancy.java
@@ -35,10 +35,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.QueryEvaluationException;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBLZG1943.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBLZG1943.java
index 0bb51fd573..a016b975f0 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBLZG1943.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBLZG1943.java
@@ -28,14 +28,14 @@
 
 import java.util.Properties;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.rdf.axioms.NoAxioms;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBackupServlet.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBackupServlet.java
index 4147e56698..03ee123595 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBackupServlet.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBackupServlet.java
@@ -30,7 +30,7 @@
 
 import junit.framework.Test;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java
index 2de37887f5..f04bb28b86 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java
@@ -28,32 +28,32 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BooleanQuery;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestConneg.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestConneg.java
index 85492fa3ab..7b087e22f1 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestConneg.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestConneg.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -29,9 +29,9 @@
 
 import junit.framework.TestCase2;
 
-import org.openrdf.query.resultio.BooleanQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.counters.format.CounterSetFormat;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestDataLoaderServlet.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestDataLoaderServlet.java
index a9f922e4b4..fe4d471aed 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestDataLoaderServlet.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestDataLoaderServlet.java
@@ -28,8 +28,8 @@
 import java.util.Properties;
 import java.util.UUID;
 
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import junit.framework.Test;
 
@@ -118,7 +118,7 @@ public void test_load01() throws Exception {
 
 		try {
 			String queryStr = "select * where { ?s ?p ?o }";
-			final org.openrdf.query.TupleQuery tq = cxn.prepareTupleQuery(
+			final org.eclipse.rdf4j.query.TupleQuery tq = cxn.prepareTupleQuery(
 					QueryLanguage.SPARQL, queryStr);
 			final TupleQueryResult tqr = tq.evaluate();
 			try {
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestFederatedQuery.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestFederatedQuery.java
index 5ccd700acc..925067fce1 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestFederatedQuery.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestFederatedQuery.java
@@ -57,9 +57,9 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007
  */
 package com.bigdata.rdf.sail.webapp;
 
-import info.aduna.io.IOUtil;
-import info.aduna.iteration.Iterations;
-import info.aduna.text.StringUtil;
+import org.eclipse.rdf4j.common.io.IOUtil;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+import org.eclipse.rdf4j.common.text.StringUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -78,34 +78,34 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007
 import junit.framework.Test;
 import junit.util.PropertyUtil;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.util.ModelUtil;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.Query;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResultUtil;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.dawg.DAWGTestResultSetUtil;
-import org.openrdf.query.impl.MutableTupleQueryResult;
-import org.openrdf.query.impl.TupleQueryResultBuilder;
-import org.openrdf.query.resultio.QueryResultIO;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultParser;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.util.ModelUtil;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.Query;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResultUtil;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.dawg.DAWGTestResultSetUtil;
+import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult;
+import org.eclipse.rdf4j.query.impl.TupleQueryResultBuilder;
+import org.eclipse.rdf4j.query.resultio.QueryResultIO;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestHelper.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestHelper.java
index e5630d55fb..c25d42cefb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestHelper.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestHelper.java
@@ -2,10 +2,10 @@
 
 import junit.framework.TestCase;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.RepositoryConnection;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
 
 import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepository;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepositoryManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
index 23d24df66a..89104015d5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestMultiTenancyAPI.java
@@ -45,14 +45,14 @@
 import junit.framework.Test;
 
 import org.eclipse.jetty.util.IO;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
index 42b7137bf7..392c12cb4b 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
@@ -29,23 +29,23 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RDFWriterFactory;
-import org.openrdf.rio.RDFWriterRegistry;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFWriter;
+import org.eclipse.rdf4j.rio.RDFWriterFactory;
+import org.eclipse.rdf4j.rio.RDFWriterRegistry;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepository;
@@ -1078,7 +1078,7 @@ public void testServiceNodeBindings() throws Exception {
         try {
           String queryStr = "select * where {SERVICE  {  rdfs:label ?langLabel. }}";
 //                String queryStr = "SELECT * WHERE { BIND ( AS ?ref) . SERVICE  { ?ref rdfs:label ?langLabel. } }";
-            final org.openrdf.query.TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, queryStr);
+            final org.eclipse.rdf4j.query.TupleQuery tq = cxn.prepareTupleQuery(QueryLanguage.SPARQL, queryStr);
             final TupleQueryResult tqr = tq.evaluate();
             try {
                 int cnt = 0;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestRebuildTextIndex.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestRebuildTextIndex.java
index 1282841458..1eff1bdc83 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestRebuildTextIndex.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestRebuildTextIndex.java
@@ -33,12 +33,12 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestServiceWhiteList.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestServiceWhiteList.java
index 88bebe732c..85f4054bb6 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestServiceWhiteList.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestServiceWhiteList.java
@@ -30,8 +30,8 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.server.Server;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.BigdataStatics;
 import com.bigdata.journal.BufferMode;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestSparqlUpdate.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestSparqlUpdate.java
index d7926bbc70..be4a291f0f 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestSparqlUpdate.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/TestSparqlUpdate.java
@@ -61,21 +61,21 @@ Copyright Aduna (http://www.aduna-software.com/) 2001-2007
 
 import junit.framework.Test;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.parser.sparql.SPARQLUpdateTest;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.parser.sparql.SPARQLUpdateTest;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.IIndexManager;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ASK.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ASK.java
index 9328d1f24d..d03af5432d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ASK.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ASK.java
@@ -25,7 +25,7 @@
 
 import junit.framework.Test;
 
-import org.openrdf.query.resultio.BooleanQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.IPreparedBooleanQuery;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_BY_ACCESS_PATH.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_BY_ACCESS_PATH.java
index 23a839469e..5ecafa326f 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_BY_ACCESS_PATH.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_BY_ACCESS_PATH.java
@@ -23,11 +23,11 @@
 
 package com.bigdata.rdf.sail.webapp;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import junit.framework.Test;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_WITH_BODY.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_WITH_BODY.java
index ef375be5a6..f8f281a33a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_WITH_BODY.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DELETE_WITH_BODY.java
@@ -25,7 +25,7 @@
 
 import junit.framework.Test;
 
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.IIndexManager;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DESCRIBE.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DESCRIBE.java
index 23e1c05270..d5f4a9f14d 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DESCRIBE.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_DESCRIBE.java
@@ -31,15 +31,15 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.GraphImpl;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.GraphImpl;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ESTCARD.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ESTCARD.java
index 2247dd667b..df8a62d959 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ESTCARD.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ESTCARD.java
@@ -28,12 +28,12 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.repository.RepositoryConnection;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_HASSTMT.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_HASSTMT.java
index 3508c5822a..f2d8a76fbb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_HASSTMT.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_HASSTMT.java
@@ -27,12 +27,12 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ServiceDescription.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ServiceDescription.java
index 5b982a3a3b..3e62550bf5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ServiceDescription.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_REST_ServiceDescription.java
@@ -25,8 +25,8 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.ValueFactory;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.ValueFactory;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1207.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1207.java
index 2df422a519..b6801af294 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1207.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1207.java
@@ -27,17 +27,17 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1717.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1717.java
index 53019e1840..541846fd1f 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1717.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1717.java
@@ -25,9 +25,9 @@
 
 import junit.framework.Test;
 
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.RemoveOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1893.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1893.java
index 6347e4b830..31efa5a3ef 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1893.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_1893.java
@@ -26,13 +26,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.RepositoryException;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.RepositoryException;
 
 import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepositoryConnection;
 
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_2091.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_2091.java
index f09e9e182d..d093adeec5 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_2091.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_2091.java
@@ -24,10 +24,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 import com.bigdata.bop.engine.NativeHeapStandloneChunkHandler;
 import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepositoryConnection;
 import com.bigdata.rdf.sparql.ast.QueryHints;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_605.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_605.java
index 900e4c4114..3365dc35eb 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_605.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_605.java
@@ -27,12 +27,12 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T165559.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T165559.java
index 2f1248b6a9..f21af1c723 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T165559.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T165559.java
@@ -20,14 +20,14 @@
 
 import java.util.Arrays;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T168741.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T168741.java
index 13ee66ef0d..7e4859ac4a 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T168741.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T168741.java
@@ -20,13 +20,13 @@
 
 import java.util.Arrays;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T172113.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T172113.java
index e54c136485..f678dd03b1 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T172113.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T172113.java
@@ -18,9 +18,9 @@
 
 import junit.framework.Test;
 
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.RemoveOp;
diff --git a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T173243.java b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T173243.java
index 951d7d370e..7a7bcc73c9 100644
--- a/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T173243.java
+++ b/bigdata-sails-test/src/test/java/com/bigdata/rdf/sail/webapp/Test_Ticket_T173243.java
@@ -20,13 +20,13 @@
 
 import java.util.Arrays;
 
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.webapp.client.RemoteRepository.AddOp;
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/model/util/ModelUtil.java b/bigdata-sails-test/src/test/java/org/openrdf/model/util/ModelUtil.java
index 5676942470..4382c0dd2b 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/model/util/ModelUtil.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/model/util/ModelUtil.java
@@ -11,7 +11,7 @@
  * implied.  See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.model.util;
+package org.eclipse.rdf4j.model.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,12 +20,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.util.iterators.Iterators;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.util.iterators.Iterators;
 
 /**
  * @author Arjohn Kampman
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
index 34f3e662b5..8ffce4fc93 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java
@@ -17,7 +17,7 @@
 /*
  * Pulled in to extend TestCase.
  */
-package org.openrdf.query.parser.sparql;
+package org.eclipse.rdf4j.query.parser.sparql;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,38 +35,38 @@
 import junit.framework.ComparisonFailure;
 import junit.framework.TestCase;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Model;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.DCTERMS;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.SESAME;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResults;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.TupleQueryResultHandlerBase;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.query.impl.DatasetImpl;
-import org.openrdf.query.impl.MapBindingSet;
-import org.openrdf.query.parser.sparql.manifest.SPARQL11ManifestTest;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.SESAME;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResults;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.TupleQueryResultHandlerBase;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.query.parser.sparql.manifest.SPARQL11ManifestTest;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 /**
  * A set of compliance tests on SPARQL query functionality which can not be
@@ -263,7 +263,7 @@ public void testNullContext2()
 		StringBuilder query = new StringBuilder();
 		query.append(getNamespaceDeclarations());
 		query.append(" SELECT * ");
-		query.append(" FROM sesame:nil ");
+		query.append(" FROM rdf4j:nil ");
 		query.append(" WHERE { ?s ?p ?o } ");
 
 		TupleQuery tq = conn.prepareTupleQuery(QueryLanguage.SPARQL, query.toString());
@@ -2360,7 +2360,7 @@ protected String getNamespaceDeclarations() {
 		StringBuilder declarations = new StringBuilder();
 		declarations.append("PREFIX dc: <" + DCTERMS.NAMESPACE + "> \n");
 		declarations.append("PREFIX foaf: <" + FOAF.NAMESPACE + "> \n");
-		declarations.append("PREFIX sesame: <" + SESAME.NAMESPACE + "> \n");
+		declarations.append("PREFIX rdf4j: <" + SESAME.NAMESPACE + "> \n");
 		declarations.append("PREFIX ex: <" + EX_NS + "> \n");
 		declarations.append("\n");
 
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLDataSet.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLDataSet.java
index bf31d0debd..69e604c83c 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLDataSet.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLDataSet.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql;
+package org.eclipse.rdf4j.query.parser.sparql;
 
 import java.util.HashMap;
 import java.util.Set;
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
index f4eafbce82..7b51cb92bf 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql;
+package org.eclipse.rdf4j.query.parser.sparql;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -39,29 +39,29 @@
 
 import junit.framework.TestCase;
 
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 
 /**
  * Tests for SPARQL 1.1 Update functionality.
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTestv2.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTestv2.java
index a8557a4780..756f75534f 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTestv2.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/SPARQLUpdateTestv2.java
@@ -17,7 +17,7 @@
 /*
  * Pulled in to extend TestCase.
  */
-package org.openrdf.query.parser.sparql;
+package org.eclipse.rdf4j.query.parser.sparql;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,26 +26,26 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.FOAF;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.UpdateExecutionException;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParseException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.FOAF;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.UpdateExecutionException;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/ManifestTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/ManifestTest.java
index e003b83ef9..46d227fb2b 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/ManifestTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/ManifestTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,25 +29,25 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.ZipUtil;
-import info.aduna.io.FileUtil;
-
-import org.openrdf.OpenRDFUtil;
-import org.openrdf.model.Resource;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.util.RDFInserter;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.turtle.TurtleParser;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.ZipUtil;
+import org.eclipse.rdf4j.common.io.FileUtil;
+
+import org.eclipse.rdf4j.OpenRDFUtil;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.util.RDFInserter;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.turtle.TurtleParser;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 public class ManifestTest {
 
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11ManifestTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11ManifestTest.java
index bdc77902af..33cc9e374e 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11ManifestTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11ManifestTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,25 +29,25 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.FileUtil;
-import info.aduna.io.ZipUtil;
-
-import org.openrdf.OpenRDFUtil;
-import org.openrdf.model.Resource;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.util.RDFInserter;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.turtle.TurtleParser;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.FileUtil;
+import org.eclipse.rdf4j.common.io.ZipUtil;
+
+import org.eclipse.rdf4j.OpenRDFUtil;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.util.RDFInserter;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.turtle.TurtleParser;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * Functionality for creating a JUnit test suite out of a W3C Working
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11SyntaxTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11SyntaxTest.java
index 2ed485bc91..40e6837d08 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11SyntaxTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQL11SyntaxTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -37,26 +37,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.FileUtil;
-import info.aduna.io.IOUtil;
-
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.DeleteData;
-import org.openrdf.query.algebra.InsertData;
-import org.openrdf.query.algebra.UpdateExpr;
-import org.openrdf.query.parser.ParsedOperation;
-import org.openrdf.query.parser.ParsedUpdate;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.helpers.SailUpdateExecutor;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.sail.NotifyingSailConnection;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.FileUtil;
+import org.eclipse.rdf4j.common.io.IOUtil;
+
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.DeleteData;
+import org.eclipse.rdf4j.query.algebra.InsertData;
+import org.eclipse.rdf4j.query.algebra.UpdateExpr;
+import org.eclipse.rdf4j.query.parser.ParsedOperation;
+import org.eclipse.rdf4j.query.parser.ParsedUpdate;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.helpers.SailUpdateExecutor;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.sail.NotifyingSailConnection;
+import org.eclipse.rdf4j.sail.SailException;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * A SPARQL 1.1 syntax test, created by reading in a W3C working-group style
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLQueryTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLQueryTest.java
index ae54f59826..912d480772 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLQueryTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLQueryTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,48 +34,48 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.IOUtil;
-import info.aduna.iteration.Iterations;
-import info.aduna.text.StringUtil;
-
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.util.Models;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.Query;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.QueryResults;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.dawg.DAWGTestResultSetUtil;
-import org.openrdf.query.impl.DatasetImpl;
-import org.openrdf.query.impl.MutableTupleQueryResult;
-import org.openrdf.query.impl.TupleQueryResultBuilder;
-import org.openrdf.query.resultio.BooleanQueryResultFormat;
-import org.openrdf.query.resultio.BooleanQueryResultParserRegistry;
-import org.openrdf.query.resultio.QueryResultIO;
-import org.openrdf.query.resultio.TupleQueryResultFormat;
-import org.openrdf.query.resultio.TupleQueryResultParser;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.util.RDFInserter;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.BasicParserSettings;
-import org.openrdf.rio.helpers.StatementCollector;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.IOUtil;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+import org.eclipse.rdf4j.common.text.StringUtil;
+
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.util.Models;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.BooleanQuery;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.Query;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.QueryResults;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.dawg.DAWGTestResultSetUtil;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.query.impl.MutableTupleQueryResult;
+import org.eclipse.rdf4j.query.impl.TupleQueryResultBuilder;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.BooleanQueryResultParserRegistry;
+import org.eclipse.rdf4j.query.resultio.QueryResultIO;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParser;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.util.RDFInserter;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * A SPARQL query test suite, created by reading in a W3C working-group style
@@ -682,7 +682,7 @@ public static TestSuite suite(String manifestFileURL, Factory factory, boolean a
 
 		// skip tests involving CSV result files, these are not query tests
 		query.append(" WHERE NOT resultFile LIKE \"*.csv\" ");
-		// skip tests involving JSON, sesame currently does not have a SPARQL/JSON
+		// skip tests involving JSON, rdf4j currently does not have a SPARQL/JSON
 		// parser.
 		query.append(" AND NOT resultFile LIKE \"*.srj\" ");
 		// skip tests involving entailment regimes
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLSyntaxTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLSyntaxTest.java
index 438331dc10..d384adbe6a 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLSyntaxTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLSyntaxTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -37,17 +37,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.FileUtil;
-import info.aduna.io.IOUtil;
-
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.FileUtil;
+import org.eclipse.rdf4j.common.io.IOUtil;
+
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 /**
  * A SPARQL syntax test, created by reading in a W3C working-group style manifest.  
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLUpdateConformanceTest.java b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLUpdateConformanceTest.java
index eb2cc8df66..655e44564d 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLUpdateConformanceTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/query/parser/sparql/manifest/SPARQLUpdateConformanceTest.java
@@ -14,7 +14,7 @@
  * implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package org.openrdf.query.parser.sparql.manifest;
+package org.eclipse.rdf4j.query.parser.sparql.manifest;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,32 +27,32 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.aduna.io.IOUtil;
-import info.aduna.iteration.Iterations;
-import info.aduna.text.StringUtil;
-
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.util.Models;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.Dataset;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
-import org.openrdf.query.impl.DatasetImpl;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.io.IOUtil;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+import org.eclipse.rdf4j.common.text.StringUtil;
+
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.util.Models;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/repository/RepositoryConnectionTest.java b/bigdata-sails-test/src/test/java/org/openrdf/repository/RepositoryConnectionTest.java
index 484533ab70..ca0b046289 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/repository/RepositoryConnectionTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/repository/RepositoryConnectionTest.java
@@ -17,7 +17,7 @@
 /*
  * Pulled in to extend TestCase.
  */
-package org.openrdf.repository;
+package org.eclipse.rdf4j.repository;
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.core.AnyOf.anyOf;
@@ -68,47 +68,47 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
-import info.aduna.iteration.CloseableIteration;
-import info.aduna.iteration.Iterations;
-
-import org.openrdf.model.BNode;
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LinkedHashModel;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.util.Namespaces;
-import org.openrdf.model.vocabulary.DC;
-import org.openrdf.model.vocabulary.OWL;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.MalformedQueryException;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryInterruptedException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.Update;
-import org.openrdf.query.impl.DatasetImpl;
-import org.openrdf.repository.contextaware.ContextAwareConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RioSetting;
-import org.openrdf.rio.helpers.BasicParserSettings;
-import org.openrdf.rio.helpers.RDFHandlerBase;
-import org.openrdf.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LinkedHashModel;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.util.Namespaces;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.BooleanQuery;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.MalformedQueryException;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryInterruptedException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.Update;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.repository.contextaware.ContextAwareConnection;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RioSetting;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
+import org.eclipse.rdf4j.rio.helpers.RDFHandlerBase;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
 import com.bigdata.rdf.store.BD;
 
diff --git a/bigdata-sails-test/src/test/java/org/openrdf/sail/RDFStoreTest.java b/bigdata-sails-test/src/test/java/org/openrdf/sail/RDFStoreTest.java
index 137d595eeb..934716583c 100644
--- a/bigdata-sails-test/src/test/java/org/openrdf/sail/RDFStoreTest.java
+++ b/bigdata-sails-test/src/test/java/org/openrdf/sail/RDFStoreTest.java
@@ -18,7 +18,7 @@
  * Pulled in to extend TestCase.
  * Also had to change visibility of testValueRoundTrip and verifyQueryResult
  */
-package org.openrdf.sail;
+package org.eclipse.rdf4j.sail;
 
 import static org.junit.Assert.*;
 
@@ -36,33 +36,33 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
-import info.aduna.iteration.CloseableIteration;
-import info.aduna.iteration.Iteration;
-import info.aduna.iteration.Iterations;
-
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Namespace;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.NumericLiteralImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.impl.EmptyBindingSet;
-import org.openrdf.query.impl.MapBindingSet;
-import org.openrdf.query.parser.ParsedTupleQuery;
-import org.openrdf.query.parser.QueryParserUtil;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.common.iteration.Iteration;
+import org.eclipse.rdf4j.common.iteration.Iterations;
+
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.NumericLiteralImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.algebra.TupleExpr;
+import org.eclipse.rdf4j.query.impl.EmptyBindingSet;
+import org.eclipse.rdf4j.query.impl.MapBindingSet;
+import org.eclipse.rdf4j.query.parser.ParsedTupleQuery;
+import org.eclipse.rdf4j.query.parser.QueryParserUtil;
 
 /**
  * A JUnit test for testing Sail implementations that store RDF data. This is
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/Concurrency.java b/bigdata-sails/src/samples/com/bigdata/samples/Concurrency.java
index 60b51a766e..6115e35a5c 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/Concurrency.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/Concurrency.java
@@ -18,14 +18,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.sail.BigdataSailRepository;
@@ -223,7 +223,7 @@ public void run() {
         /**
          * Load the LUBM ontology and U10 data into a Sesame Repository.
          * 
-         * @param repo the sesame repository
+         * @param repo the rdf4j repository
          * @throws Exception
          */
         private void loadU10(Repository repo) throws Exception {
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/LUBM.java b/bigdata-sails/src/samples/com/bigdata/samples/LUBM.java
index 238dfd4bdf..e5b359afca 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/LUBM.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/LUBM.java
@@ -1,7 +1,7 @@
 package com.bigdata.samples;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 public class LUBM {
     
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/LoadNamedGraphs.java b/bigdata-sails/src/samples/com/bigdata/samples/LoadNamedGraphs.java
index c1b18dde32..ca8ec09046 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/LoadNamedGraphs.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/LoadNamedGraphs.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -42,9 +42,9 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.Journal;
 import com.bigdata.journal.RWStrategy;
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/ReleaseTimes.java b/bigdata-sails/src/samples/com/bigdata/samples/ReleaseTimes.java
index 566b6c6f9a..e440ed095b 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/ReleaseTimes.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/ReleaseTimes.java
@@ -4,14 +4,14 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.sail.SailException;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.sail.SailException;
 
 import com.bigdata.journal.BufferMode;
 import com.bigdata.journal.ITx;
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/SampleCode.java b/bigdata-sails/src/samples/com/bigdata/samples/SampleCode.java
index 54202f2241..c924a35e82 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/SampleCode.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/SampleCode.java
@@ -20,30 +20,30 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.LiteralImpl;
-import org.openrdf.model.impl.StatementImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.RDFS;
-import org.openrdf.query.Binding;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.QueryEvaluationException;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFWriterRegistry;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.LiteralImpl;
+import org.eclipse.rdf4j.model.impl.StatementImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.query.Binding;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
+import org.eclipse.rdf4j.query.impl.BindingImpl;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFWriterRegistry;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.journal.Journal;
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/ScaleOut.java b/bigdata-sails/src/samples/com/bigdata/samples/ScaleOut.java
index 59035d858e..ef1d782a79 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/ScaleOut.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/ScaleOut.java
@@ -16,14 +16,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.rio.RDFFormat;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.rio.RDFFormat;
 
 import com.bigdata.journal.ITx;
 import com.bigdata.rdf.sail.BigdataSail;
@@ -293,7 +293,7 @@ public void run() {
         /**
          * Load the LUBM ontology and U10 data into a Sesame Repository.
          * 
-         * @param repo the sesame repository
+         * @param repo the rdf4j repository
          * @throws Exception
          */
         private void loadU10(Repository repo) throws Exception {
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/SparqlBuilder.java b/bigdata-sails/src/samples/com/bigdata/samples/SparqlBuilder.java
index 86aaeed0b5..f25c2b48cf 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/SparqlBuilder.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/SparqlBuilder.java
@@ -4,9 +4,9 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
-import org.openrdf.model.Literal;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
 
 /**
  * Demonstrate how to use bigdata.  You are free to use this code for whatever
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/TestNamedGraphs.java b/bigdata-sails/src/samples/com/bigdata/samples/TestNamedGraphs.java
index 9ff1d4fcff..66ff25a641 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/TestNamedGraphs.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/TestNamedGraphs.java
@@ -1,6 +1,6 @@
 /*
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -30,14 +30,14 @@
 import java.util.HashSet;
 import java.util.Properties;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.DatasetImpl;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryResult;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryResult;
 
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.sail.BigdataSailRepository;
diff --git a/bigdata-sails/src/samples/com/bigdata/samples/remoting/DemoSesameServer.java b/bigdata-sails/src/samples/com/bigdata/samples/remoting/DemoSesameServer.java
index eb49491308..5a030f866c 100644
--- a/bigdata-sails/src/samples/com/bigdata/samples/remoting/DemoSesameServer.java
+++ b/bigdata-sails/src/samples/com/bigdata/samples/remoting/DemoSesameServer.java
@@ -1,22 +1,22 @@
 package com.bigdata.samples.remoting;
 
-import org.openrdf.model.Graph;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.GraphImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.query.GraphQuery;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.http.HTTPRepository;
+import org.eclipse.rdf4j.model.Graph;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.GraphImpl;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.query.GraphQuery;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.http.HTTPRepository;
 import com.bigdata.rdf.store.BD;
 import com.bigdata.samples.SparqlBuilder;
 
 public class DemoSesameServer {
     
-    private static final String sesameURL = "http://localhost:9999/openrdf-sesame";
+    private static final String sesameURL = "http://localhost:9999/openrdf-rdf4j";
     
     private static final String repoID = "bigdata";
     
diff --git a/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/Test_Ticket_789.java b/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/Test_Ticket_789.java
index 7c667a7795..734551d722 100644
--- a/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/Test_Ticket_789.java
+++ b/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/Test_Ticket_789.java
@@ -27,18 +27,18 @@
 
 import junit.framework.Test;
 
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.GraphQueryResult;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.impl.DatasetImpl;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.GraphQueryResult;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.DatasetImpl;
 
 import com.bigdata.journal.IIndexManager;
 import com.bigdata.rdf.sail.remote.BigdataSailRemoteRepository;
diff --git a/bigdata-war/pom.xml b/bigdata-war/pom.xml
index 6b803b78cb..e8e3188b12 100644
--- a/bigdata-war/pom.xml
+++ b/bigdata-war/pom.xml
@@ -304,6 +304,7 @@ ga('send', 'pageview');
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       org.eclipse.rdf4j
diff --git a/blazegraph-war/pom.xml b/blazegraph-war/pom.xml
index 02100867c7..b89bd1c5aa 100644
--- a/blazegraph-war/pom.xml
+++ b/blazegraph-war/pom.xml
@@ -348,6 +348,7 @@ ga('send', 'pageview');
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
     
       org.eclipse.rdf4j
diff --git a/contrib/src/problems/alex/LoadPdb.java b/contrib/src/problems/alex/LoadPdb.java
index a81b8e97fe..16a23bbc05 100644
--- a/contrib/src/problems/alex/LoadPdb.java
+++ b/contrib/src/problems/alex/LoadPdb.java
@@ -7,21 +7,21 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.query.BindingSet;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.TupleQuery;
-import org.openrdf.query.TupleQueryResult;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryResult;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.helpers.StatementCollector;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.TupleQuery;
+import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.RepositoryConnection;
+import org.eclipse.rdf4j.repository.RepositoryResult;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 
 import com.bigdata.rdf.model.BigdataStatement;
 import com.bigdata.rdf.sail.BigdataSail;
diff --git a/pom.xml b/pom.xml
index bbe16a21bc..85a84528a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
   
     4.8.2
     3.9.3
-    2.9.0
+    3.7.7
     0.13.6
     0.7
     1.7.36
@@ -226,7 +226,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
     ${project.version}
     6.5.16
     
     2.6.7
@@ -386,9 +386,9 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
         bigdata-war-html
         bigdata-blueprints
         bigdata-runtime
-        bigdata-core-test/
-        bigdata-rdf-test/
-        bigdata-sails-test/
+        bigdata-core-test
+        bigdata-rdf-test
+        bigdata-sails-test
       
     
     
diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java b/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java
index 0c25a2e616..1399cdcd85 100644
--- a/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java
+++ b/rdf-properties/src/main/java/com/bigdata/rdf/ServiceProviderHook.java
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf;
 
-import info.aduna.lang.service.ServiceRegistry;
+import org.eclipse.rdf4j.common.lang.service.ServiceRegistry;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -37,16 +37,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.query.resultio.TupleQueryResultParserFactory;
-import org.openrdf.query.resultio.TupleQueryResultParserRegistry;
-import org.openrdf.query.resultio.TupleQueryResultWriterFactory;
-import org.openrdf.query.resultio.TupleQueryResultWriterRegistry;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParserFactory;
-import org.openrdf.rio.RDFParserRegistry;
-import org.openrdf.rio.RDFWriterFactory;
-import org.openrdf.rio.RDFWriterRegistry;
+import org.eclipse.rdf4j.query.QueryLanguage;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserFactory;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultParserRegistry;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterFactory;
+import org.eclipse.rdf4j.query.resultio.TupleQueryResultWriterRegistry;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserRegistry;
+import org.eclipse.rdf4j.rio.RDFWriterFactory;
+import org.eclipse.rdf4j.rio.RDFWriterRegistry;
 
 /**
  * This static class provides a hook which allows the replacement of services
@@ -193,7 +193,7 @@ synchronized static public void forceLoad() {
 //		 * classes.
 //		 */
 //		{
-//			final String className = "info.aduna.lang.service.ServiceRegistry";
+//			final String className = "rg.eclipse.rdf4j.common.lang.service.ServiceRegistry";
 //			try {
 //				Class.forName(className);
 //			} catch (ClassNotFoundException ex) {
diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java
index 209c1d9694..70da2a2d3d 100644
--- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java
+++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesFormat.java
@@ -57,7 +57,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
  */
 package com.bigdata.rdf.properties;
 
-import info.aduna.lang.FileFormat;
+import org.eclipse.rdf4j.common.lang.FileFormat;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -203,8 +203,7 @@ public static PropertiesFormat forMIMEType(final String mimeType) {
     public static PropertiesFormat forMIMEType(String mimeType,
             PropertiesFormat fallback) {
 
-        return matchMIMEType(mimeType, formats/* Iterable */,
-                fallback);
+        return matchMIMEType(mimeType, formats/* Iterable */).orElse(fallback);
         
     }
 
diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java
index 8f7d162a80..d226a2e61c 100644
--- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java
+++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesParserRegistry.java
@@ -57,9 +57,9 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
  */
 package com.bigdata.rdf.properties;
 
-import info.aduna.lang.service.FileFormatServiceRegistry;
+import org.eclipse.rdf4j.common.lang.service.FileFormatServiceRegistry;
 
-import org.openrdf.rio.RDFParserFactory;
+import org.eclipse.rdf4j.rio.RDFParserFactory;
 
 /**
  * A registry that keeps track of the available {@link RDFParserFactory}s.
diff --git a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java
index 3b10086ee0..acbd5cbae1 100644
--- a/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java
+++ b/rdf-properties/src/main/java/com/bigdata/rdf/properties/PropertiesWriterRegistry.java
@@ -57,7 +57,7 @@ Copyright Aduna (http://www.aduna-software.com/) � 2001-2007
  */
 package com.bigdata.rdf.properties;
 
-import info.aduna.lang.service.FileFormatServiceRegistry;
+import org.eclipse.rdf4j.common.lang.service.FileFormatServiceRegistry;
 
 /**
  * A registry that keeps track of the available {@link PropertiesWriterFactory}
diff --git a/sparql-grammar/pom.xml b/sparql-grammar/pom.xml
index c48a23e7ce..e41c01243c 100644
--- a/sparql-grammar/pom.xml
+++ b/sparql-grammar/pom.xml
@@ -84,6 +84,7 @@ Copyright 2010 by TalkingTrends (Amsterdam, The Netherlands)
       org.eclipse.rdf4j
       rdf4j-runtime
       ${rdf4j.version}
+      pom
     
   
 
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java
index 5edc42f3ce..6160c427c3 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTCompare.java
@@ -2,7 +2,7 @@
 
 package com.bigdata.rdf.sail.sparql.ast;
 
-import org.openrdf.query.algebra.Compare.CompareOp;
+import org.eclipse.rdf4j.query.algebra.Compare.CompareOp;
 import com.bigdata.rdf.sail.sparql.ast.SimpleNode;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor;
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java
index 4facdd286c..c19c6029de 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTLoad.java
@@ -2,7 +2,7 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.bigdata.rdf.sail.sparql.ast;
 
-import org.openrdf.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
 
 public
 class ASTLoad extends ASTUpdate {
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java
index df964d0555..a436f499ad 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTMath.java
@@ -2,7 +2,7 @@
 
 package com.bigdata.rdf.sail.sparql.ast;
 
-import org.openrdf.query.algebra.MathExpr.MathOp;
+import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp;
 import com.bigdata.rdf.sail.sparql.ast.SimpleNode;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor;
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java
index 771abc62ff..b0b7296f5d 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTNumericLiteral.java
@@ -2,7 +2,7 @@
 
 package com.bigdata.rdf.sail.sparql.ast;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.URI;
 import com.bigdata.rdf.sail.sparql.ast.ASTRDFValue;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilderVisitor;
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java
index 6146efad4c..668e02f005 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/ASTRDFValue.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
+Copyright (C) SYSTAP, LLC DBA Blazegraph 2006-2016.  All rights reserved.
 
 Contact:
      SYSTAP, LLC DBA Blazegraph
@@ -27,7 +27,7 @@
 
 package com.bigdata.rdf.sail.sparql.ast;
 
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Value;
 import com.bigdata.rdf.sail.sparql.ast.SimpleNode;
 import com.bigdata.rdf.sail.sparql.ast.SyntaxTreeBuilder;
 
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
index fd41db8b7e..f3b471ba8f 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java
@@ -3,12 +3,12 @@
 
 import java.io.StringReader;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.algebra.Compare.CompareOp;
-import org.openrdf.query.algebra.MathExpr.MathOp;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.algebra.Compare.CompareOp;
+import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
 
 public class SyntaxTreeBuilder/*@bgen(jjtree)*/implements SyntaxTreeBuilderTreeConstants, SyntaxTreeBuilderConstants {/*@bgen(jjtree)*/
   protected JJTSyntaxTreeBuilderState jjtree = new JJTSyntaxTreeBuilderState();
diff --git a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java
index 806fd8e955..6cefc7a935 100644
--- a/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java
+++ b/sparql-grammar/src/main/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java
@@ -1,12 +1,12 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. SyntaxTreeBuilderTokenManager.java */
 package com.bigdata.rdf.sail.sparql.ast;
 import java.io.StringReader;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.XMLSchema;
-import org.openrdf.query.algebra.Compare.CompareOp;
-import org.openrdf.query.algebra.MathExpr.MathOp;
-import org.openrdf.rio.RDFParser.DatatypeHandling;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.query.algebra.Compare.CompareOp;
+import org.eclipse.rdf4j.query.algebra.MathExpr.MathOp;
+import org.eclipse.rdf4j.rio.RDFParser.DatatypeHandling;
 
 /** Token Manager. */
 public class SyntaxTreeBuilderTokenManager implements SyntaxTreeBuilderConstants
diff --git a/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java b/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java
index 126ce6a9cd..6edeeb1f4f 100644
--- a/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java
+++ b/vocabularies/src/main/java/com/blazegraph/vocab/pubchem/PubChemVocabularyDecl.java
@@ -1,6 +1,6 @@
 /**
 
-Copyright (C) SYSTAP, LLC 2006-2015.  All rights reserved.
+Copyright (C) SYSTAP, LLC 2006-2015.  All rights reserved.
 
 Contact:
      SYSTAP, LLC
@@ -31,8 +31,8 @@
 import java.util.Collections;
 import java.util.Iterator;
 
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
+import org.eclipse.rdf4j.model.URI;
+import org.eclipse.rdf4j.model.impl.URIImpl;
 
 import com.bigdata.rdf.util.VocabBuilder;
 import com.bigdata.rdf.vocab.VocabularyDecl;
diff --git a/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java b/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java
index 4ea4c8ae65..6394f24a96 100644
--- a/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java
+++ b/vocabularies/src/test/java/com/blazegraph/vocab/pubchem/TestPubchemVocabInlineUris.java
@@ -9,7 +9,7 @@
 
 import com.bigdata.rdf.axioms.NoAxioms;
 import com.bigdata.rdf.model.BigdataStatement;
-import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataIRI;
 import com.bigdata.rdf.model.BigdataValueFactory;
 import com.bigdata.rdf.rio.StatementBuffer;
 import com.bigdata.rdf.sail.BigdataSail;
@@ -65,15 +65,15 @@ public void test_PubChemInlineValues() {
 
 			final BigdataValueFactory vf = store.getValueFactory();
 
-			final LinkedList uriList = new LinkedList();
+			final LinkedList uriList = new LinkedList();
 			
 			Random rand = new Random();
 
 			final StatementBuffer sb = new StatementBuffer(
 					store, PubChemInlineURIFactory.uris.length/* capacity */);
 			
-			BigdataURI pred = vf.createURI("http://semanticscience.org/resource/CHEMINF_000461");
-			BigdataURI obj = vf.createURI("http://rdf.ncbi.nlm.nih.gov/pubchem/compound/CID1726184");
+			BigdataIRI pred = vf.createURI("http://semanticscience.org/resource/CHEMINF_000461");
+			BigdataIRI obj = vf.createURI("http://rdf.ncbi.nlm.nih.gov/pubchem/compound/CID1726184");
 			
 			for (int i = 0; i < PubChemInlineURIFactory.uris.length; i++) {
 
@@ -82,7 +82,7 @@ public void test_PubChemInlineValues() {
 
 				final int test = rand.nextInt(999999);
 
-				final BigdataURI uri = vf.createURI(uriStr+prefix+test);
+				final BigdataIRI uri = vf.createURI(uriStr+prefix+test);
 
 				uriList.push(uri);
 				sb.add(uri, pred, obj);
@@ -96,7 +96,7 @@ public void test_PubChemInlineValues() {
 
 				final int test = rand.nextInt(999999);
 
-				final BigdataURI uri = vf.createURI(uriStr+prefix+test+suffix);
+				final BigdataIRI uri = vf.createURI(uriStr+prefix+test+suffix);
 
 				uriList.push(uri);
 				sb.add(uri, pred, obj);
@@ -105,7 +105,7 @@ public void test_PubChemInlineValues() {
 			{  //Add the fixed width ones
 				
 				 // http://www.bioassayontology.org/bao#BAO_0002877 fixed width 7
-				BigdataURI uri = null;
+				BigdataIRI uri = null;
 				uri = vf.createURI("http://www.bioassayontology.org/bao#BAO_002877");
 				uriList.push(uri);
 				sb.add(uri, pred, obj);
@@ -138,7 +138,7 @@ public void test_PubChemInlineValues() {
 			if (log.isDebugEnabled())
 				log.debug(store.dumpStore());
 			
-			for (final BigdataURI uri: uriList ) {
+			for (final BigdataIRI uri: uriList ) {
 
 				if(log.isDebugEnabled()) {
 					log.debug("Checking " + uri.getNamespace() + " "+ uri.getLocalName() + " inline: " + uri.getIV().isInline());