Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/886e5118 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/886e5118 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/886e5118 Branch: refs/heads/master Commit: 886e5118f591acca28544ab3c0cb2316000b04d6 Parents: 3243759 4b5cd26 Author: ales004 <ciceron...@hotmail.com> Authored: Sat May 14 16:38:29 2016 +0200 Committer: ales004 <ciceron...@hotmail.com> Committed: Sat May 14 16:38:29 2016 +0200 ---------------------------------------------------------------------- apache-jena/bat/arq.bat | 36 +- apache-jena/bat/infer.bat | 36 +- apache-jena/bat/iri.bat | 36 +- apache-jena/bat/juuid.bat | 36 +- apache-jena/bat/nquads.bat | 36 +- apache-jena/bat/ntriples.bat | 36 +- apache-jena/bat/qparse.bat | 36 +- apache-jena/bat/rdfcat.bat | 36 +- apache-jena/bat/rdfcompare.bat | 36 +- apache-jena/bat/rdfcopy.bat | 36 +- apache-jena/bat/rdfdiff.bat | 36 +- apache-jena/bat/rdfparse.bat | 36 +- apache-jena/bat/rdfxml.bat | 36 +- apache-jena/bat/riot.bat | 36 +- apache-jena/bat/rset.bat | 36 +- apache-jena/bat/rsparql.bat | 36 +- apache-jena/bat/rupdate.bat | 36 +- apache-jena/bat/schemagen.bat | 36 +- apache-jena/bat/sparql.bat | 36 +- apache-jena/bat/tdbbackup.bat | 36 +- apache-jena/bat/tdbdump.bat | 36 +- apache-jena/bat/tdbloader.bat | 36 +- apache-jena/bat/tdbquery.bat | 36 +- apache-jena/bat/tdbstats.bat | 36 +- apache-jena/bat/tdbupdate.bat | 36 +- apache-jena/bat/trig.bat | 36 +- apache-jena/bat/turtle.bat | 36 +- apache-jena/bat/uparse.bat | 36 +- apache-jena/bat/update.bat | 36 +- apache-jena/bat/utf8.bat | 36 +- apache-jena/bat/wwwdec.bat | 36 +- apache-jena/bat/wwwenc.bat | 36 +- apache-jena/template.bat | 36 +- jena-arq/Grammar/Notes | 92 +- jena-arq/Grammar/grammarExtracts | 114 +- jena-arq/README.txt | 28 +- jena-arq/Vocabularies/EARL-v0.rdf | 486 +-- jena-arq/Vocabularies/FOAF.rdf | 1214 +++--- jena-arq/Vocabularies/FOAF.ttl | 1866 ++++----- jena-arq/Vocabularies/doap.ttl | 806 ++-- jena-arq/Vocabularies/list-pfunction.ttl | 86 +- jena-arq/Vocabularies/result-set.ttl | 194 +- jena-arq/Vocabularies/test-dawg.ttl | 276 +- jena-arq/Vocabularies/test-manifest-1_0.ttl | 302 +- jena-arq/Vocabularies/test-manifest-1_1.ttl | 116 +- jena-arq/Vocabularies/test-manifest-x.ttl | 134 +- jena-arq/Vocabularies/test-manifest.ttl | 306 +- jena-arq/Vocabularies/test-query.ttl | 94 +- jena-arq/etc/dataset-db.ttl | 96 +- jena-arq/etc/dataset-owl-inf.ttl | 96 +- jena-arq/etc/dataset-owl.ttl | 66 +- jena-arq/etc/dataset-rdfs.ttl | 70 +- jena-arq/etc/dataset-rules.ttl | 78 +- jena-arq/etc/dataset-trans.ttl | 70 +- jena-arq/etc/dataset.ttl | 86 +- jena-arq/etc/graphstore.ttl | 84 +- jena-arq/etc/update-data.ttl | 38 +- .../constructquads/ExampleConstructQuads.java | 382 +- .../jena/query/ParameterizedSparqlString.java | 3420 ++++++++-------- .../java/org/apache/jena/query/package.html | 22 +- .../java/org/apache/jena/riot/lang/LangCSV.java | 304 +- .../apache/jena/riot/lang/PipedQuadsStream.java | 106 +- .../apache/jena/riot/lang/PipedRDFIterator.java | 784 ++-- .../apache/jena/riot/lang/PipedRDFStream.java | 140 +- .../jena/riot/lang/PipedTriplesStream.java | 106 +- .../jena/riot/lang/PipedTuplesStream.java | 110 +- .../jena/riot/out/SinkQuadBracedOutput.java | 274 +- .../org/apache/jena/riot/writer/TriGWriter.java | 16 +- .../apache/jena/riot/writer/WriterConst.java | 24 +- .../jena/sparql/core/DatasetGraphFactory.java | 8 +- .../jena/sparql/core/DatasetGraphMap.java | 2 +- .../jena/sparql/core/DatasetGraphMapLink.java | 10 +- .../jena/sparql/core/DatasetPrefixStorage.java | 5 +- .../org/apache/jena/sparql/core/GraphView.java | 7 +- .../sparql/engine/index/HashIndexTable.java | 436 +- .../jena/sparql/engine/index/IndexFactory.java | 90 +- .../jena/sparql/engine/index/IndexTable.java | 64 +- .../jena/sparql/engine/index/LinearIndex.java | 224 +- .../jena/sparql/graph/GraphUnionRead.java | 9 +- .../apache/jena/sparql/modify/UpdateEngine.java | 86 +- .../jena/sparql/modify/UpdateRequestSink.java | 150 +- .../apache/jena/sparql/modify/UpdateSink.java | 80 +- .../jena/sparql/modify/UpdateVisitorSink.java | 136 +- .../apache/jena/sparql/modify/UsingList.java | 88 +- .../jena/sparql/modify/UsingUpdateSink.java | 186 +- .../sparql/modify/request/UpdateDataWriter.java | 114 +- .../apache/jena/web/DatasetGraphAccessor.java | 52 +- .../jena/web/DatasetGraphAccessorBasic.java | 76 +- .../org/apache/jena/query/TS_ParamString.java | 62 +- .../query/TestParameterizedSparqlString.java | 3762 +++++++++--------- .../org/apache/jena/riot/TestRiotReader.java | 170 +- .../sparql/engine/index/TestIndexTable.java | 410 +- .../apache/jena/sparql/expr/TestFunctions.java | 62 +- .../web/AbstractTestDatasetGraphAccessor.java | 252 +- .../jena/web/TestDatasetGraphAccessorMem.java | 24 +- jena-arq/src/test/resources/test.csv | 6 +- .../Construct/results-construct-quad-data-2.ttl | 2 +- .../results-construct-quad-dataset.trig | 6 +- .../results-construct-quad-default-graph.ttl | 6 +- .../results-construct-quad-named-graph.trig | 4 +- .../results-construct-quad-short-form-1.trig | 4 +- .../results-construct-quad-short-form-2.ttl | 2 +- .../results-construct-quad-short-form-3.trig | 6 +- .../results-construct-quad-syntax-1.trig | 2 +- .../results-construct-quad-syntax-3.ttl | 2 +- .../results-construct-quad-syntax-4.trig | 10 +- .../results-construct-quad-syntax-5.trig | 10 +- .../results-construct-quad-syntax-6.trig | 10 +- .../results-construct-quad-syntax-7.ttl | 2 +- .../TrigStd/literal_with_CARRIAGE_RETURN.trig | 2 +- jena-cmds/src/main/java/tdb/tdbdump.java | 20 +- jena-core/src-examples/data/eswc-2006-09-21.rdf | 1438 +++---- jena-core/src-examples/data/test1.owl | 52 +- .../jena/reasoner/rulesys/impl/package.html | 16 +- .../apache/jena/reasoner/rulesys/package.html | 44 +- .../main/java/org/apache/jena/util/package.html | 18 +- .../java/org/apache/jena/vocabulary/SKOS.java | 192 +- .../java/org/apache/jena/vocabulary/SKOSXL.java | 124 +- .../src/main/resources/etc/owl-fb-micro.rules | 1164 +++--- .../src/main/resources/etc/owl-fb-mini.rules | 1496 +++---- jena-core/src/main/resources/etc/owl.rules | 610 +-- jena-core/src/main/resources/etc/rdfs.rules | 166 +- .../src/test/resources/ont-policy-test.rdf | 116 +- jena-core/src/test/resources/ontology/list0.rdf | 40 +- jena-core/src/test/resources/ontology/list1.rdf | 42 +- jena-core/src/test/resources/ontology/list2.rdf | 44 +- jena-core/src/test/resources/ontology/list3.rdf | 46 +- jena-core/src/test/resources/ontology/list4.rdf | 48 +- jena-core/src/test/resources/ontology/list5.rdf | 50 +- jena-core/testing/Turtle/build | 60 +- jena-core/testing/arp/i18n/badbom8.rdf | 68 +- jena-core/testing/arp/i18n/bom8.rdf | 66 +- jena-core/testing/arp/i18n/i18nID.rdf | 52 +- jena-core/testing/arp/xml-prop.rdf | 10 +- jena-core/testing/ontology/list0.rdf | 40 +- jena-core/testing/ontology/list1.rdf | 42 +- jena-core/testing/ontology/list2.rdf | 44 +- jena-core/testing/ontology/list3.rdf | 46 +- jena-core/testing/ontology/list4.rdf | 48 +- jena-core/testing/ontology/list5.rdf | 50 +- jena-core/testing/ontology/owl/Wine/food.owl | 2700 ++++++------- .../ontology/owl/list-syntax/test-proptypes.rdf | 64 +- jena-core/testing/ontology/relativenames.rdf | 44 +- jena-core/testing/ontology/testImport1/a.owl | 28 +- jena-core/testing/ontology/testImport1/readme | 2 +- jena-core/testing/ontology/testImport2/a.owl | 30 +- jena-core/testing/ontology/testImport2/b.owl | 28 +- jena-core/testing/ontology/testImport2/readme | 2 +- jena-core/testing/ontology/testImport3/a.owl | 28 +- jena-core/testing/ontology/testImport3/b.owl | 28 +- jena-core/testing/ontology/testImport3/c.owl | 26 +- jena-core/testing/ontology/testImport3/readme | 2 +- jena-core/testing/ontology/testImport4/a.owl | 30 +- jena-core/testing/ontology/testImport4/b.owl | 32 +- jena-core/testing/ontology/testImport4/readme | 2 +- jena-core/testing/ontology/testImport5/a.owl | 30 +- jena-core/testing/ontology/testImport5/b.owl | 28 +- jena-core/testing/ontology/testImport5/readme | 4 +- jena-core/testing/ontology/testImport6/a.owl | 32 +- jena-core/testing/ontology/testImport6/b.owl | 30 +- jena-core/testing/ontology/testImport6/c.owl | 28 +- jena-core/testing/ontology/testImport6/d.owl | 30 +- jena-core/testing/ontology/testImport6/readme | 6 +- jena-core/testing/ontology/testImport7/a.owl | 20 +- jena-core/testing/ontology/testImport8/a.owl | 50 +- jena-core/testing/ontology/testImport8/b.owl | 38 +- jena-core/testing/reasoners/bugs/sbug.owl | 80 +- jena-core/testing/reasoners/bugs/sbug.rdf | 48 +- .../testing/reasoners/bugs/userDatatypes.owl | 98 +- jena-core/testing/reasoners/include.rules | 10 +- .../testing/reasoners/owl/inconsistent7.rdf | 58 +- jena-core/testing/reasoners/owl/nondetbug.rdf | 64 +- jena-core/testing/reasoners/owl/nondetbug.rules | 38 +- jena-core/testing/reasoners/rdfs/data1.rdf | 36 +- jena-core/testing/reasoners/rdfs/data2.rdf | 38 +- jena-core/testing/reasoners/rdfs/data3.rdf | 54 +- jena-core/testing/reasoners/rdfs/dttest1.nt | 4 +- jena-core/testing/reasoners/rdfs/dttest2.nt | 4 +- jena-core/testing/reasoners/rdfs/dttest3.nt | 4 +- .../reasoners/rdfs/manifest-nodirect.rdf | 350 +- jena-core/testing/reasoners/rdfs/manifest.rdf | 378 +- jena-core/testing/reasoners/rdfs/query-res.nt | 8 +- jena-core/testing/reasoners/rdfs/query10.nt | 6 +- jena-core/testing/reasoners/rdfs/query11.nt | 6 +- jena-core/testing/reasoners/rdfs/query12.nt | 6 +- jena-core/testing/reasoners/rdfs/query13.nt | 6 +- jena-core/testing/reasoners/rdfs/query14.nt | 6 +- jena-core/testing/reasoners/rdfs/query15.nt | 6 +- jena-core/testing/reasoners/rdfs/query16.nt | 6 +- jena-core/testing/reasoners/rdfs/query17.nt | 10 +- jena-core/testing/reasoners/rdfs/query18.nt | 8 +- jena-core/testing/reasoners/rdfs/query19.nt | 10 +- jena-core/testing/reasoners/rdfs/query2.nt | 8 +- jena-core/testing/reasoners/rdfs/query20.nt | 8 +- jena-core/testing/reasoners/rdfs/query21.nt | 6 +- jena-core/testing/reasoners/rdfs/query22.nt | 6 +- jena-core/testing/reasoners/rdfs/query3.nt | 8 +- jena-core/testing/reasoners/rdfs/query4.nt | 8 +- jena-core/testing/reasoners/rdfs/query5.nt | 8 +- jena-core/testing/reasoners/rdfs/query7.nt | 8 +- jena-core/testing/reasoners/rdfs/query8.nt | 6 +- jena-core/testing/reasoners/rdfs/query9.nt | 6 +- jena-core/testing/reasoners/rdfs/result1.rdf | 28 +- jena-core/testing/reasoners/rdfs/result10.rdf | 32 +- jena-core/testing/reasoners/rdfs/result11.rdf | 418 +- jena-core/testing/reasoners/rdfs/result12.rdf | 178 +- jena-core/testing/reasoners/rdfs/result13.rdf | 70 +- jena-core/testing/reasoners/rdfs/result14.rdf | 26 +- jena-core/testing/reasoners/rdfs/result15.rdf | 26 +- .../reasoners/rdfs/result16-noresource.rdf | 62 +- jena-core/testing/reasoners/rdfs/result16.rdf | 126 +- jena-core/testing/reasoners/rdfs/result17.rdf | 62 +- jena-core/testing/reasoners/rdfs/result18.rdf | 46 +- .../reasoners/rdfs/result19-nodirect.rdf | 464 +-- jena-core/testing/reasoners/rdfs/result19.rdf | 462 +-- jena-core/testing/reasoners/rdfs/result2.rdf | 26 +- .../reasoners/rdfs/result20-nodirect.rdf | 42 +- jena-core/testing/reasoners/rdfs/result20.rdf | 48 +- jena-core/testing/reasoners/rdfs/result3.rdf | 38 +- jena-core/testing/reasoners/rdfs/result4.rdf | 34 +- jena-core/testing/reasoners/rdfs/result7.rdf | 26 +- jena-core/testing/reasoners/rdfs/result8.rdf | 28 +- jena-core/testing/reasoners/rdfs/result9.rdf | 26 +- jena-core/testing/reasoners/rdfs/tbox1.rdf | 64 +- .../testing/reasoners/rdfs/timing-data.rdf | 108 +- .../testing/reasoners/rdfs/timing-tbox.rdf | 78 +- .../testing/reasoners/ruleParserTest1.rules | 24 +- .../testing/reasoners/transitive/data1.rdf | 50 +- .../testing/reasoners/transitive/data2.rdf | 40 +- .../testing/reasoners/transitive/data3.rdf | 30 +- .../testing/reasoners/transitive/data6.rdf | 30 +- .../testing/reasoners/transitive/data8.rdf | 74 +- .../testing/reasoners/transitive/data9.rdf | 72 +- .../testing/reasoners/transitive/empty.rdf | 24 +- .../testing/reasoners/transitive/manifest.rdf | 194 +- .../testing/reasoners/transitive/query-all.nt | 10 +- .../testing/reasoners/transitive/query2.nt | 10 +- .../testing/reasoners/transitive/querysc.nt | 10 +- .../testing/reasoners/transitive/querysp.nt | 12 +- .../testing/reasoners/transitive/querysp2.nt | 12 +- .../testing/reasoners/transitive/result2.rdf | 28 +- .../testing/reasoners/transitive/result4.rdf | 62 +- .../testing/reasoners/transitive/result5.rdf | 34 +- .../testing/reasoners/transitive/result6.rdf | 48 +- .../testing/reasoners/transitive/tbox1.rdf | 70 +- .../testing/reasoners/transitive/tbox7.rdf | 70 +- .../testing/wg/cardinality/Manifest005.rdf | 90 +- .../testing/wg/cardinality/conclusions005.rdf | 80 +- .../testing/wg/cardinality/premises005.rdf | 60 +- jena-core/testing/wg/localtests/Manifest008.rdf | 60 +- .../wg/localtests/ManifestRestriction001.rdf | 60 +- .../wg/localtests/ManifestSubclass001.rdf | 60 +- .../testing/wg/localtests/conclusions008.rdf | 48 +- .../wg/localtests/conclusionsRestriction001.rdf | 34 +- .../wg/localtests/conclusionsSubclass001.rdf | 40 +- jena-core/testing/wg/localtests/premises008.rdf | 62 +- .../wg/localtests/premisesRestriction001.rdf | 66 +- .../wg/localtests/premisesSubclass001.rdf | 62 +- .../org/apache/jena/propertytable/Column.java | 90 +- .../jena/propertytable/PropertyTable.java | 252 +- .../java/org/apache/jena/propertytable/Row.java | 150 +- .../jena/propertytable/graph/GraphCSV.java | 124 +- .../propertytable/graph/GraphPropertyTable.java | 400 +- .../graph/QueryIterPropertyTable.java | 228 +- .../graph/QueryIterPropertyTableRow.java | 486 +-- .../jena/propertytable/graph/RowMatch.java | 96 +- .../graph/StageGeneratorPropertyTable.java | 114 +- .../jena/propertytable/impl/ColumnImpl.java | 114 +- .../impl/PropertyTableArrayImpl.java | 690 ++-- .../impl/PropertyTableBuilder.java | 270 +- .../impl/PropertyTableHashMapImpl.java | 704 ++-- .../apache/jena/propertytable/lang/LangCSV.java | 308 +- jena-csv/src/main/java/riotcmdx/csv2rdf.java | 104 +- .../jena/propertytable/AbstractColumnTest.java | 158 +- .../AbstractPropertyTableTest.java | 112 +- .../jena/propertytable/AbstractRowTest.java | 210 +- .../org/apache/jena/propertytable/BaseTest.java | 94 +- .../jena/propertytable/TS_PropertyTable.java | 84 +- .../jena/propertytable/graph/GraphCSVTest.java | 308 +- .../impl/AbstractPropertyTableBuilderTest.java | 276 +- .../impl/PropertyTableArrayImplTest.java | 168 +- .../PropertyTableBuilderForArrayImplTest.java | 78 +- .../PropertyTableBuilderForHashMapImplTest.java | 68 +- .../impl/PropertyTableHashMapImplTest.java | 92 +- jena-csv/src/test/resources/test.csv | 6 +- .../rdf/types/AbstractNodeTupleWritable.java | 388 +- .../rdf/types/CharacteristicSetWritable.java | 42 +- .../rdf/types/CharacteristicWritable.java | 40 +- .../hadoop/rdf/types/NodeTupleWritable.java | 52 +- .../jena/hadoop/rdf/types/NodeWritable.java | 376 +- .../jena/hadoop/rdf/types/QuadWritable.java | 270 +- .../jena/hadoop/rdf/types/TripleWritable.java | 274 +- .../comparators/SimpleBinaryComparator.java | 68 +- .../rdf/io/types/CharacteristicTests.java | 46 +- .../jena/hadoop/rdf/io/types/RdfTypesTest.java | 802 ++-- .../jena/hadoop/rdf/io/HadoopIOConstants.java | 36 +- .../jena/hadoop/rdf/io/RdfIOConstants.java | 162 +- .../io/input/AbstractNLineFileInputFormat.java | 60 +- .../io/input/AbstractWholeFileInputFormat.java | 36 +- .../hadoop/rdf/io/input/QuadsInputFormat.java | 40 +- .../hadoop/rdf/io/input/TriplesInputFormat.java | 78 +- .../rdf/io/input/TriplesOrQuadsInputFormat.java | 40 +- .../input/nquads/BlockedNQuadsInputFormat.java | 42 +- .../rdf/io/input/nquads/NQuadsInputFormat.java | 44 +- .../nquads/WholeFileNQuadsInputFormat.java | 42 +- .../ntriples/BlockedNTriplesInputFormat.java | 42 +- .../io/input/ntriples/NTriplesInputFormat.java | 44 +- .../ntriples/WholeFileNTriplesInputFormat.java | 42 +- .../io/input/rdfjson/RdfJsonInputFormat.java | 42 +- .../rdf/io/input/rdfxml/RdfXmlInputFormat.java | 42 +- .../AbstractBlockBasedNodeTupleReader.java | 688 ++-- .../readers/AbstractBlockBasedQuadReader.java | 46 +- .../readers/AbstractBlockBasedTripleReader.java | 46 +- .../AbstractLineBasedNodeTupleReader.java | 528 +-- .../readers/AbstractLineBasedQuadReader.java | 42 +- .../readers/AbstractLineBasedTripleReader.java | 42 +- .../rdf/io/input/readers/AbstractRdfReader.java | 216 +- .../AbstractWholeFileNodeTupleReader.java | 656 +-- .../readers/AbstractWholeFileQuadReader.java | 46 +- .../readers/AbstractWholeFileTripleReader.java | 46 +- .../rdf/io/input/readers/QuadsReader.java | 96 +- .../io/input/readers/TriplesOrQuadsReader.java | 142 +- .../rdf/io/input/readers/TriplesReader.java | 96 +- .../io/input/readers/TriplesToQuadsReader.java | 46 +- .../readers/nquads/BlockedNQuadsReader.java | 38 +- .../io/input/readers/nquads/NQuadsReader.java | 42 +- .../readers/nquads/WholeFileNQuadsReader.java | 38 +- .../readers/ntriples/BlockedNTriplesReader.java | 38 +- .../input/readers/ntriples/NTriplesReader.java | 42 +- .../ntriples/WholeFileNTriplesReader.java | 38 +- .../io/input/readers/rdfjson/RdfJsonReader.java | 38 +- .../io/input/readers/rdfxml/RdfXmlReader.java | 38 +- .../rdf/io/input/readers/trig/TriGReader.java | 38 +- .../rdf/io/input/readers/trix/TriXReader.java | 38 +- .../io/input/readers/turtle/TurtleReader.java | 38 +- .../rdf/io/input/trig/TriGInputFormat.java | 42 +- .../rdf/io/input/trix/TriXInputFormat.java | 78 +- .../rdf/io/input/turtle/TurtleInputFormat.java | 42 +- .../rdf/io/input/util/BlockInputStream.java | 36 +- .../hadoop/rdf/io/input/util/RdfIOUtils.java | 194 +- .../rdf/io/input/util/TrackableInputStream.java | 36 +- .../rdf/io/input/util/TrackedInputStream.java | 36 +- .../io/input/util/TrackedPipedQuadsStream.java | 40 +- .../io/input/util/TrackedPipedRDFStream.java | 36 +- .../input/util/TrackedPipedTriplesStream.java | 40 +- .../AbstractBatchedNodeTupleOutputFormat.java | 44 +- .../rdf/io/output/AbstractNodeOutputFormat.java | 38 +- .../output/AbstractNodeTupleOutputFormat.java | 218 +- .../io/output/nquads/NQuadsOutputFormat.java | 48 +- .../ntriples/NTriplesNodeOutputFormat.java | 42 +- .../output/ntriples/NTriplesOutputFormat.java | 48 +- .../io/output/rdfjson/RdfJsonOutputFormat.java | 48 +- .../io/output/rdfxml/RdfXmlOutputFormat.java | 48 +- .../io/output/trig/BatchedTriGOutputFormat.java | 106 +- .../turtle/BatchedTurtleOutputFormat.java | 98 +- .../io/output/turtle/TurtleOutputFormat.java | 110 +- .../writers/AbstractBatchedNodeTupleWriter.java | 38 +- .../writers/AbstractBatchedQuadWriter.java | 48 +- .../writers/AbstractBatchedTripleWriter.java | 46 +- .../AbstractLineBasedNodeTupleWriter.java | 42 +- .../writers/AbstractLineBasedQuadWriter.java | 44 +- .../writers/AbstractLineBasedTripleWriter.java | 134 +- .../io/output/writers/AbstractNodeWriter.java | 384 +- .../AbstractWholeFileNodeTupleWriter.java | 38 +- .../writers/AbstractWholeFileQuadWriter.java | 46 +- .../writers/AbstractWholeFileTripleWriter.java | 46 +- .../io/output/writers/nquads/NQuadsWriter.java | 44 +- .../writers/ntriples/NTriplesNodeWriter.java | 44 +- .../output/writers/ntriples/NTriplesWriter.java | 44 +- .../output/writers/rdfjson/RdfJsonWriter.java | 38 +- .../io/output/writers/rdfxml/RdfXmlWriter.java | 38 +- .../output/writers/trig/BatchedTriGWriter.java | 104 +- .../writers/turtle/BatchedTurtleWriter.java | 108 +- .../rdf/io/RdfTriplesInputTestMapper.java | 38 +- .../AbstractBlockedQuadInputFormatTests.java | 36 +- .../AbstractBlockedTripleInputFormatTests.java | 36 +- .../AbstractNodeTupleInputFormatTests.java | 1220 +++--- .../io/input/AbstractQuadsInputFormatTests.java | 48 +- .../input/AbstractTriplesInputFormatTests.java | 52 +- .../AbstractWholeFileQuadInputFormatTests.java | 66 +- ...AbstractWholeFileTripleInputFormatTests.java | 66 +- ...ractCompressedNodeTupleInputFormatTests.java | 48 +- ...AbstractCompressedQuadsInputFormatTests.java | 48 +- ...stractCompressedTriplesInputFormatTests.java | 48 +- ...CompressedWholeFileQuadInputFormatTests.java | 70 +- ...mpressedWholeFileTripleInputFormatTests.java | 286 +- ...actCompressedJsonLDQuadInputFormatTests.java | 74 +- ...tCompressedJsonLDTripleInputFormatTests.java | 74 +- .../jsonld/BZippedJsonLDQuadInputTest.java | 68 +- .../jsonld/BZippedJsonLDTripleInputTest.java | 68 +- .../jsonld/DeflatedJsonLDQuadInputTest.java | 36 +- .../jsonld/DeflatedJsonLDTripleInputTest.java | 36 +- .../jsonld/GZippedJsonLDQuadInputTest.java | 36 +- .../jsonld/GZippedJsonLDTripleInputTest.java | 36 +- ...bstractCompressedNQuadsInputFormatTests.java | 42 +- ...mpressedWholeFileNQuadsInputFormatTests.java | 42 +- .../nquads/BZipppedNQuadsInputTest.java | 36 +- .../BZipppedWholeFileNQuadsInputTest.java | 36 +- .../nquads/DeflatedNQuadsInputTest.java | 36 +- .../DeflatedWholeFileNQuadsInputTest.java | 36 +- .../nquads/GZippedNQuadsInputTest.java | 36 +- .../nquads/GZippedWholeFileNQuadsInputTest.java | 36 +- ...mpressedBlockedNTriplesInputFormatTests.java | 40 +- ...tractCompressedNTriplesInputFormatTests.java | 42 +- ...ressedWholeFileNTriplesInputFormatTests.java | 42 +- .../ntriples/BZippedBlockedNTriplesInput.java | 36 +- .../ntriples/BZippedNTriplesInputTest.java | 36 +- .../BZippedWholeFileNTriplesInputTest.java | 36 +- .../ntriples/DeflatedBlockedNTriplesInput.java | 36 +- .../ntriples/DeflatedNTriplesInputTest.java | 36 +- .../DeflatedWholeFileNTriplesInputTest.java | 36 +- .../ntriples/GZippedBlockedNTriplesInput.java | 36 +- .../ntriples/GZippedNTriplesInputTest.java | 36 +- .../GZippedWholeFileNTriplesInputTest.java | 36 +- ...stractCompressedRdfJsonInputFormatTests.java | 42 +- .../rdfjson/BZippedRdfJsonInputTest.java | 36 +- .../rdfjson/DeflatedRdfJsonInputTest.java | 36 +- .../rdfjson/GZippedRdfJsonInputTest.java | 36 +- ...bstractCompressedRdfXmlInputFormatTests.java | 42 +- .../rdfxml/BZippedRdfXmlInputTest.java | 36 +- .../rdfxml/DeflatedRdfXmlInputTest.java | 36 +- .../rdfxml/GZippedRdfXmlInputTest.java | 36 +- ...actCompressedThriftQuadInputFormatTests.java | 142 +- ...tCompressedThriftTripleInputFormatTests.java | 142 +- .../thrift/BZippedThriftQuadInputTest.java | 68 +- .../thrift/BZippedThriftTripleInputTest.java | 68 +- .../thrift/DeflatedThriftQuadInputTest.java | 36 +- .../thrift/DeflatedThriftTripleInputTest.java | 36 +- .../thrift/GZippedThriftQuadInputTest.java | 36 +- .../thrift/GZippedThriftTripleInputTest.java | 36 +- .../AbstractCompressedTriGInputFormatTests.java | 42 +- .../compressed/trig/BZippedTriGInputTest.java | 36 +- .../compressed/trig/DeflatedTriGInputTest.java | 36 +- .../compressed/trig/GZippedTriGInputTest.java | 36 +- .../AbstractCompressedTriXInputFormatTests.java | 42 +- .../compressed/trix/BZippedTriXInputTest.java | 38 +- .../compressed/trix/DeflatedTriXInputTest.java | 70 +- .../compressed/trix/GZippedTriXInputTest.java | 38 +- ...bstractCompressedTurtleInputFormatTests.java | 42 +- .../turtle/BZippedTurtleInputTest.java | 36 +- .../turtle/DeflatedTurtleInputTest.java | 36 +- .../turtle/GZippedTurtleInputTest.java | 36 +- .../io/input/jsonld/JsonLDQuadInputTest.java | 72 +- .../io/input/jsonld/JsonLDTripleInputTest.java | 78 +- .../io/input/nquads/BlockedNQuadsInputTest.java | 40 +- .../rdf/io/input/nquads/NQuadsInputTest.java | 40 +- .../input/nquads/WholeFileNQuadsInputTest.java | 40 +- .../ntriples/BlockedNTriplesInputTest.java | 40 +- .../io/input/ntriples/NTriplesInputTest.java | 40 +- .../ntriples/WholeFileNTriplesInputTest.java | 40 +- .../rdf/io/input/rdfjson/RdfJsonInputTest.java | 40 +- .../rdf/io/input/rdfxml/RdfXmlInputTest.java | 40 +- .../io/input/thrift/ThriftQuadInputTest.java | 42 +- .../io/input/thrift/ThriftTripleInputTest.java | 42 +- .../hadoop/rdf/io/input/trig/TriGInputTest.java | 40 +- .../hadoop/rdf/io/input/trix/TriXInputTest.java | 40 +- .../rdf/io/input/turtle/TurtleInputTest.java | 102 +- .../util/AbstractTrackableInputStreamTests.java | 38 +- .../rdf/io/input/util/BlockInputStreamTest.java | 40 +- .../io/input/util/TrackedInputStreamTest.java | 42 +- .../AbstractNodeTupleOutputFormatTests.java | 510 +-- .../output/AbstractQuadOutputFormatTests.java | 46 +- .../output/AbstractTripleOutputFormatTests.java | 46 +- .../io/output/jsonld/JsonLdQuadOutputTest.java | 94 +- .../output/jsonld/JsonLdTripleOutputTest.java | 94 +- .../rdf/io/output/nquads/NQuadsOutputTest.java | 40 +- .../io/output/ntriples/NTriplesOutputTest.java | 40 +- .../io/output/rdfjson/RdfJsonOutputTest.java | 40 +- .../rdf/io/output/rdfxml/RdfXmlOutputTest.java | 40 +- .../io/output/thrift/ThriftQuadOutputTest.java | 96 +- .../output/thrift/ThriftTripleOutputTest.java | 96 +- .../io/output/trig/BatchedTriGOutputTest.java | 42 +- .../io/output/trig/StreamedTriGOutputTest.java | 42 +- .../output/trig/TriGBlankNodeOutputTests.java | 238 +- .../rdf/io/output/trix/TriXOutputTest.java | 94 +- .../output/turtle/BatchedTurtleOutputTest.java | 42 +- .../output/turtle/StreamedTurtleOutputTest.java | 42 +- .../turtle/TurtleBlankNodeOutputTests.java | 234 +- .../jena/hadoop/rdf/mapreduce/KeyMapper.java | 36 +- .../hadoop/rdf/mapreduce/KeyPlusNullMapper.java | 40 +- .../hadoop/rdf/mapreduce/NullPlusKeyMapper.java | 40 +- .../rdf/mapreduce/NullPlusValueMapper.java | 40 +- .../rdf/mapreduce/RdfMapReduceConstants.java | 36 +- .../jena/hadoop/rdf/mapreduce/SwapMapper.java | 38 +- .../hadoop/rdf/mapreduce/TextCountReducer.java | 36 +- .../jena/hadoop/rdf/mapreduce/ValueMapper.java | 36 +- .../rdf/mapreduce/ValuePlusNullMapper.java | 38 +- ...tractCharacteristicSetGeneratingReducer.java | 44 +- .../CharacteristicSetReducer.java | 38 +- .../QuadCharacteristicSetGeneratingReducer.java | 42 +- ...ripleCharacteristicSetGeneratingReducer.java | 42 +- .../count/AbstractNodeTupleNodeCountMapper.java | 40 +- .../rdf/mapreduce/count/NodeCountReducer.java | 38 +- .../mapreduce/count/QuadNodeCountMapper.java | 42 +- .../mapreduce/count/TripleNodeCountMapper.java | 42 +- .../datatypes/QuadDataTypeCountMapper.java | 48 +- .../datatypes/TripleDataTypeCountMapper.java | 48 +- .../AbstractNodeTupleNamespaceCountMapper.java | 46 +- .../namespaces/QuadNamespaceCountMapper.java | 44 +- .../namespaces/TripleNamespaceCountMapper.java | 44 +- .../count/positional/QuadGraphCountMapper.java | 84 +- .../count/positional/QuadObjectCountMapper.java | 46 +- .../positional/QuadPredicateCountMapper.java | 46 +- .../positional/QuadSubjectCountMapper.java | 46 +- .../positional/TripleObjectCountMapper.java | 46 +- .../positional/TriplePredicateCountMapper.java | 46 +- .../positional/TripleSubjectCountMapper.java | 46 +- .../filter/AbstractNodeTupleFilterMapper.java | 42 +- .../filter/AbstractQuadFilterMapper.java | 40 +- .../filter/AbstractTripleFilterMapper.java | 40 +- .../filter/GroundQuadFilterMapper.java | 40 +- .../filter/GroundTripleFilterMapper.java | 40 +- .../mapreduce/filter/ValidQuadFilterMapper.java | 40 +- .../filter/ValidTripleFilterMapper.java | 40 +- .../AbstractQuadFilterByPositionMapper.java | 44 +- .../AbstractTripleFilterByPositionMapper.java | 44 +- .../positional/QuadFilterByGraphUriMapper.java | 44 +- .../positional/QuadFilterByObjectUriMapper.java | 44 +- .../positional/QuadFilterByPredicateMapper.java | 44 +- .../QuadFilterBySubjectUriMapper.java | 44 +- .../TripleFilterByObjectUriMapper.java | 44 +- .../TripleFilterByPredicateUriMapper.java | 44 +- .../TripleFilterBySubjectUriMapper.java | 44 +- .../group/AbstractNodeTupleGroupingMapper.java | 40 +- .../group/AbstractQuadGroupingMapper.java | 42 +- .../group/AbstractTripleGroupingMapper.java | 42 +- .../mapreduce/group/QuadGroupByGraphMapper.java | 40 +- .../group/QuadGroupByObjectMapper.java | 40 +- .../group/QuadGroupByPredicateMapper.java | 40 +- .../group/QuadGroupBySubjectMapper.java | 40 +- .../group/TripleGroupByObjectMapper.java | 40 +- .../group/TripleGroupByPredicateMapper.java | 40 +- .../group/TripleGroupBySubjectMapper.java | 40 +- .../AbstractNodeTupleSplitToNodesMapper.java | 40 +- .../AbstractNodeTupleSplitWithNodesMapper.java | 40 +- .../mapreduce/split/QuadSplitToNodesMapper.java | 42 +- .../split/QuadSplitWithNodesMapper.java | 42 +- .../split/TripleSplitToNodesMapper.java | 42 +- .../split/TripleSplitWithNodesMapper.java | 42 +- .../transform/AbstractTriplesToQuadsMapper.java | 48 +- .../transform/QuadsToTriplesMapper.java | 40 +- .../TriplesToQuadsBySubjectMapper.java | 40 +- .../TriplesToQuadsConstantGraphMapper.java | 44 +- .../rdf/mapreduce/AbstractMapReduceTests.java | 36 +- .../rdf/mapreduce/AbstractMapperTests.java | 138 +- ...CharacteristicSetGeneratingReducerTests.java | 52 +- .../CharacteristicSetReducerTest.java | 65 +- ...eCharacteristicSetGeneratingReducerTest.java | 52 +- .../AbstractNodeTupleNodeCountReducedTests.java | 44 +- .../count/AbstractNodeTupleNodeCountTests.java | 44 +- .../count/QuadNodeCountMapReduceTest.java | 54 +- .../count/QuadNodeCountMapperTest.java | 50 +- .../count/TripleNodeCountMapReduceTest.java | 50 +- .../count/TripleNodeCountMapperTest.java | 48 +- .../filter/AbstractNodeTupleFilterTests.java | 42 +- .../filter/AbstractQuadValidityFilterTests.java | 44 +- .../AbstractTripleValidityFilterTests.java | 44 +- .../TripleFilterByNoPredicateMapperTest.java | 38 +- .../TripleFilterByPredicateMapperTest.java | 52 +- ...leInvertedFilterByNoPredicateMapperTest.java | 38 +- ...ipleInvertedFilterByPredicateMapperTest.java | 52 +- .../filter/ValidQuadFilterMapperTest.java | 40 +- .../filter/ValidTripleFilterMapperTest.java | 40 +- .../group/AbstractNodeTupleGroupingTests.java | 44 +- .../group/AbstractQuadGroupingTests.java | 48 +- .../group/AbstractTripleGroupingTests.java | 46 +- .../group/QuadGroupByGraphMapperTest.java | 42 +- .../group/QuadGroupByObjectMapperTest.java | 42 +- .../group/QuadGroupByPredicateMapperTest.java | 42 +- .../group/QuadGroupBySubjectMapperTest.java | 42 +- .../group/TripleGroupByObjectMapperTest.java | 42 +- .../group/TripleGroupByPredicateMapperTest.java | 42 +- .../group/TripleGroupBySubjectMapperTest.java | 42 +- .../AbstractNodeTupleSplitToNodesTests.java | 44 +- .../AbstractNodeTupleSplitWithNodesTests.java | 44 +- .../split/AbstractQuadSplitToNodesTests.java | 50 +- .../split/AbstractQuadSplitWithNodesTests.java | 50 +- .../split/AbstractTripleSplitToNodesTests.java | 48 +- .../AbstractTripleSplitWithNodesTests.java | 48 +- .../split/QuadSplitToNodesMapperTest.java | 42 +- .../split/QuadSplitWithNodesMapperTest.java | 42 +- .../split/TripleSplitToNodesMapperTest.java | 42 +- .../split/TripleSplitWithNodesMapperTest.java | 44 +- .../transform/QuadsToTriplesMapperTest.java | 54 +- .../TriplesToQuadsBySubjectMapperTest.java | 54 +- .../TriplesToQuadsConstantGraphMapperTest.java | 54 +- .../apache/jena/hadoop/rdf/stats/RdfStats.java | 842 ++-- .../jena/hadoop/rdf/stats/jobs/JobFactory.java | 232 +- jena-elephas/pom.xml | 4 +- jena-fuseki1/Data/books.ttl | 124 +- jena-fuseki1/pages/books.ttl | 94 +- .../http/TestDatasetGraphAccessorHTTP.java | 30 +- .../src/main/webapp/js/lib/sprintf-0.7-beta1.js | 366 +- .../http/TestDatasetGraphAccessorHTTP.java | 30 +- .../jena/tools/schemagen/SchemagenMojo.java | 9 +- .../jena/tools/schemagen/SchemagenMojoTest.java | 166 +- jena-parent/pom.xml | 26 +- jena-sdb/Data/data.ttl | 68 +- jena-sdb/Data/data2.ttl | 40 +- jena-sdb/Reports/explain.rb | 58 +- jena-sdb/Reports/format.rb | 82 +- jena-sdb/Reports/jdbc.rb | 278 +- jena-sdb/bin2/sdbscript | 18 +- .../org/apache/jena/sdb/sdb-properties.xml | 18 +- .../jena/query/spatial/DistanceUnitsUtils.java | 174 +- .../query/spatial/SpatialDatasetFactory.java | 210 +- .../jena/query/spatial/SpatialIndexContext.java | 206 +- .../query/spatial/SpatialPredicatePair.java | 148 +- .../spatial/SpatialPredicatePairValue.java | 218 +- .../jena/query/spatial/SpatialValueUtil.java | 120 +- .../pfunction/DirectionWithPointPFBase.java | 292 +- .../query/spatial/pfunction/SpatialMatch.java | 134 +- .../pfunction/SpatialOperationPFBase.java | 326 +- .../SpatialOperationWithBoxPFBase.java | 328 +- .../query/spatial/pfunction/library/EastPF.java | 88 +- .../pfunction/library/IntersectsBoxPF.java | 70 +- .../spatial/pfunction/library/IsNearByPF.java | 46 +- .../pfunction/library/IsWithinBoxPF.java | 68 +- .../pfunction/library/IsWithinCirclePF.java | 70 +- .../spatial/pfunction/library/NorthPF.java | 90 +- .../spatial/pfunction/library/SouthPF.java | 86 +- .../query/spatial/pfunction/library/WestPF.java | 88 +- .../AbstractTestIndexingSpatialData.java | 186 +- .../TestIndexingSpatialDataWithLucene.java | 84 +- .../TestIndexingSpatialDataWithSolr.java | 80 +- .../spatial/TestSpatialPredicatePairValue.java | 118 +- .../TestTDBDatasetWithLuceneSpatialIndex.java | 190 +- .../spatial/pfunction/AbstractTestEastPF.java | 284 +- .../pfunction/AbstractTestIntersectsBoxPF.java | 284 +- .../pfunction/AbstractTestIsNearByPF.java | 670 ++-- .../pfunction/AbstractTestIsWithinBoxPF.java | 284 +- .../pfunction/AbstractTestIsWithinCirclePF.java | 672 ++-- .../spatial/pfunction/AbstractTestNorthPF.java | 284 +- .../spatial/pfunction/AbstractTestSouthPF.java | 284 +- .../spatial/pfunction/AbstractTestWestPF.java | 282 +- .../SolrHome/SolrARQCollection/conf/schema.xml | 112 +- .../SolrARQCollection/conf/solrconfig.xml | 154 +- .../src/test/resources/SolrHome/solr.xml | 14 +- .../src/test/resources/geoarq-data-1.ttl | 172 +- .../resources/spatial-config-spatialindexer.ttl | 104 +- .../src/test/resources/spatial-config.ttl | 108 +- .../src/test/resources/spatial-solr-config.ttl | 100 +- jena-tdb/src-examples/tdb/examples/ExTDB1.java | 102 +- jena-tdb/src-examples/tdb/examples/ExTDB2.java | 86 +- jena-tdb/src-examples/tdb/examples/ExTDB3.java | 132 +- jena-tdb/src-examples/tdb/examples/ExTDB4.java | 120 +- jena-tdb/src-examples/tdb/examples/ExTDB5.java | 140 +- .../jena/tdb/base/file/BufferAllocator.java | 86 +- .../tdb/base/file/BufferAllocatorDirect.java | 92 +- .../tdb/base/file/BufferAllocatorMapped.java | 290 +- .../jena/tdb/base/file/BufferAllocatorMem.java | 92 +- .../apache/jena/tdb/base/file/LocationLock.java | 7 +- .../org/apache/jena/tdb/sys/TDBInternal.java | 13 +- .../jena/tdb/extra/T_QuadsObjectIsNull.java | 220 +- .../jena/tdb/extra/T_TimeoutTDBPattern.java | 224 +- .../tdb/graph/TestDatasetGraphAccessorTDB.java | 22 +- pom.xml | 2 +- 657 files changed, 36910 insertions(+), 36859 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/886e5118/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions.java ----------------------------------------------------------------------