Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f3a1faaa Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f3a1faaa Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f3a1faaa Branch: refs/heads/master Commit: f3a1faaa236040c097b25b299cc5502664a3aa72 Parents: db8b0e7 ff723ec Author: Rob Vesse <[email protected]> Authored: Tue May 30 18:41:11 2017 +0100 Committer: Rob Vesse <[email protected]> Committed: Tue May 30 18:41:11 2017 +0100 ---------------------------------------------------------------------- apache-jena-libs/pom.xml | 8 +- apache-jena-osgi/jena-osgi-features/pom.xml | 2 +- apache-jena-osgi/jena-osgi/pom.xml | 19 +- apache-jena-osgi/pom.xml | 4 +- apache-jena/bin/arq | 2 +- apache-jena/bin/infer | 2 +- apache-jena/bin/iri | 2 +- apache-jena/bin/juuid | 2 +- apache-jena/bin/nquads | 2 +- apache-jena/bin/ntriples | 2 +- apache-jena/bin/qparse | 2 +- apache-jena/bin/rdfcat | 2 +- apache-jena/bin/rdfcompare | 2 +- apache-jena/bin/rdfcopy | 2 +- apache-jena/bin/rdfdiff | 2 +- apache-jena/bin/rdfparse | 2 +- apache-jena/bin/rdfxml | 2 +- apache-jena/bin/riot | 2 +- apache-jena/bin/rset | 2 +- apache-jena/bin/rsparql | 2 +- apache-jena/bin/rupdate | 2 +- apache-jena/bin/schemagen | 2 +- apache-jena/bin/sparql | 2 +- apache-jena/bin/tdbbackup | 2 +- apache-jena/bin/tdbdump | 2 +- apache-jena/bin/tdbloader | 2 +- apache-jena/bin/tdbquery | 2 +- apache-jena/bin/tdbstats | 2 +- apache-jena/bin/tdbupdate | 2 +- apache-jena/bin/trig | 2 +- apache-jena/bin/turtle | 2 +- apache-jena/bin/uparse | 2 +- apache-jena/bin/update | 2 +- apache-jena/bin/utf8 | 2 +- apache-jena/bin/wwwdec | 2 +- apache-jena/bin/wwwenc | 2 +- apache-jena/pom.xml | 34 +- apache-jena/template.bin | 2 +- jena-arq/pom.xml | 12 +- .../arq/examples/riot/ExRIOT_2.java | 50 +- .../arq/examples/riot/ExRIOT_4.java | 6 +- .../arq/examples/riot/ExRIOT_5.java | 18 +- .../arq/examples/riot/ExRIOT_6.java | 5 +- .../arq/examples/riot/ExRIOT_7.java | 4 +- .../apache/jena/atlas/data/SortedDataBag.java | 1 + .../java/org/apache/jena/atlas/json/JSON.java | 37 +- .../org/apache/jena/atlas/json/JsonBuilder.java | 96 +- .../org/apache/jena/atlas/json/io/JSWriter.java | 43 +- .../apache/jena/atlas/json/io/parser/JSONP.java | 9 +- .../atlas/json/io/parser/JSONParserBase.java | 9 +- .../atlas/json/io/parser/TokenizerJSON.java | 36 +- .../apache/jena/atlas/web/TypedInputStream.java | 19 +- .../main/java/org/apache/jena/query/ARQ.java | 3 +- .../jena/query/QueryExecutionFactory.java | 96 +- .../apache/jena/query/ResultSetCloseable.java | 2 +- .../apache/jena/query/ResultSetFormatter.java | 22 +- .../main/java/org/apache/jena/riot/Lang.java | 7 +- .../java/org/apache/jena/riot/RDFDataMgr.java | 284 +-- .../java/org/apache/jena/riot/RDFLanguages.java | 43 +- .../java/org/apache/jena/riot/RDFParser.java | 383 ++++ .../org/apache/jena/riot/RDFParserBuilder.java | 523 +++++ .../org/apache/jena/riot/RDFParserRegistry.java | 119 +- .../java/org/apache/jena/riot/RDFWriter.java | 220 +++ .../org/apache/jena/riot/RDFWriterBuilder.java | 165 ++ .../org/apache/jena/riot/RDFWriterRegistry.java | 42 +- .../java/org/apache/jena/riot/ReaderRIOT.java | 17 +- .../org/apache/jena/riot/ReaderRIOTFactory.java | 11 +- .../java/org/apache/jena/riot/ResultSetMgr.java | 2 +- .../main/java/org/apache/jena/riot/SysRIOT.java | 24 +- .../java/org/apache/jena/riot/WebContent.java | 11 +- .../jena/riot/adapters/AdapterFileManager.java | 9 +- .../apache/jena/riot/adapters/AdapterLib.java | 51 +- .../jena/riot/adapters/AdapterRDFWriter.java | 14 +- .../jena/riot/adapters/RDFWriterRIOT.java | 14 +- .../jena/riot/checker/CheckerLiterals.java | 82 +- .../org/apache/jena/riot/lang/JsonLDReader.java | 60 +- .../org/apache/jena/riot/lang/LabelToNode.java | 2 +- .../org/apache/jena/riot/lang/LangBase.java | 38 +- .../java/org/apache/jena/riot/lang/LangCSV.java | 152 -- .../org/apache/jena/riot/lang/LangEngine.java | 199 +- .../org/apache/jena/riot/lang/LangNQuads.java | 5 +- .../org/apache/jena/riot/lang/LangNTuple.java | 30 +- .../org/apache/jena/riot/lang/LangRDFJSON.java | 5 +- .../org/apache/jena/riot/lang/LangRDFXML.java | 250 --- .../org/apache/jena/riot/lang/LangRIOT.java | 7 +- .../org/apache/jena/riot/lang/LangTriG.java | 4 +- .../apache/jena/riot/lang/LangTurtleBase.java | 57 +- .../apache/jena/riot/lang/ReaderRDFNULL.java | 33 +- .../apache/jena/riot/lang/ReaderRIOTCSV.java | 141 ++ .../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 272 +++ .../org/apache/jena/riot/lang/ReaderTriX.java | 46 +- .../org/apache/jena/riot/lang/RiotParsers.java | 236 +-- .../jena/riot/process/StreamRDFApplyObject.java | 56 + .../process/normalize/CanonicalizeLiteral.java | 5 + .../riot/process/normalize/DatatypeHandler.java | 2 +- .../riot/process/normalize/NormalizeValue.java | 13 +- .../normalize/StreamCanonicalLiterals.java | 54 + .../jena/riot/resultset/ResultSetLang.java | 12 +- .../org/apache/jena/riot/system/FactoryRDF.java | 3 + .../jena/riot/system/FactoryRDFCaching.java | 6 + .../apache/jena/riot/system/FactoryRDFStd.java | 6 +- .../apache/jena/riot/system/ParserProfile.java | 104 +- .../jena/riot/system/ParserProfileBase.java | 239 --- .../jena/riot/system/ParserProfileChecker.java | 143 -- .../jena/riot/system/ParserProfileStd.java | 269 +++ .../org/apache/jena/riot/system/Prologue.java | 5 +- .../org/apache/jena/riot/system/RiotLib.java | 350 ++-- .../riot/system/SerializationFactoryFinder.java | 21 +- .../jena/riot/system/stream/LocatorStdin.java | 2 +- .../jena/riot/system/stream/StreamManager.java | 32 +- .../org/apache/jena/riot/tokens/StringType.java | 31 + .../java/org/apache/jena/riot/tokens/Token.java | 72 +- .../org/apache/jena/riot/tokens/TokenType.java | 8 +- .../apache/jena/riot/tokens/TokenizerText.java | 936 +++++---- .../org/apache/jena/riot/web/HttpNames.java | 2 + .../java/org/apache/jena/riot/web/HttpOp.java | 26 +- .../apache/jena/riot/web/HttpResponseLib.java | 7 +- .../apache/jena/riot/writer/JsonLDWriter.java | 12 +- .../jena/sparql/algebra/TableFactory.java | 7 +- .../jena/sparql/core/DatasetGraphBaseFind.java | 4 + .../apache/jena/sparql/core/DatasetImpl.java | 2 + .../java/org/apache/jena/sparql/core/Quad.java | 3 + .../sparql/core/assembler/AssemblerUtils.java | 7 +- .../sparql/core/mem/DatasetGraphInMemory.java | 4 +- .../jena/sparql/engine/QueryIterator.java | 6 + .../jena/sparql/engine/ResultSetWrapper.java | 53 +- .../engine/binding/BindingInputStream.java | 9 +- .../jena/sparql/engine/binding/BindingRoot.java | 2 - .../sparql/engine/binding/BindingUtils.java | 15 + .../jena/sparql/engine/http/HttpQuery.java | 47 +- .../sparql/engine/http/QueryEngineHTTP.java | 35 +- .../sparql/engine/http/QueryExceptionHTTP.java | 28 +- .../sparql/engine/iterator/QueryIterGroup.java | 33 +- .../sparql/engine/iterator/QueryIterRoot.java | 20 +- .../sparql/engine/iterator/QueryIterSort.java | 14 +- .../sparql/engine/iterator/QueryIterTopN.java | 46 +- .../sparql/engine/main/LeftJoinClassifier.java | 32 +- .../jena/sparql/engine/main/OpExecutor.java | 6 +- .../sparql/engine/main/QueryEngineMain.java | 6 +- .../engine/main/StageGeneratorGeneric.java | 11 +- .../engine/optimizer/reorder/ReorderFixed.java | 19 +- .../org/apache/jena/sparql/engine/ref/Eval.java | 4 +- .../jena/sparql/engine/ref/EvaluatorSimple.java | 4 +- .../jena/sparql/expr/E_FunctionDynamic.java | 2 +- .../org/apache/jena/sparql/expr/E_Regex.java | 30 +- .../org/apache/jena/sparql/expr/NodeValue.java | 21 +- .../org/apache/jena/sparql/expr/RegexJava.java | 9 +- .../apache/jena/sparql/expr/RegexXerces.java | 4 +- .../jena/sparql/expr/nodevalue/NodeValueDT.java | 3 +- .../jena/sparql/modify/UpdateEngineWorker.java | 28 +- .../jena/sparql/modify/UpdateProcessRemote.java | 5 +- .../sparql/modify/UpdateProcessRemoteForm.java | 7 +- .../jena/sparql/path/eval/PathEngine.java | 2 +- .../jena/sparql/path/eval/PathEngineSPARQL.java | 18 +- .../jena/sparql/pfunction/PFuncListAndList.java | 51 + .../sparql/pfunction/PFuncListAndSimple.java | 59 + .../jena/sparql/pfunction/PFuncSimple.java | 3 +- .../sparql/pfunction/PFuncSimpleAndList.java | 4 +- .../sparql/pfunction/PropertyFunctionEval.java | 8 + .../pfunction/StandardPropertyFunctions.java | 6 +- .../sparql/resultset/JSONInputIterator.java | 10 +- .../jena/sparql/resultset/ResultSetMem.java | 7 +- .../jena/sparql/resultset/ResultSetWrapper.java | 5 +- .../sparql/sse/builders/ExprBuildException.java | 11 +- .../syntaxtransform/QueryTransformOps.java | 23 +- .../syntaxtransform/TransformElementLib.java | 9 + .../syntaxtransform/UpdateTransformOps.java | 24 +- .../apache/jena/sparql/util/DatasetUtils.java | 16 +- .../org/apache/jena/sparql/util/ModelUtils.java | 36 +- .../jena/update/UpdateExecutionFactory.java | 114 +- .../org/apache/jena/atlas/json/TS_JSON.java | 1 + .../org/apache/jena/atlas/json/TestJson.java | 3 +- .../org/apache/jena/atlas/json/TestJsonAPI.java | 46 + .../apache/jena/atlas/json/TestJsonBuilder.java | 47 +- .../org/apache/jena/atlas/json/TestJsonExt.java | 6 +- .../apache/jena/riot/ErrorHandlerTestLib.java | 2 + .../java/org/apache/jena/riot/TS_LangSuite.java | 2 +- .../org/apache/jena/riot/TS_RiotGeneral.java | 6 +- .../apache/jena/riot/TestJenaReaderRIOT.java | 5 +- .../org/apache/jena/riot/TestJsonLDReader.java | 13 +- .../org/apache/jena/riot/TestRDFParser.java | 197 ++ .../org/apache/jena/riot/TestRDFWriter.java | 88 + .../jena/riot/lang/ParserTestBaseLib.java | 22 +- .../org/apache/jena/riot/lang/TestLangCSV.java | 4 +- .../apache/jena/riot/lang/TestLangNTriples.java | 16 +- .../apache/jena/riot/lang/TestLangNTuples.java | 243 +-- .../apache/jena/riot/lang/TestLangRdfJson.java | 3 +- .../apache/jena/riot/lang/TestLangTurtle.java | 9 +- .../jena/riot/lang/TestParserFactory.java | 49 +- .../jena/riot/lang/TestPipedRDFIterators.java | 6 +- .../org/apache/jena/riot/lang/TestTriXBad.java | 4 +- .../apache/jena/riot/lang/TestTriXReader.java | 7 +- .../apache/jena/riot/lang/TestTurtleTerms.java | 8 +- .../jena/riot/process/TestNormalization.java | 64 +- .../jena/riot/stream/TestStreamManager.java | 3 +- .../jena/riot/system/TestLangRegistration.java | 7 +- .../jena/riot/thrift/TestThriftSetup.java | 2 + .../apache/jena/riot/tokens/TestTokenizer.java | 69 +- .../jena/riot/writer/TestJsonLDWriter.java | 161 +- .../mem/TestDatasetGraphInMemoryPromote.java | 5 + .../engine/iterator/TestQueryIterSort.java | 91 +- .../jena/sparql/expr/TestE_FunctionDynamic.java | 36 + .../org/apache/jena/sparql/expr/TestRegex.java | 7 + .../org/apache/jena/sparql/path/TestPath.java | 20 + .../syntaxtransform/TestSyntaxTransform.java | 54 +- .../transaction/AbstractTestTransPromote.java | 116 +- .../results-construct-quad-syntax-3.ttl | 2 +- .../results-construct-quad-syntax-7.ttl | 2 +- .../Lang/TrigStd/trig-syntax-bad-list-02.trig | 2 +- jena-arq/testing/RIOT/Parser/data.rdf | 5 + jena-arq/testing/RIOT/Parser/data.ttl | 5 + jena-arq/testing/RIOT/Parser/data.unknown | 5 + jena-base/pom.xml | 6 +- .../apache/jena/atlas/io/IndentedWriter.java | 1 - .../org/apache/jena/atlas/lib/AlarmClock.java | 2 +- .../apache/jena/atlas/lib/ByteBufferLib.java | 4 +- .../jena/atlas/logging/java/FlatFormatter.java | 4 +- .../jena/atlas/logging/java/FlatHandler.java | 4 +- .../jena/atlas/logging/java/TextFormatter.java | 8 +- jena-cmds/pom.xml | 12 +- .../main/java/arq/cmdline/ModLangOutput.java | 1 + jena-cmds/src/main/java/arq/query.java | 23 +- .../src/main/java/riotcmd/CmdLangParse.java | 94 +- jena-cmds/src/main/java/riotcmd/infer.java | 2 +- jena-cmds/src/main/java/riotcmd/riot.java | 12 +- jena-core/pom.xml | 10 +- .../jena/examples/rdf/Tutorial06.java | 2 +- .../assembler/assemblers/AssemblerGroup.java | 26 +- .../assembler/assemblers/OntModelAssembler.java | 4 +- .../assemblers/OntModelSpecAssembler.java | 5 +- .../jena/datatypes/xsd/XSDbase64Binary.java | 5 +- .../apache/jena/datatypes/xsd/XSDhexBinary.java | 5 +- .../datatypes/xsd/impl/XSDBaseNumericType.java | 2 +- .../java/org/apache/jena/graph/BlankNodeId.java | 50 +- .../java/org/apache/jena/graph/GraphUtil.java | 164 +- .../java/org/apache/jena/rdf/model/Literal.java | 5 +- .../org/apache/jena/rdf/model/Resource.java | 6 +- .../apache/jena/rdf/model/impl/ModelCom.java | 17 +- .../reasoner/rulesys/builtins/MakeSkolem.java | 7 +- .../apache/jena/shared/impl/JenaParameters.java | 2 +- .../java/org/apache/jena/vocabulary/OWL.java | 171 +- .../java/org/apache/jena/vocabulary/RDF.java | 128 +- .../java/org/apache/jena/vocabulary/RDFS.java | 95 +- .../java/org/apache/jena/vocabulary/VCARD4.java | 221 +++ .../jena/graph/test/AbstractTestGraph.java | 32 +- .../jena/graph/test/TestTypedLiterals.java | 5 +- .../apache/jena/rdf/model/test/TestModel.java | 27 + .../apache/jena/test/RDFSJenaInitTestApp.java | 28 + .../org/apache/jena/test/TestSystemSetup.java | 29 + jena-csv/pom.xml | 10 +- .../java/org/apache/jena/lang/csv/CSV2RDF.java | 47 + .../java/org/apache/jena/lang/csv/InitCSV.java | 38 + .../org/apache/jena/lang/csv/ReaderRIOTCSV.java | 132 ++ .../jena/lang/csv/ReaderRIOTFactoryCSV.java | 31 + .../jena/propertytable/PropertyTable.java | 1 + .../jena/propertytable/graph/GraphCSV.java | 1 + .../impl/PropertyTableBuilder.java | 8 +- .../apache/jena/propertytable/lang/CSV2RDF.java | 10 +- .../apache/jena/propertytable/lang/LangCSV.java | 154 -- .../lang/ReaderRIOTFactoryCSV.java | 31 - .../propertytable/lang/ReaderRIOTLangCSV.java | 76 - jena-csv/src/main/java/riotcmdx/csv2rdf.java | 4 +- ...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +- .../org/apache/jena/lang/csv/TS_LangCSV.java | 28 + .../org/apache/jena/lang/csv/TestLangCSV.java | 114 ++ .../jena/propertytable/TS_PropertyTable.java | 2 - .../jena/propertytable/lang/TestLangCSV.java | 111 -- jena-csv/src/test/resources/test.csv | 6 +- jena-elephas/jena-elephas-common/pom.xml | 2 +- .../jena/hadoop/rdf/io/types/RdfTypesTest.java | 1 - jena-elephas/jena-elephas-io/pom.xml | 2 +- .../io/input/AbstractNLineFileInputFormat.java | 1 + .../AbstractBlockBasedNodeTupleReader.java | 26 +- .../AbstractLineBasedNodeTupleReader.java | 35 +- .../readers/AbstractLineBasedQuadReader.java | 8 +- .../readers/AbstractLineBasedTripleReader.java | 8 +- .../AbstractWholeFileNodeTupleReader.java | 20 +- .../io/input/readers/TriplesOrQuadsReader.java | 1 - .../io/input/readers/nquads/NQuadsReader.java | 14 +- .../input/readers/ntriples/NTriplesReader.java | 12 +- .../hadoop/rdf/io/input/util/RdfIOUtils.java | 23 +- .../writers/AbstractBatchedQuadWriter.java | 2 +- .../writers/AbstractWholeFileQuadWriter.java | 2 +- .../AbstractWholeFileQuadInputFormatTests.java | 2 +- .../io/input/bnodes/AbstractBlankNodeTests.java | 3 - .../io/input/bnodes/RdfThriftBlankNodeTest.java | 2 +- ...CompressedWholeFileQuadInputFormatTests.java | 2 +- .../util/AbstractTrackableInputStreamTests.java | 91 +- .../rdf/io/input/util/BlockInputStreamTest.java | 16 +- .../AbstractNodeTupleOutputFormatTests.java | 3 +- .../output/trig/TriGBlankNodeOutputTests.java | 8 +- .../turtle/TurtleBlankNodeOutputTests.java | 6 +- jena-elephas/jena-elephas-mapreduce/pom.xml | 2 +- .../group/AbstractQuadGroupingMapper.java | 1 + .../filter/AbstractQuadValidityFilterTests.java | 2 +- .../AbstractTripleValidityFilterTests.java | 2 +- jena-elephas/jena-elephas-stats/pom.xml | 2 +- .../apache/jena/hadoop/rdf/stats/RdfStats.java | 86 +- jena-elephas/pom.xml | 6 +- jena-extras/jena-querybuilder/pom.xml | 6 +- .../arq/querybuilder/AbstractQueryBuilder.java | 132 +- .../jena/arq/querybuilder/AskBuilder.java | 26 +- .../jena/arq/querybuilder/ConstructBuilder.java | 25 +- .../jena/arq/querybuilder/DescribeBuilder.java | 316 ++++ .../jena/arq/querybuilder/ExprFactory.java | 1783 ++++++++++++++++++ .../jena/arq/querybuilder/SelectBuilder.java | 47 +- .../arq/querybuilder/clauses/PrologClause.java | 8 + .../arq/querybuilder/clauses/SelectClause.java | 22 +- .../clauses/SolutionModifierClause.java | 14 + .../arq/querybuilder/clauses/ValuesClause.java | 169 ++ .../arq/querybuilder/clauses/WhereClause.java | 99 +- .../arq/querybuilder/handlers/HandlerBlock.java | 25 +- .../querybuilder/handlers/PrologHandler.java | 5 + .../querybuilder/handlers/ValuesHandler.java | 208 ++ .../arq/querybuilder/handlers/WhereHandler.java | 24 +- .../jena/arq/AbstractRegexpBasedTest.java | 3 + .../querybuilder/AbstractQueryBuilderTest.java | 19 +- .../DescribeBuilderContractTest.java | 53 + .../jena/arq/querybuilder/ExprFactoryTest.java | 701 +++++++ .../arq/querybuilder/SelectBuilderTest.java | 59 + .../querybuilder/clauses/SelectClauseTest.java | 70 +- .../querybuilder/clauses/ValuesClauseTest.java | 270 +++ .../querybuilder/clauses/WhereClauseTest.java | 18 +- .../handlers/ValuesHandlerTest.java | 400 ++++ .../querybuilder/handlers/WhereHandlerTest.java | 74 +- jena-extras/pom.xml | 6 +- jena-fuseki1/config-tdb-text.ttl | 8 - jena-fuseki1/pom.xml | 20 +- .../apache/jena/fuseki/servlets/REST_Quads.java | 17 +- .../jena/fuseki/servlets/SPARQL_REST.java | 17 +- .../jena/fuseki/validation/DataValidator.java | 22 +- jena-fuseki2/apache-jena-fuseki/pom.xml | 4 +- jena-fuseki2/jena-fuseki-core/fuseki-dev | 5 + jena-fuseki2/jena-fuseki-core/pom.xml | 27 +- .../java/org/apache/jena/fuseki/FusekiLib.java | 13 +- .../apache/jena/fuseki/mgt/ActionDatasets.java | 12 +- .../jena/fuseki/migrate/GraphLoadUtils.java | 5 +- .../apache/jena/fuseki/server/FusekiEnv.java | 13 +- .../apache/jena/fuseki/servlets/ActionBase.java | 8 +- .../jena/fuseki/servlets/ActionSPARQL.java | 16 +- .../jena/fuseki/servlets/ResponseResultSet.java | 151 +- .../fuseki/servlets/SPARQL_QueryGeneral.java | 4 +- .../jena/fuseki/servlets/SPARQL_Update.java | 16 +- .../jena/fuseki/validation/DataValidator.java | 113 +- .../jena/fuseki/validation/IRIValidator.java | 155 +- .../jena/fuseki/validation/QueryValidator.java | 138 +- .../jena/fuseki/validation/UpdateValidator.java | 75 +- .../fuseki/validation/ValidationAction.java | 95 - .../jena/fuseki/validation/ValidationError.java | 24 - .../jena/fuseki/validation/ValidatorBase.java | 176 ++ .../fuseki/validation/ValidatorBaseJson.java | 25 +- .../validation/html/DataValidatorHTML.java | 216 +++ .../validation/html/IRIValidatorHTML.java | 100 + .../validation/html/QueryValidatorHTML.java | 234 +++ .../validation/html/UpdateValidatorHTML.java | 142 ++ .../validation/html/ValidatorHtmlLib.java | 117 ++ .../validation/json/DataValidatorJSON.java | 94 + .../validation/json/IRIValidatorJSON.java | 104 + .../validation/json/QueryValidatorJSON.java | 157 ++ .../validation/json/UpdateValidatorJSON.java | 94 + .../validation/json/ValidationAction.java | 95 + .../fuseki/validation/json/ValidationError.java | 24 + .../validation/json/ValidatorJsonLib.java | 85 + .../src/main/webapp/WEB-INF/web.xml | 45 +- .../src/main/webapp/dataset.html | 4 +- .../java/org/apache/jena/fuseki/ServerCtl.java | 23 +- .../java/org/apache/jena/fuseki/TestAuth.java | 2 +- .../org/apache/jena/fuseki/TestDatasetOps.java | 18 +- jena-fuseki2/jena-fuseki-embedded/pom.xml | 36 +- .../fuseki/embedded/FusekiEmbeddedServer.java | 125 +- .../jena/fuseki/embedded/FusekiTestAuth.java | 191 ++ .../jena/fuseki/embedded/FusekiTestServer.java | 123 +- .../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 2 + .../fuseki/embedded/TestEmbeddedFuseki.java | 43 +- .../fuseki/embedded/TestFusekiTestAuth.java | 100 + .../fuseki/embedded/TestFusekiTestServer.java | 60 + .../fuseki/embedded/TestMultipleEmbedded.java | 16 +- .../testing/FusekiEmbedded/test.txt | 1 + jena-fuseki2/jena-fuseki-server/pom.xml | 4 +- jena-fuseki2/jena-fuseki-war/pom.xml | 2 +- jena-fuseki2/pom.xml | 7 +- jena-integration-tests/pom.xml | 20 +- .../rdfconnection/TestRDFConnectionRemote.java | 21 +- jena-iri/pom.xml | 4 +- jena-jdbc/jena-jdbc-core/pom.xml | 4 +- jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 22 +- jena-jdbc/jena-jdbc-driver-mem/pom.xml | 6 +- jena-jdbc/jena-jdbc-driver-remote/pom.xml | 164 +- .../jena/jdbc/remote/TS_JdbcDriverRemote.java | 6 +- .../TestRemoteEndpointConnection.java | 16 +- .../TestRemoteEndpointConnectionWithAuth.java | 57 +- ...stRemoteEndpointConnectionWithGraphUris.java | 16 +- ...oteEndpointConnectionWithResultSetTypes.java | 16 +- .../metadata/TestRemoteConnectionMetadata.java | 12 +- .../results/TestRemoteEndpointResults.java | 18 +- .../TestRemoteEndpointResultsWithAuth.java | 49 +- .../TestRemoteEndpointResultsWithGraphUris.java | 18 +- ...RemoteEndpointResultsWithResultSetTypes.java | 18 +- .../TestRemoteEndpointStatements.java | 12 +- jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 10 +- jena-jdbc/pom.xml | 4 +- jena-parent/pom.xml | 70 +- jena-permissions/pom.xml | 4 +- .../example/readonly/ReadOnlyEval.java | 104 + .../example/readonly/package-info.java | 22 + .../graph/SecuredGraphEventManager.java | 6 +- jena-rdfconnection/pom.xml | 12 +- .../org/apache/jena/rdfconnection/RDFConn.java | 41 +- .../rdfconnection/RDFConnectionFactory.java | 3 +- .../jena/rdfconnection/RDFConnectionRemote.java | 70 +- .../jena/rdfconnection/TS_RDFConnection.java | 3 +- .../apache/jena/rdfconnection/TestRDFConn.java | 127 ++ jena-sdb/pom.xml | 14 +- .../apache/jena/sdb/engine/QueryEngineSDB.java | 2 +- .../java/org/apache/jena/sdb/sql/TableDump.java | 4 +- .../apache/jena/sdb/store/TupleLoaderOne.java | 3 +- .../java/org/apache/jena/sdb/util/StrUtils.java | 4 +- jena-shaded-guava/pom.xml | 6 +- jena-spatial/pom.xml | 47 +- .../main/java/examples/JenaSpatialExample1.java | 25 +- .../src/main/java/jena/spatialindexdump.java | 6 +- .../jena/query/spatial/DistanceUnitsUtils.java | 2 +- .../jena/query/spatial/EntityDefinition.java | 2 +- .../query/spatial/SpatialDatasetFactory.java | 21 - .../apache/jena/query/spatial/SpatialIndex.java | 2 +- .../jena/query/spatial/SpatialIndexContext.java | 6 +- .../jena/query/spatial/SpatialIndexLucene.java | 19 +- .../jena/query/spatial/SpatialIndexSolr.java | 177 -- .../apache/jena/query/spatial/SpatialQuery.java | 4 +- .../jena/query/spatial/SpatialQueryFuncs.java | 6 +- .../assembler/EntityDefinitionAssembler.java | 2 +- .../spatial/assembler/SpatialAssembler.java | 1 - .../assembler/SpatialIndexLuceneAssembler.java | 2 +- .../assembler/SpatialIndexSolrAssembler.java | 81 - .../query/spatial/assembler/SpatialVocab.java | 3 - .../query/spatial/pfunction/SpatialMatch.java | 8 +- .../pfunction/SpatialOperationPFBase.java | 7 +- .../AbstractTestIndexingSpatialData.java | 2 +- .../jena/query/spatial/SpatialSearchUtil.java | 35 +- .../apache/jena/query/spatial/TS_Spatial.java | 11 - .../TestIndexingSpatialDataWithSolr.java | 40 - .../assembler/AbstractTestSpatialAssembler.java | 9 +- .../TestEntityDefinitionAssembler.java | 4 +- .../TestSpatialIndexSolrAssembler.java | 38 - .../TestEastPFWithEmbeddedSolrSpatialIndex.java | 47 - ...rsectsBoxPFWithEmbeddedSolrSpatialIndex.java | 44 - ...tIsNearByPFWithEmbeddedSolrSpatialIndex.java | 41 - ...WithinBoxPFWithEmbeddedSolrSpatialIndex.java | 47 - ...hinCirclePFWithEmbeddedSolrSpatialIndex.java | 41 - ...TestNorthPFWithEmbeddedSolrSpatialIndex.java | 47 - ...TestSouthPFWithEmbeddedSolrSpatialIndex.java | 47 - .../TestWestPFWithEmbeddedSolrSpatialIndex.java | 47 - .../SolrHome/SolrARQCollection/conf/schema.xml | 56 - .../SolrARQCollection/conf/solrconfig.xml | 77 - .../src/test/resources/SolrHome/solr.xml | 8 - .../src/test/resources/log4j.properties | 7 +- .../resources/spatial-config-spatialindexer.ttl | 2 - .../src/test/resources/spatial-config.ttl | 2 - .../src/test/resources/spatial-solr-config.ttl | 51 - jena-tdb/pom.xml | 12 +- .../src/main/java/org/apache/jena/tdb/TDB.java | 4 +- .../org/apache/jena/tdb/store/DateTimeNode.java | 5 - .../transaction/DatasetGraphTransaction.java | 12 +- .../jena/tdb/transaction/Transaction.java | 10 +- .../tdb/transaction/TransactionManager.java | 56 +- .../org/apache/jena/tdb/store/TestNodeId.java | 7 +- .../java/org/apache/jena/tdb/sys/TS_Sys.java | 3 + .../tdb/transaction/AbstractTestTransSeq.java | 3 +- .../tdb/transaction/TestTransPromoteTDB.java | 6 + jena-text-es/.gitignore | 0 jena-text-es/LICENSE | 202 ++ jena-text-es/NOTICE | 5 + jena-text-es/pom.xml | 226 +++ .../main/java/examples/JenaESTextExample.java | 95 + .../apache/jena/query/text/es/ESSettings.java | 177 ++ .../jena/query/text/es/InitJenaTextES.java | 40 + .../query/text/es/TextESDatasetFactory.java | 57 + .../apache/jena/query/text/es/TextIndexES.java | 451 +++++ .../text/es/assembler/TextIndexESAssembler.java | 117 ++ .../src/main/resources/META-INF/LICENSE | 202 ++ jena-text-es/src/main/resources/META-INF/NOTICE | 5 + ...rg.apache.jena.system.JenaSubsystemLifecycle | 1 + jena-text-es/src/main/resources/data-es.ttl | 46 + .../org/apache/jena/query/text/properties.xml | 9 + .../src/main/resources/text-config-es.ttl | 64 + .../jena/query/text/es/it/BaseESTest.java | 111 ++ .../jena/query/text/es/it/TextIndexESIT.java | 306 +++ .../src/test/resources/log4j.properties | 10 + jena-text-es/testing/TextQuery/data.skos | 36 + jena-text-es/testing/TextQuery/data1.ttl | 26 + .../testing/TextQuery/text-config-union.ttl | 44 + jena-text-es/testing/TextQuery/text-config.ttl | 43 + jena-text-es/text-config.ttl | 62 + jena-text/pom.xml | 47 +- jena-text/src/main/java/jena/textindexdump.java | 6 +- .../jena/query/text/DatasetGraphText.java | 137 +- .../apache/jena/query/text/InitJenaText.java | 11 + .../jena/query/text/TextDatasetFactory.java | 29 +- .../org/apache/jena/query/text/TextIndex.java | 4 +- .../apache/jena/query/text/TextIndexLucene.java | 100 +- .../query/text/TextIndexLuceneMultilingual.java | 75 - .../apache/jena/query/text/TextIndexSolr.java | 251 --- .../apache/jena/query/text/TextQueryFuncs.java | 6 +- .../org/apache/jena/query/text/TextQueryPF.java | 87 +- .../text/analyzer/ConfigurableAnalyzer.java | 33 +- .../text/analyzer/LowerCaseKeywordAnalyzer.java | 14 +- .../text/analyzer/MultilingualAnalyzer.java | 54 + .../apache/jena/query/text/analyzer/Util.java | 10 +- .../ConfigurableAnalyzerAssembler.java | 3 +- .../assembler/LocalizedAnalyzerAssembler.java | 5 +- .../LowerCaseKeywordAnalyzerAssembler.java | 3 +- .../text/assembler/SimpleAnalyzerAssembler.java | 3 +- .../assembler/StandardAnalyzerAssembler.java | 9 +- .../query/text/assembler/TextAssembler.java | 2 +- .../assembler/TextIndexLuceneAssembler.java | 4 +- .../text/assembler/TextIndexSolrAssembler.java | 68 - .../jena/query/text/assembler/TextVocab.java | 8 +- jena-text/src/main/resources/data-es.ttl | 46 + jena-text/src/main/resources/text-config-es.ttl | 64 + .../org/apache/jena/query/text/TS_Text.java | 20 +- .../TestDatasetWithEmbeddedSolrTextIndex.java | 54 - .../text/TestLuceneWithMultipleThreads.java | 3 +- .../apache/jena/query/text/TextSearchUtil.java | 8 +- .../assembler/TestTextIndexSolrAssembler.java | 69 - jena-text/src/test/resources/log4j.properties | 5 - .../testing/TextQuery/text-config-union.ttl | 2 - jena-text/testing/TextQuery/text-config.ttl | 2 - .../testing/TextQuery/text-solr-config.ttl | 45 - jena-text/text-config.ttl | 2 - pom.xml | 14 +- 530 files changed, 17738 insertions(+), 7501 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/f3a1faaa/jena-elephas/jena-elephas-stats/src/main/java/org/apache/jena/hadoop/rdf/stats/RdfStats.java ----------------------------------------------------------------------
