Merge branch 'master' into jena926-remove-graphstore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/710084c1 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/710084c1 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/710084c1 Branch: refs/heads/add-contract-tests Commit: 710084c1d9ca472e322ac02bb5b94752de7fbda3 Parents: eae6a3d ce240bd Author: Andy Seaborne <[email protected]> Authored: Wed May 13 22:14:50 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed May 13 22:14:50 2015 +0100 ---------------------------------------------------------------------- .../apache/jena/query/ResultSetFormatter.java | 8 +- .../java/org/apache/jena/riot/web/HttpOp.java | 102 +++++------- .../apache/jena/riot/web/HttpResponseLib.java | 3 +- .../org/apache/jena/sparql/ARQConstants.java | 11 +- .../jena/sparql/engine/http/HttpQuery.java | 2 - .../apache/jena/sparql/engine/http/Service.java | 2 - .../org/apache/jena/sparql/expr/ExprDigest.java | 3 +- .../jena/sparql/resultset/OutputBase.java | 18 +-- .../sparql/serializer/FormatterElement.java | 8 +- .../serializer/QuerySerializerFactory.java | 29 +++- .../sparql/serializer/SerializerRegistry.java | 18 ++- .../apache/jena/sparql/util/MappedLoader.java | 2 + .../org/apache/jena/riot/TestRiotReader.java | 14 +- jena-arq/testing/ARQ/README | 3 + jena-arq/testing/ARQ/Serialization/manifest.ttl | 110 ++++++------- jena-arq/testing/ARQ/Serialization/serial.sh | 0 .../ARQ/Serialization/syntax-subselect-01.arq | 3 - .../ARQ/Serialization/syntax-subselect-01.rq | 3 + .../ARQ/Serialization/syntax-subselect-02.arq | 3 - .../ARQ/Serialization/syntax-subselect-02.rq | 3 + .../ARQ/Serialization/syntax-subselect-03.arq | 7 - .../ARQ/Serialization/syntax-subselect-03.rq | 7 + .../ARQ/Serialization/syntax-subselect-04.arq | 9 -- .../ARQ/Serialization/syntax-subselect-04.rq | 7 + .../ARQ/Serialization/syntax-subselect-10.arq | 3 + .../ARQ/Serialization/syntax-subselect-11.arq | 3 + .../ARQ/Serialization/syntax-subselect-12.arq | 7 + .../ARQ/Serialization/syntax-subselect-13.arq | 9 ++ .../org/apache/jena/atlas/io/InStreamUTF8.java | 1 - .../apache/jena/atlas/io/IndentedWriter.java | 2 - .../java/org/apache/jena/atlas/lib/Chars.java | 2 - .../java/org/apache/jena/atlas/lib/IRILib.java | 1 - .../apache/jena/atlas/lib/cache/CacheGuava.java | 14 +- .../jena/atlas/lib/cache/CacheSetImpl.java | 3 +- .../jena/atlas/lib/cache/CacheSimple.java | 33 ++-- .../java/org/apache/jena/atlas/lib/TS_Lib.java | 2 + .../org/apache/jena/atlas/lib/TestCache2.java | 13 +- .../jena/atlas/lib/cache/CacheSimpleTest.java | 43 +++++ .../jena/atlas/lib/cache/TestCacheSimple.java | 57 +++++++ .../apache/jena/assembler/AssemblerHelp.java | 33 +++- .../apache/jena/datatypes/xsd/XSDDatatype.java | 2 +- .../java/org/apache/jena/enhanced/EnhGraph.java | 22 +-- .../org/apache/jena/n3/N3IndentedWriter.java | 1 - .../org/apache/jena/n3/N3JenaWriterCommon.java | 17 +- .../java/org/apache/jena/n3/N3JenaWriterPP.java | 10 +- .../jena/n3/turtle/parser/TurtleParser.java | 7 +- .../jena/ontology/impl/OWLLiteProfile.java | 2 - .../rdfxml/xmlinput/impl/AbsXMLContext.java | 7 - .../jena/reasoner/rulesys/FBRuleInfGraph.java | 4 +- .../jena/reasoner/rulesys/builtins/Bound.java | 1 - .../jena/reasoner/rulesys/builtins/Drop.java | 1 - .../jena/reasoner/rulesys/builtins/Remove.java | 1 - .../jena/reasoner/rulesys/builtins/Unbound.java | 1 - .../jena/reasoner/rulesys/impl/Generator.java | 1 - .../jena/reasoner/rulesys/impl/LPRuleStore.java | 1 - .../reasoner/rulesys/impl/RuleClauseCode.java | 4 +- .../jena/shared/impl/PrefixMappingImpl.java | 2 +- .../java/org/apache/jena/util/cache/Cache.java | 49 ------ .../apache/jena/util/cache/CacheControl.java | 70 -------- .../apache/jena/util/cache/CacheManager.java | 53 ------ .../jena/util/cache/EnhancedNodeCache.java | 120 -------------- .../org/apache/jena/util/cache/RandCache.java | 162 ------------------- .../apache/jena/enhanced/test/TestPackage.java | 33 +--- .../java/org/apache/jena/util/TestCache.java | 125 -------------- .../java/org/apache/jena/util/TestPackage.java | 1 - jena-permissions/NOTICE | 6 +- jena-permissions/pom.xml | 15 -- .../jena/tdb/setup/DatasetBuilderStd.java | 25 ++- .../store/bulkloader2/CmdNodeTableBuilder.java | 10 +- 69 files changed, 411 insertions(+), 943 deletions(-) ----------------------------------------------------------------------
