Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52CDF17897 for ; Sat, 23 May 2015 06:58:12 +0000 (UTC) Received: (qmail 97106 invoked by uid 500); 23 May 2015 06:58:12 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 97064 invoked by uid 500); 23 May 2015 06:58:12 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 96754 invoked by uid 99); 23 May 2015 06:58:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2015 06:58:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 080A5E0009; Sat, 23 May 2015 06:58:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: claude@apache.org To: commits@jena.apache.org Date: Sat, 23 May 2015 06:58:30 -0000 Message-Id: <70adf30c73f341758db94bb90d43237a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/25] jena git commit: Merge branch 'master' into add-contract-tests Merge branch 'master' into add-contract-tests Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dcab5a09 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dcab5a09 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dcab5a09 Branch: refs/heads/master Commit: dcab5a0948f78fa33de01d82fe3ac6522541f582 Parents: 6908e1c 8d53fed Author: Claude Warren Authored: Sat May 16 09:57:30 2015 +0100 Committer: Claude Warren Committed: Sat May 16 09:57:30 2015 +0100 ---------------------------------------------------------------------- .../update/UpdateExecuteOperations.java | 17 +- .../arq/examples/update/UpdateProgrammatic.java | 4 +- .../arq/examples/update/UpdateReadFromFile.java | 4 +- .../src/main/java/arq/cmdline/CmdUpdate.java | 19 +- .../src/main/java/arq/cmdline/ModDataset.java | 7 +- .../main/java/arq/cmdline/ModGraphStore.java | 95 --- jena-arq/src/main/java/arq/load.java | 4 +- jena-arq/src/main/java/arq/update.java | 69 +- .../org/apache/jena/atlas/json/JsonArray.java | 2 +- .../atlas/json/io/parser/TokenizerJSON.java | 697 +++++++++---------- .../java/org/apache/jena/query/Dataset.java | 8 +- .../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 +- .../sparql/core/assembler/AssemblerUtils.java | 1 - .../core/assembler/GraphStoreAssembler.java | 47 -- .../jena/sparql/engine/http/HttpQuery.java | 2 - .../apache/jena/sparql/engine/http/Service.java | 2 - .../org/apache/jena/sparql/expr/ExprDigest.java | 3 +- .../apache/jena/sparql/lang/arq/ARQParser.java | 2 +- .../jena/sparql/modify/GraphStoreBasic.java | 19 - .../jena/sparql/modify/GraphStoreNull.java | 20 +- .../jena/sparql/modify/GraphStoreWrapper.java | 13 - .../jena/sparql/modify/UpdateEngineBase.java | 9 +- .../jena/sparql/modify/UpdateEngineFactory.java | 6 +- .../jena/sparql/modify/UpdateEngineMain.java | 31 +- .../sparql/modify/UpdateEngineNonStreaming.java | 32 +- .../sparql/modify/UpdateEngineRegistry.java | 6 +- .../jena/sparql/modify/UpdateEngineWorker.java | 117 ++-- .../jena/sparql/modify/UpdateProcessRemote.java | 3 +- .../sparql/modify/UpdateProcessRemoteBase.java | 22 +- .../sparql/modify/UpdateProcessRemoteForm.java | 3 +- .../jena/sparql/modify/UpdateProcessorBase.java | 23 +- .../modify/UpdateProcessorStreamingBase.java | 42 +- .../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 + .../java/org/apache/jena/update/GraphStore.java | 15 +- .../apache/jena/update/GraphStoreFactory.java | 7 + .../org/apache/jena/update/UpdateAction.java | 172 +++-- .../jena/update/UpdateExecutionFactory.java | 193 +++-- .../org/apache/jena/update/UpdateProcessor.java | 13 +- .../jena/update/UpdateProcessorStreaming.java | 9 +- .../jena/web/DatasetGraphAccessorHTTP.java | 3 +- jena-arq/src/main/java/riotcmd/utf8.java | 48 +- .../query/TestParameterizedSparqlString.java | 3 +- .../org/apache/jena/riot/TestRiotReader.java | 14 +- .../jena/riot/lang/TestPipedRDFIterators.java | 6 +- .../jena/riot/system/TestIO_JenaReaders.java | 4 +- .../jena/riot/system/TestIO_JenaWriters.java | 4 +- .../sparql/core/AbstractTestDynamicDataset.java | 5 +- .../sparql/core/TestDatasetGraphWithLock.java | 4 +- .../jena/sparql/core/TestDynamicDatasetMem.java | 8 +- .../sparql/engine/index/TestIndexTable.java | 4 +- .../apache/jena/sparql/graph/GraphsTests.java | 33 +- .../apache/jena/sparql/graph/TestDatasets.java | 20 +- .../apache/jena/sparql/junit/EarlTestCase.java | 8 +- .../org/apache/jena/sparql/junit/QueryTest.java | 10 +- .../jena/sparql/junit/SurpressedTest.java | 2 +- .../apache/jena/sparql/junit/SyntaxTest.java | 2 +- .../jena/sparql/junit/SyntaxUpdateTest.java | 2 +- .../jena/sparql/junit/TestSerialization.java | 2 +- .../apache/jena/sparql/junit/UpdateTest.java | 6 +- .../sparql/modify/AbstractTestUpdateBase.java | 50 +- .../sparql/modify/AbstractTestUpdateGraph.java | 49 +- .../modify/AbstractTestUpdateGraphMgt.java | 10 +- .../jena/sparql/modify/TestUpdateGraphMem.java | 9 +- .../sparql/modify/TestUpdateGraphMgtMem.java | 15 +- .../sparql/modify/TestUpdateOperations.java | 17 +- .../apache/jena/sparql/util/TestFmtUtils.java | 6 +- 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 + .../apache/jena/atlas/io/CharStreamReader.java | 23 +- .../main/java/org/apache/jena/atlas/io/IO.java | 13 +- .../org/apache/jena/atlas/io/InStreamASCII.java | 4 +- .../org/apache/jena/atlas/io/InStreamUTF8.java | 5 +- .../apache/jena/atlas/io/IndentedWriter.java | 7 +- .../apache/jena/atlas/io/PeekInputStream.java | 98 ++- .../org/apache/jena/atlas/io/PeekReader.java | 3 +- .../org/apache/jena/atlas/iterator/Iter.java | 152 +--- .../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 | 24 +- .../java/org/apache/jena/atlas/lib/TS_Lib.java | 2 + .../org/apache/jena/atlas/lib/TestCache2.java | 13 +- .../jena/atlas/lib/TestDateTimeUtils.java | 10 +- .../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 +- .../jena/ontology/impl/TestAllDifferent.java | 2 +- .../jena/ontology/impl/TestClassExpression.java | 112 +-- .../jena/ontology/impl/TestIndividual.java | 42 +- .../apache/jena/ontology/impl/TestOntTools.java | 3 +- .../apache/jena/ontology/impl/TestOntology.java | 8 +- .../apache/jena/ontology/impl/TestProperty.java | 54 +- .../apache/jena/ontology/impl/TestResource.java | 50 +- .../model/test/AbstractContainerMethods.java | 2 +- .../rdf/model/test/AbstractModelTestBase.java | 4 +- .../jena/rdf/model/test/IsomorphicTests.java | 4 +- .../jena/rdf/model/test/TestAddAndContains.java | 4 +- .../jena/rdf/model/test/TestAddModel.java | 4 +- .../jena/rdf/model/test/TestConcurrency.java | 4 +- .../rdf/model/test/TestConcurrencyNesting.java | 2 +- .../rdf/model/test/TestConcurrencyParallel.java | 2 +- .../rdf/model/test/TestCopyInOutOfModel.java | 2 +- .../org/apache/jena/rdf/model/test/TestGet.java | 4 +- .../jena/rdf/model/test/TestIterators.java | 2 +- .../jena/rdf/model/test/TestListStatements.java | 4 +- .../jena/rdf/model/test/TestListSubjects.java | 2 +- .../rdf/model/test/TestLiteralsInModel.java | 2 +- .../jena/rdf/model/test/TestModelEvents.java | 2 +- .../rdf/model/test/TestModelSetOperations.java | 4 +- .../rdf/model/test/TestObjectOfProperties.java | 2 +- .../apache/jena/rdf/model/test/TestObjects.java | 4 +- .../rdf/model/test/TestReifiedStatements.java | 2 +- .../rdf/model/test/TestResourceMethods.java | 2 +- .../jena/rdf/model/test/TestSelectorUse.java | 2 +- .../jena/rdf/model/test/TestSeqMethods.java | 2 +- .../model/test/TestSimpleListStatements.java | 2 +- .../jena/rdf/model/test/TestSimpleSelector.java | 2 +- .../rdf/model/test/TestStatementCreation.java | 4 +- .../rdf/model/test/TestStatementMethods.java | 2 +- .../jena/rdfxml/xmloutput/PrettyWriterTest.java | 2 +- .../jena/rdfxml/xmloutput/TestXMLFeatures.java | 4 +- .../java/org/apache/jena/util/TestCache.java | 125 ---- .../java/org/apache/jena/util/TestPackage.java | 1 - .../jena/propertytable/graph/GraphCSVTest.java | 4 +- .../org/apache/jena/iri/TestIRIFactory.java | 2 +- .../java/org/apache/jena/sdb/SDBFactory.java | 2 +- .../apache/jena/sdb/modify/UpdateEngineSDB.java | 6 +- .../apache/jena/sdb/store/DatasetGraphSDB.java | 17 - .../jena/sdb/test/modify/TestSPARQLUpdate.java | 7 +- .../sdb/test/modify/TestSPARQLUpdateMgt.java | 8 +- .../apache/jena/tdb/modify/UpdateEngineTDB.java | 12 +- .../jena/tdb/setup/DatasetBuilderStd.java | 25 +- .../apache/jena/tdb/store/DatasetGraphTDB.java | 14 - .../store/bulkloader2/CmdNodeTableBuilder.java | 10 +- .../transaction/DatasetGraphTransaction.java | 190 ++--- .../main/java/tdb/cmdline/ModTDBGraphStore.java | 51 -- jena-tdb/src/main/java/tdb/tdbupdate.java | 15 +- .../jena/tdb/store/TestDynamicDatasetTDB.java | 3 + .../apache/jena/tdb/store/Test_SPARQL_TDB.java | 3 +- 183 files changed, 1674 insertions(+), 2706 deletions(-) ----------------------------------------------------------------------