JENA-1454: Merge commit 'refs/pull/334/head' of github.com:apache/jena This closes #334.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0366da2c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0366da2c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0366da2c Branch: refs/heads/master Commit: 0366da2c37b64978893897eba068fdb6b47ea782 Parents: 6d57ce0 abb2d2c Author: Andy Seaborne <[email protected]> Authored: Sun Dec 31 10:47:31 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Sun Dec 31 10:47:31 2017 +0000 ---------------------------------------------------------------------- .../org/apache/jena/query/ResultSetFactory.java | 81 +-- .../apache/jena/query/ResultSetFormatter.java | 139 ++-- .../java/org/apache/jena/riot/ResultSetMgr.java | 274 +++++--- .../java/org/apache/jena/riot/WebContent.java | 15 + .../riot/lang/BlankNodeAllocatorGlobal.java | 58 ++ .../lang/BlankNodeAllocatorTraditional.java | 59 -- .../org/apache/jena/riot/lang/LabelToNode.java | 8 +- .../jena/riot/resultset/ResultSetLang.java | 2 +- .../jena/riot/resultset/ResultSetReader.java | 31 +- .../riot/resultset/ResultSetReaderRegistry.java | 73 ++- .../riot/resultset/ResultSetWriterRegistry.java | 85 +-- .../riot/resultset/rw/JSONInputIterator.java | 657 +++++++++++++++++++ .../jena/riot/resultset/rw/JSONResultsKW.java | 44 ++ .../jena/riot/resultset/rw/ReadAnything.java | 100 +++ .../riot/resultset/rw/ResultSetReaderJSON.java | 247 +++++++ .../resultset/rw/ResultSetReaderThrift.java | 60 ++ .../riot/resultset/rw/ResultSetReaderXML.java | 54 ++ .../riot/resultset/rw/ResultSetWriterJSON.java | 305 +++++++++ .../resultset/rw/ResultSetWriterThrift.java | 54 ++ .../riot/resultset/rw/ResultSetWriterXML.java | 380 +++++++++++ .../jena/riot/resultset/rw/ResultsReader.java | 161 +++++ .../jena/riot/resultset/rw/ResultsStAX.java | 473 +++++++++++++ .../jena/riot/resultset/rw/ResultsWriter.java | 133 ++++ .../jena/riot/resultset/rw/XMLResults.java | 50 ++ .../jena/riot/system/stream/StreamManager.java | 5 +- .../jena/sparql/engine/QueryEngineBase.java | 2 +- .../jena/sparql/engine/QueryExecutionBase.java | 2 +- .../sparql/engine/http/QueryEngineHTTP.java | 61 +- .../org/apache/jena/sparql/expr/E_BNode.java | 4 +- .../org/apache/jena/sparql/lang/ParserBase.java | 1 + .../sparql/modify/UpdateProcessRemoteBase.java | 2 +- .../jena/sparql/modify/UpdateProcessorBase.java | 2 +- .../modify/UpdateProcessorStreamingBase.java | 2 +- .../apache/jena/sparql/resultset/JSONInput.java | 227 +------ .../sparql/resultset/JSONInputIterator.java | 657 ------------------- .../jena/sparql/resultset/JSONOutput.java | 21 +- .../jena/sparql/resultset/JSONOutputASK.java | 54 -- .../sparql/resultset/JSONOutputResultSet.java | 266 -------- .../jena/sparql/resultset/JSONResultsKW.java | 43 -- .../jena/sparql/resultset/SPARQLResult.java | 20 +- .../apache/jena/sparql/resultset/XMLInput.java | 12 +- .../jena/sparql/resultset/XMLInputSAX.java | 25 +- .../jena/sparql/resultset/XMLInputStAX.java | 516 --------------- .../apache/jena/sparql/resultset/XMLOutput.java | 54 +- .../jena/sparql/resultset/XMLOutputASK.java | 74 --- .../sparql/resultset/XMLOutputResultSet.java | 286 -------- .../jena/sparql/resultset/XMLResults.java | 50 -- .../jena/sparql/sse/lang/ParseHandlerPlain.java | 6 +- .../org/apache/jena/sparql/util/Context.java | 43 +- .../apache/jena/sparql/util/LabelToNodeMap.java | 7 +- .../apache/jena/sparql/util/QueryExecUtils.java | 6 - .../jena/riot/lang/TestBlankNodeAllocator.java | 2 +- .../apache/jena/riot/lang/TestLabelToNode.java | 2 +- .../jena/sparql/resultset/TestResultSet.java | 64 +- jena-fuseki2/examples/service-tdb1-B.ttl | 1 + .../main/java/org/apache/jena/fuseki/DEF.java | 6 + .../apache/jena/fuseki/servlets/ActionBase.java | 6 - .../apache/jena/fuseki/servlets/HttpAction.java | 8 + .../jena/fuseki/servlets/ResponseDataset.java | 2 +- .../jena/fuseki/servlets/ResponseOps.java | 21 + .../jena/fuseki/servlets/ResponseResultSet.java | 187 +++--- 61 files changed, 3495 insertions(+), 2795 deletions(-) ----------------------------------------------------------------------
