You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2019/07/08 09:16:50 UTC

[jena] 02/04: Merge branch 'master' of https://gitbox.apache.org/repos/asf/jena

This is an automated email from the ASF dual-hosted git repository.

rvesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git

commit c382cd77a8f6f84be096548c1072a9cc3ab2fb6d
Merge: f0bf5f3 acc0964
Author: Rob Vesse <rv...@apache.org>
AuthorDate: Mon Jul 8 09:57:44 2019 +0100

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/jena

 NOTICE                                             |    3 +
 apache-jena-libs/pom.xml                           |   10 +-
 apache-jena-osgi/jena-osgi-features/pom.xml        |    2 +-
 apache-jena-osgi/jena-osgi/pom.xml                 |   16 +-
 apache-jena-osgi/pom.xml                           |    4 +-
 apache-jena/pom.xml                                |   30 +-
 jena-arq/DEPENDENCIES                              |   26 -
 jena-arq/Grammar/arq.jj                            |   17 +-
 jena-arq/Grammar/master.jj                         |   11 +
 jena-arq/Grammar/tokens.txt                        |    2 +
 jena-arq/LICENSE                                   |  202 ---
 jena-arq/NOTICE                                    |   11 -
 jena-arq/pom.xml                                   |   12 +-
 .../org/apache/jena/atlas/json/JsonObject.java     |   28 +-
 .../org/apache/jena/atlas/web/HttpException.java   |   21 +-
 .../org/apache/jena/riot/system/IRIResolver.java   |    7 +
 .../java/org/apache/jena/riot/system/RiotLib.java  |   41 +-
 .../org/apache/jena/riot/system/StreamOps.java     |  145 --
 .../org/apache/jena/riot/system/StreamRDFOps.java  |  144 ++
 .../apache/jena/riot/system/StreamRDFWriter.java   |   12 +-
 .../jena/riot/thrift/WriterDatasetThrift.java      |    4 +-
 .../apache/jena/riot/thrift/WriterGraphThrift.java |    4 +-
 .../java/org/apache/jena/riot/tokens/Token.java    |   11 +-
 .../main/java/org/apache/jena/riot/web/HttpOp.java |   27 +-
 .../org/apache/jena/riot/writer/NQuadsWriter.java  |    4 +-
 .../apache/jena/riot/writer/NTriplesWriter.java    |    4 +-
 .../apache/jena/riot/writer/TriGWriterBlocks.java  |    4 +-
 .../apache/jena/riot/writer/TriGWriterFlat.java    |    4 +-
 .../jena/riot/writer/TurtleWriterBlocks.java       |    4 +-
 .../apache/jena/riot/writer/TurtleWriterFlat.java  |    4 +-
 .../org/apache/jena/riot/writer/WriterTriX.java    |    6 +-
 .../java/org/apache/jena/sparql/algebra/OpLib.java |   38 +-
 .../jena/sparql/algebra/TransformGraphRename.java  |   54 +
 .../apache/jena/sparql/core/DatasetGraphBase.java  |    8 +-
 .../jena/sparql/core/DatasetGraphMapLink.java      |   10 +-
 .../apache/jena/sparql/core/DatasetGraphOne.java   |   10 +-
 .../jena/sparql/core/DatasetGraphTrackActive.java  |  110 --
 .../jena/sparql/core/DatasetGraphWrapper.java      |    7 +-
 .../org/apache/jena/sparql/core/GraphView.java     |   18 +-
 .../java/org/apache/jena/sparql/core/Match.java    |   43 +
 .../jena/sparql/core/TransactionHandlerView.java   |   10 +-
 .../apache/jena/sparql/core/TxnDataset2Graph.java  |   14 -
 .../apache/jena/sparql/engine/http/HttpQuery.java  |   22 +-
 .../sparql/engine/http/QueryExceptionHTTP.java     |   29 +-
 .../sparql/engine/iterator/QueryIterDistinct.java  |    2 +-
 .../org/apache/jena/sparql/expr/NodeValue.java     |    2 +-
 .../apache/jena/sparql/expr/aggregate/AggAvg.java  |   16 +-
 .../jena/sparql/expr/aggregate/AggAvgDistinct.java |   11 +-
 .../jena/sparql/expr/aggregate/AggMedian.java      |  126 ++
 .../sparql/expr/aggregate/AggMedianDistinct.java   |  124 ++
 .../apache/jena/sparql/expr/aggregate/AggMode.java |  139 ++
 .../sparql/expr/aggregate/AggModeDistinct.java     |  138 ++
 .../jena/sparql/expr/aggregate/AggregatorBase.java |    8 +-
 .../sparql/expr/aggregate/AggregatorFactory.java   |    8 +
 .../jena/sparql/expr/nodevalue/NodeFunctions.java  |   23 +-
 .../sparql/expr/nodevalue/NodeValueDecimal.java    |   18 +-
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java      |   33 +-
 .../apache/jena/sparql/graph/GraphUnionRead.java   |   10 +-
 .../org/apache/jena/sparql/lang/arq/ARQParser.java |  554 ++++----
 .../jena/sparql/lang/arq/ARQParserConstants.java   |  314 ++---
 .../sparql/lang/arq/ARQParserTokenManager.java     | 1420 ++++++++++----------
 .../main/java/org/apache/jena/sparql/sse/Tags.java |    2 +
 .../ElementTransformCleanGroupsOfOne.java          |   10 +-
 .../apache/jena/sparql/util/QueryExecUtils.java    |    2 +-
 .../java/org/apache/jena/sparql/util/Utils.java    |    6 +-
 .../src/main/java/org/apache/jena/system/Txn.java  |   47 +-
 .../main/java/org/apache/jena/system/TxnOp.java    |  130 ++
 .../apache/jena/web/DatasetGraphAccessorHTTP.java  |    6 +-
 .../src/main/java/org/apache/jena/web/HttpSC.java  |    7 +-
 jena-arq/src/main/resources/META-INF/DEPENDENCIES  |   19 -
 jena-arq/src/main/resources/META-INF/LICENSE       |  202 ---
 jena-arq/src/main/resources/META-INF/NOTICE        |   11 -
 .../java/org/apache/jena/riot/lang/TestIRI.java    |   27 +-
 .../jena/riot/thrift/TestStreamRDFThrift.java      |    6 +-
 .../apache/jena/sparql/expr/TestFunctions2.java    |   18 +-
 .../apache/jena/sparql/expr/TestNodeValueOps.java  |    2 +-
 .../org/apache/jena/sparql/expr/TestXSDFuncOp.java |   52 +
 .../jena/sparql/graph/AbstractTestGraph2.java      |  262 ----
 .../sparql/graph/AbstractTestGraphAddDelete.java   |  261 ++++
 .../sparql/graph/AbstractTestPrefixMapping2.java   |  109 --
 .../graph/AbstractTestPrefixMappingView.java       |  110 ++
 .../java/org/apache/jena/system/TS_System.java     |    3 +-
 .../java/org/apache/jena/system/TestTxnOp.java     |   82 ++
 .../jena/web/AbstractTestDatasetGraphAccessor.java |    2 +-
 jena-arq/testing/ARQ/GroupBy/manifest.ttl          |   20 +
 jena-arq/testing/ARQ/GroupBy/median-01.arq         |    7 +
 jena-arq/testing/ARQ/GroupBy/median-01.srj         |   12 +
 jena-arq/testing/ARQ/GroupBy/mode-01.arq           |    7 +
 jena-arq/testing/ARQ/GroupBy/mode-01.srj           |   12 +
 jena-arq/testing/ARQ/README                        |    8 +-
 .../testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl     |   69 +-
 .../ARQ/Syntax/Syntax-ARQ/syntax-median-01.arq     |    8 +
 .../ARQ/Syntax/Syntax-ARQ/syntax-scope-bad-01.arq  |    1 +
 .../ARQ/Syntax/Syntax-ARQ/syntax-scope-bad-02.arq  |    1 +
 .../ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl   |   17 +-
 .../ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl       |   92 +-
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-01.rq  |    1 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-01.rq    |    5 +-
 .../Syntax/Syntax-SPARQL_11/syntax-values-02.rq    |    6 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-03.rq    |    3 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-04.rq    |    6 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-05.rq    |    3 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-09.rq    |    2 +-
 .../Syntax-SPARQL_11/syntax-values-bad-01.rq       |    1 +
 .../Syntax-SPARQL_11/syntax-values-bad-02.rq       |    1 +
 .../Syntax-SPARQL_11/syntax-values-bad-03.rq       |    1 +
 .../Syntax-SPARQL_11/syntax-values-bad-04.rq       |    1 +
 jena-arq/testing/ARQ/Syntax/syn-arq.sh             |   65 +
 jena-arq/testing/ARQ/Syntax/syn-func.sh            |   25 +-
 jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh     |   29 +-
 jena-arq/testing/ARQ/Syntax/syn.sh                 |    0
 jena-arq/testing/ARQ/manifest-arq.ttl              |    3 +-
 jena-base/pom.xml                                  |    6 +-
 .../src/main/java/org/apache/jena/atlas/io/IO.java |  199 +--
 .../org/apache/jena/atlas/io/InStreamUTF8.java     |   58 +-
 .../org/apache/jena/atlas/io/IndentedWriter.java   |    6 +-
 .../org/apache/jena/atlas/io/OutStreamUTF8.java    |   58 +-
 .../java/org/apache/jena/atlas/iterator/Iter.java  |   54 +-
 .../java/org/apache/jena/atlas/lib/Registry.java   |    1 -
 .../java/org/apache/jena/atlas/lib/StreamOps.java  |   70 +
 .../java/org/apache/jena/atlas/lib/ThreadLib.java  |  118 ++
 jena-cmds/pom.xml                                  |   16 +-
 jena-cmds/src/main/java/arq/query.java             |    5 +-
 jena-cmds/src/main/java/riotcmd/CmdLangParse.java  |    7 +-
 jena-cmds/src/main/java/tdb2/tdbcompact.java       |    2 +-
 jena-core/DEPENDENCIES                             |   17 -
 jena-core/LICENSE                                  |  236 ----
 jena-core/NOTICE                                   |   18 -
 jena-core/pom.xml                                  |   10 +-
 .../main/java/org/apache/jena/mem/HashCommon.java  |    4 +-
 .../jena/reasoner/rulesys/impl/LPInterpreter.java  |    2 +-
 .../reasoner/rulesys/impl/SafeTripleIterator.java  |   56 +
 .../rulesys/impl/TopLevelTripleMatchFrame.java     |    4 +-
 .../reasoner/rulesys/impl/TripleMatchFrame.java    |    4 +-
 .../java/org/apache/jena/shared/uuid/LibUUID.java  |    1 +
 jena-core/src/main/resources/META-INF/DEPENDENCIES |   17 -
 jena-core/src/main/resources/META-INF/LICENSE      |  236 ----
 jena-core/src/main/resources/META-INF/NOTICE       |   14 -
 .../rulesys/impl/TestRestartableLBRule.java        |  137 ++
 .../jena/reasoner/rulesys/test/TestPackage.java    |    2 +
 jena-db/LICENSE                                    |  202 ---
 jena-db/NOTICE                                     |    8 -
 jena-db/jena-dboe-base/pom.xml                     |    6 +-
 .../base/recordbuffer/RecordRangeIterator.java     |    2 -
 .../main/java/org/apache/jena/dboe/migrate/L.java  |  205 ---
 .../java/org/apache/jena/dboe/sys/LibUUID.java     |   58 +
 jena-db/jena-dboe-index-test/pom.xml               |    4 +-
 jena-db/jena-dboe-index/pom.xml                    |    4 +-
 jena-db/jena-dboe-storage/pom.xml                  |   64 +
 .../org/apache/jena/dboe/storage/DatabaseRDF.java  |   39 +
 .../apache/jena/dboe/storage/StoragePrefixes.java  |   82 ++
 .../org/apache/jena/dboe/storage/StorageRDF.java   |  250 ++++
 .../jena/dboe/storage/prefixes/PrefixEntry.java    |   42 +
 .../jena/dboe/storage/prefixes/PrefixLib.java      |   99 ++
 .../jena/dboe/storage/prefixes/PrefixMapBase.java  |  124 ++
 .../jena/dboe/storage/prefixes/PrefixMapI.java     |  104 ++
 .../storage/prefixes/PrefixMapOverPrefixMapI.java  |  105 ++
 .../storage/prefixes/PrefixMapStorageSimple.java   |   74 +
 .../prefixes/PrefixMappingOverPrefixMapI.java      |  145 ++
 .../dboe/storage/prefixes/PrefixesFactory.java     |   62 +
 .../dboe/storage/prefixes/StoragePrefixMap.java    |   79 ++
 .../storage/prefixes/StoragePrefixesEmpty.java     |   74 +
 .../dboe/storage/prefixes/StoragePrefixesView.java |  108 ++
 .../apache/jena/dboe/storage/simple/SimpleDB.java  |   37 +
 .../jena/dboe/storage/simple/StorageMem.java       |   28 +
 .../dboe/storage/simple/StoragePrefixesMem.java    |  120 ++
 .../jena/dboe/storage/simple/StorageTuples.java    |  116 ++
 .../jena/dboe/storage/simple/StorageTuplesN.java   |   86 ++
 .../dboe/storage/system/DatasetGraphStorage.java   |  182 +++
 .../jena/dboe/storage/system/GraphViewStorage.java |   71 +
 .../jena/dboe/storage/system/StorageLib.java       |   80 ++
 .../org/apache/jena/dboe/storage/TC_StoreBase.java |   31 +
 .../AbstractTestDatasetPrefixesStorage.java        |   85 ++
 .../jena/dboe/storage/prefixes/TS_Prefixes.java    |   37 +
 .../storage/prefixes/TestDatasetPrefixesMem.java   |   38 +
 .../jena/dboe/storage/prefixes/TestPrefixLib.java  |   95 ++
 .../prefixes/TestPrefixMapOverPrefixMapI.java      |   31 +
 .../TestPrefixMappingOverDatasetPrefixes.java      |   41 +
 .../TestPrefixMappingOverDatasetPrefixes2.java     |   44 +
 .../prefixes/TestPrefixMappingOverPrefixMap.java   |   39 +
 .../dboe/storage/storage/BaseTestStorageRDF.java   |  131 ++
 .../jena/dboe/storage/storage/TS_Storage.java      |   30 +
 .../storage/TestDatasetGraphStorageFindTests.java  |   28 +
 .../storage/TestDatasetGraphStorageTests.java      |   28 +
 .../dboe/storage/storage/TestStorageSimple.java    |   30 +
 jena-db/jena-dboe-trans-data/pom.xml               |   10 +-
 .../jena/dboe/trans/bplustree/BPlusTree.java       |   32 +-
 .../org/apache/jena/dboe/trans/bplustree/Mode.java |   32 +-
 .../jena/dboe/trans/data/TransBinaryDataFile.java  |    6 +-
 .../org/apache/jena/dboe/trans/data/TransBlob.java |    4 +-
 .../jena/dboe/trans/recovery/TestRecovery.java     |   19 +-
 jena-db/jena-dboe-transaction/pom.xml              |    4 +-
 .../apache/jena/dboe/transaction/TransInteger.java |    7 +-
 .../dboe/transaction/TransactionalWrapper.java     |   78 ++
 .../dboe/transaction/txn/IteratorTxnTracker.java   |   51 +
 .../jena/dboe/transaction/txn/Transaction.java     |   11 +
 .../transaction/txn/TransactionCoordinator.java    |   10 +-
 .../dboe/transaction/txn/TransactionalBase.java    |    8 +-
 .../txn/TransactionalComponentLifecycle.java       |   92 +-
 .../jena/dboe/transaction/txn/TxnIdUuid.java       |    6 +-
 .../jena/dboe/transaction/txn/journal/Journal.java |    7 +-
 .../jena/dboe/transaction/AbstractTestTxn.java     |    7 +-
 .../transaction/TestThreadingTransactions.java     |    2 +-
 .../TestTransactionCoordinatorControl.java         |   16 +-
 .../transaction/TestTransactionLifecycle2.java     |   12 +-
 jena-db/jena-tdb2/pom.xml                          |   12 +-
 .../java/org/apache/jena/tdb2/DatabaseMgr.java     |   24 +-
 .../src/main/java/org/apache/jena/tdb2/TDB2.java   |  128 +-
 .../java/org/apache/jena/tdb2/TDB2Factory.java     |   52 +-
 .../java/org/apache/jena/tdb2/TDBException.java    |   10 +-
 .../jena/tdb2/assembler/DatasetAssemblerTDB.java   |   64 +-
 .../jena/tdb2/assembler/TDBGraphAssembler.java     |  106 +-
 .../java/org/apache/jena/tdb2/assembler/Vocab.java |   17 +-
 .../org/apache/jena/tdb2/assembler/VocabTDB2.java  |   88 +-
 .../main/java/org/apache/jena/tdb2/lib/Async.java  |   61 +-
 .../java/org/apache/jena/tdb2/lib/NodeLib.java     |    7 +-
 .../java/org/apache/jena/tdb2/lib/TupleLib.java    |    8 +-
 .../jena/tdb2/loader/BulkLoaderException.java      |    8 +-
 .../org/apache/jena/tdb2/loader/DataLoader.java    |   50 +-
 .../java/org/apache/jena/tdb2/loader/Loader.java   |   14 +-
 .../org/apache/jena/tdb2/loader/LoaderFactory.java |   68 +-
 .../jena/tdb2/loader/base/BulkStartFinish.java     |    2 +-
 .../org/apache/jena/tdb2/loader/base/CoLib.java    |    8 +-
 .../apache/jena/tdb2/loader/base/LoaderBase.java   |   22 +-
 .../apache/jena/tdb2/loader/base/LoaderOps.java    |    8 +-
 .../jena/tdb2/loader/base/MonitorOutput.java       |    2 +-
 .../jena/tdb2/loader/base/ProgressMonitor.java     |   18 +-
 .../tdb2/loader/base/ProgressMonitorBasic.java     |   16 +-
 .../tdb2/loader/base/ProgressMonitorContext.java   |   10 +-
 .../tdb2/loader/base/ProgressMonitorOutput.java    |   48 +-
 .../jena/tdb2/loader/base/ProgressStreamRDF.java   |   12 +-
 .../apache/jena/tdb2/loader/basic/LoaderBasic.java |    4 +-
 .../jena/tdb2/loader/main/BulkProcesses.java       |    4 +-
 .../apache/jena/tdb2/loader/main/DataBatcher.java  |   42 +-
 .../apache/jena/tdb2/loader/main/DataBlock.java    |    6 +-
 .../apache/jena/tdb2/loader/main/DataToTuples.java |   59 +-
 .../jena/tdb2/loader/main/DataToTuplesInline.java  |   48 +-
 .../tdb2/loader/main/DataToTuplesInlineSingle.java |   33 +-
 .../apache/jena/tdb2/loader/main/Destination.java  |    2 +-
 .../org/apache/jena/tdb2/loader/main/Indexer.java  |   49 +-
 .../jena/tdb2/loader/main/IndexerInline.java       |   18 +-
 .../apache/jena/tdb2/loader/main/InputStage.java   |    8 +-
 .../apache/jena/tdb2/loader/main/LoaderConst.java  |   10 +-
 .../apache/jena/tdb2/loader/main/LoaderMain.java   |  106 +-
 .../jena/tdb2/loader/main/LoaderParallel.java      |    4 +-
 .../apache/jena/tdb2/loader/main/LoaderPhased.java |    4 +-
 .../apache/jena/tdb2/loader/main/LoaderPlan.java   |   10 +-
 .../apache/jena/tdb2/loader/main/LoaderPlans.java  |   40 +-
 .../apache/jena/tdb2/loader/main/PhasedOps.java    |   38 +-
 .../jena/tdb2/loader/main/PrefixHandler.java       |   51 +-
 .../jena/tdb2/loader/main/PrefixHandlerBulk.java   |   75 ++
 .../loader/sequential/BuilderSecondaryIndexes.java |   10 +-
 .../loader/sequential/LoaderNodeTupleTable.java    |   42 +-
 .../tdb2/loader/sequential/LoaderSequential.java   |   20 +-
 .../main/java/org/apache/jena/tdb2/migrate/A2.java |   38 -
 .../jena/tdb2/migrate/TransformGraphRename.java    |   54 -
 .../apache/jena/tdb2/modify/UpdateEngineTDB.java   |   28 +-
 .../org/apache/jena/tdb2/params/StoreParams.java   |  442 ++++++
 .../jena/tdb2/params/StoreParamsBuilder.java       |  309 +++++
 .../apache/jena/tdb2/params/StoreParamsCodec.java  |  204 +++
 .../apache/jena/tdb2/params/StoreParamsConst.java  |  105 ++
 .../jena/tdb2/params/StoreParamsDynamic.java       |   54 +
 .../jena/tdb2/params/StoreParamsFactory.java       |   94 ++
 .../apache/jena/tdb2/setup/AbstractTDBBuilder.java |  241 ----
 .../org/apache/jena/tdb2/setup/ComponentIdMgr.java |  102 --
 .../org/apache/jena/tdb2/setup/StoreParams.java    |  442 ------
 .../apache/jena/tdb2/setup/StoreParamsBuilder.java |  309 -----
 .../apache/jena/tdb2/setup/StoreParamsCodec.java   |  204 ---
 .../apache/jena/tdb2/setup/StoreParamsConst.java   |  105 --
 .../apache/jena/tdb2/setup/StoreParamsDynamic.java |   54 -
 .../apache/jena/tdb2/setup/StoreParamsFactory.java |   94 --
 .../org/apache/jena/tdb2/setup/TDBBuilder.java     |  104 --
 .../apache/jena/tdb2/setup/TDBDatasetDetails.java  |   76 --
 .../org/apache/jena/tdb2/solver/Abortable.java     |    2 +-
 .../org/apache/jena/tdb2/solver/BindingNodeId.java |   90 +-
 .../org/apache/jena/tdb2/solver/BindingTDB.java    |  136 +-
 .../apache/jena/tdb2/solver/OpExecutorTDB2.java    |  372 ++---
 .../main/java/org/apache/jena/tdb2/solver/QC2.java |   14 +-
 .../apache/jena/tdb2/solver/QueryEngineTDB.java    |   92 +-
 .../org/apache/jena/tdb2/solver/QueryIterTDB.java  |   36 +-
 .../org/apache/jena/tdb2/solver/SolverLib.java     |  296 ++--
 .../jena/tdb2/solver/StageGeneratorDirectTDB.java  |   36 +-
 .../apache/jena/tdb2/solver/StageMatchTuple.java   |  184 +--
 .../org/apache/jena/tdb2/solver/stats/Stats.java   |  132 +-
 .../jena/tdb2/solver/stats/StatsCollectorBase.java |    6 +-
 .../jena/tdb2/solver/stats/StatsResults.java       |   24 +-
 .../jena/tdb2/store/DatasetGraphSwitchable.java    |   59 +-
 .../apache/jena/tdb2/store/DatasetGraphTDB.java    |  502 +------
 .../apache/jena/tdb2/store/DatasetGraphTxn.java    |    4 +-
 .../apache/jena/tdb2/store/DatasetPrefixesTDB.java |  172 ---
 .../java/org/apache/jena/tdb2/store/GraphTDB.java  |  146 +-
 .../jena/tdb2/store/GraphViewSwitchable.java       |  143 +-
 .../main/java/org/apache/jena/tdb2/store/Hash.java |   36 +-
 .../tdb2/store/IteratorCheckNotConcurrent.java     |   68 +-
 .../apache/jena/tdb2/store/IteratorTxnTracker.java |   12 +-
 .../java/org/apache/jena/tdb2/store/NodeId.java    |   70 +-
 .../org/apache/jena/tdb2/store/NodeIdFactory.java  |   52 +-
 .../org/apache/jena/tdb2/store/NodeIdInline.java   |   88 +-
 .../org/apache/jena/tdb2/store/NodeIdType.java     |  102 +-
 .../java/org/apache/jena/tdb2/store/QuadTable.java |   36 +-
 .../apache/jena/tdb2/store/StoragePrefixesTDB.java |  149 ++
 .../org/apache/jena/tdb2/store/StorageTDB.java     |  263 +++-
 .../apache/jena/tdb2/store/TDB2StorageBuilder.java |  362 +++++
 .../java/org/apache/jena/tdb2/store/TableBase.java |   24 +-
 .../org/apache/jena/tdb2/store/TripleTable.java    |   30 +-
 .../jena/tdb2/store/nodetable/NodeTable.java       |   62 +-
 .../jena/tdb2/store/nodetable/NodeTableCache.java  |  231 ++--
 .../jena/tdb2/store/nodetable/NodeTableInline.java |   36 +-
 .../jena/tdb2/store/nodetable/NodeTableNative.java |  142 +-
 .../jena/tdb2/store/nodetable/NodeTableOps.java    |   32 +-
 .../jena/tdb2/store/nodetable/NodeTableTRDF.java   |   76 +-
 .../tdb2/store/nodetable/NodeTableWrapper.java     |   38 +-
 .../store/nodetable/TReadAppendFileTransport.java  |   46 +-
 .../tdb2/store/nodetupletable/NodeTupleTable.java  |   47 +-
 .../nodetupletable/NodeTupleTableConcrete.java     |  144 +-
 .../store/nodetupletable/NodeTupleTableView.java   |   82 +-
 .../nodetupletable/NodeTupleTableWrapper.java      |   56 +-
 .../jena/tdb2/store/tupletable/TupleIndex.java     |   78 +-
 .../jena/tdb2/store/tupletable/TupleIndexBase.java |   80 +-
 .../tdb2/store/tupletable/TupleIndexRecord.java    |  243 ++--
 .../tdb2/store/tupletable/TupleIndexWrapper.java   |   46 +-
 .../jena/tdb2/store/tupletable/TupleTable.java     |  164 +--
 .../apache/jena/tdb2/store/value/DateTimeNode.java |   20 +-
 .../jena/tdb2/store/value/DecimalNode56.java       |   16 +-
 .../apache/jena/tdb2/store/value/DoubleNode62.java |   52 +-
 .../apache/jena/tdb2/store/value/FloatNode.java    |    4 +-
 .../apache/jena/tdb2/store/value/IntegerNode.java  |   12 +-
 .../org/apache/jena/tdb2/sys/ComponentIdMgr.java   |  102 ++
 .../java/org/apache/jena/tdb2/sys/CopyDSG.java     |    2 +-
 .../apache/jena/tdb2/sys/DatabaseConnection.java   |  143 +-
 .../java/org/apache/jena/tdb2/sys/DatabaseOps.java |  138 +-
 .../main/java/org/apache/jena/tdb2/sys/EnvTDB.java |   44 +-
 .../org/apache/jena/tdb2/sys/FilenameUtils.java    |   12 +-
 .../main/java/org/apache/jena/tdb2/sys/IOX.java    |   60 +-
 .../java/org/apache/jena/tdb2/sys/InitTDB2.java    |   10 +-
 .../org/apache/jena/tdb2/sys/LockMRSWLite.java     |   40 +-
 .../org/apache/jena/tdb2/sys/StoreConnection.java  |  125 +-
 .../java/org/apache/jena/tdb2/sys/SystemTDB.java   |  455 +++----
 .../java/org/apache/jena/tdb2/sys/TDBInternal.java |   28 +-
 .../main/java/org/apache/jena/tdb2/sys/Util.java   |    8 +-
 .../jena-tdb2/src/main/resources/META-INF/LICENSE  |  175 ---
 .../jena-tdb2/src/main/resources/META-INF/NOTICE   |    8 -
 .../test/java/org/apache/jena/tdb2/ConfigTest.java |   88 +-
 .../test/java/org/apache/jena/tdb2/TC_TDB2.java    |   40 +-
 .../java/org/apache/jena/tdb2/TestDatabaseMgr.java |   74 +-
 .../java/org/apache/jena/tdb2/TestTDBFactory.java  |   72 +-
 .../jena/tdb2/assembler/TS_TDBAssembler.java       |    4 +-
 .../jena/tdb2/assembler/TestTDBAssembler.java      |  102 +-
 .../jena/tdb2/graph/AbstractTestGraphsTDB.java     |   36 +-
 .../java/org/apache/jena/tdb2/graph/TS_Graph.java  |   13 +-
 .../tdb2/graph/TestDatasetGraphAccessorTDB.java    |   20 +-
 .../jena/tdb2/graph/TestDatasetGraphTDB.java       |   20 +-
 .../jena/tdb2/graph/TestGraphOverDatasetTDB.java   |   24 +-
 .../jena/tdb2/graph/TestGraphViewSwitchable.java   |   20 +-
 .../org/apache/jena/tdb2/graph/TestGraphsTDB1.java |   43 -
 .../org/apache/jena/tdb2/graph/TestGraphsTDB2.java |   52 -
 .../apache/jena/tdb2/graph/TestGraphsTDB_A.java    |   43 +
 .../apache/jena/tdb2/graph/TestGraphsTDB_B.java    |   52 +
 .../jena/tdb2/graph/TestPrefixMappingTDB.java      |  103 +-
 .../jena/tdb2/graph/TestPrefixMappingTDBExtra.java |   81 ++
 .../jena/tdb2/junit/AbstractTestGraphTDB.java      |   10 +-
 .../java/org/apache/jena/tdb2/junit/Base_TS.java   |   37 +-
 .../org/apache/jena/tdb2/junit/BuildTestLib.java   |   52 +-
 .../org/apache/jena/tdb2/junit/QueryTestTDB.java   |  190 +--
 .../apache/jena/tdb2/junit/TDBTestException.java   |    6 +-
 .../test/java/org/apache/jena/tdb2/junit/TL.java   |   52 +-
 .../org/apache/jena/tdb2/junit/TestFactoryTDB.java |   74 +-
 .../java/org/apache/jena/tdb2/lib/TestNodeLib.java |   64 +-
 .../jena/tdb2/loader/AbstractTestLoader.java       |  140 +-
 .../org/apache/jena/tdb2/loader/TS_Loader.java     |    4 +-
 .../apache/jena/tdb2/loader/TestLoaderMain.java    |   59 -
 .../jena/tdb2/loader/TestLoaderMainPlan.java       |   59 +
 .../org/apache/jena/tdb2/loader/TestLoaderStd.java |   58 -
 .../jena/tdb2/loader/TestLoaderStdSetups.java      |   58 +
 .../org/apache/jena/tdb2/setup/TS_TDBSetup.java    |    6 +-
 .../apache/jena/tdb2/setup/TestStoreParams.java    |  130 +-
 .../jena/tdb2/setup/TestStoreParamsChoose.java     |  144 +-
 .../jena/tdb2/setup/TestStoreParamsCreate.java     |  186 +--
 .../org/apache/jena/tdb2/solver/TS_SolverTDB.java  |    4 +-
 .../org/apache/jena/tdb2/solver/TestSolverTDB.java |  172 +--
 .../org/apache/jena/tdb2/solver/TestStats.java     |  108 +-
 .../store/AbstractTestStoreConnectionBasics.java   |  186 ++-
 .../java/org/apache/jena/tdb2/store/TS_Store.java  |   24 +-
 .../org/apache/jena/tdb2/store/TestDatasetTDB.java |  432 +++---
 .../jena/tdb2/store/TestDatasetTDBPersist.java     |   98 +-
 .../jena/tdb2/store/TestDynamicDatasetTDB.java     |   10 +-
 .../apache/jena/tdb2/store/TestGraphNamedTDB.java  |   38 +-
 .../org/apache/jena/tdb2/store/TestGraphTDB.java   |   30 +-
 .../org/apache/jena/tdb2/store/TestNodeId.java     |   30 +-
 .../org/apache/jena/tdb2/store/TestQuadFilter.java |   90 +-
 .../tdb2/store/TestStorageDatasetGraphTests.java   |   51 +
 .../jena/tdb2/store/TestStoreConnectionDirect.java |   16 +-
 .../jena/tdb2/store/TestStoreConnectionLock.java   |   10 +-
 .../jena/tdb2/store/TestStoreConnectionMapped.java |   14 +-
 .../jena/tdb2/store/TestStoreConnectionMem.java    |    2 +-
 .../apache/jena/tdb2/store/TestSuiteGraphTDB.java  |   16 +-
 .../jena/tdb2/store/TestTransPromoteTDB.java       |    4 +-
 .../tdb2/store/TestTransactionLifecycleTDB.java    |    4 +-
 .../apache/jena/tdb2/store/TestTransactions.java   |  145 +-
 .../apache/jena/tdb2/store/TestTripleTable.java    |  152 +--
 .../apache/jena/tdb2/store/Test_SPARQL_TDB.java    |  220 +--
 .../store/nodetable/AbstractTestNodeTable.java     |   56 +-
 .../jena/tdb2/store/nodetable/TS_NodeTable.java    |    4 +-
 .../jena/tdb2/store/nodetable/TestNodeTable.java   |   10 +-
 .../tdb2/store/nodetable/TestNodeTableBase.java    |   10 +-
 .../tdb2/store/nodetable/TestNodeTableStored.java  |   18 +-
 .../store/nodetable/TestNodeTableStoredBase.java   |   20 +-
 .../store/tupletable/AbstractTestTupleIndex.java   |  308 ++---
 .../apache/jena/tdb2/store/tupletable/NData.java   |    8 +-
 .../store/tupletable/TestTupleIndexRecord.java     |   18 +-
 .../tupletable/TestTupleIndexRecordDirect.java     |  378 +++---
 .../jena/tdb2/store/tupletable/TestTupleTable.java |  194 +--
 .../jena/tdb2/store/value/TestDoubleNode62.java    |   20 +-
 .../jena/tdb2/store/value/TestNodeIdInline.java    |  234 ++--
 .../jena/tdb2/sys/TestDatabaseConnection.java      |   46 +-
 .../org/apache/jena/tdb2/sys/TestDatabaseOps.java  |  133 +-
 .../java/org/apache/jena/tdb2/sys/TestOps.java     |    4 +-
 .../java/org/apache/jena/tdb2/sys/TestSys.java     |    6 +-
 jena-db/pom.xml                                    |    7 +-
 jena-db/use-fuseki-tdb2.md                         |   56 -
 jena-db/use-tdb2-cmds.md                           |   19 -
 jena-db/use-tdb2.md                                |   18 -
 jena-elephas/LICENSE                               |  176 ---
 jena-elephas/NOTICE                                |    5 -
 jena-elephas/jena-elephas-common/pom.xml           |    6 +-
 jena-elephas/jena-elephas-io/pom.xml               |   10 +-
 jena-elephas/jena-elephas-mapreduce/pom.xml        |    8 +-
 jena-elephas/jena-elephas-stats/pom.xml            |    2 +-
 jena-elephas/pom.xml                               |    6 +-
 jena-examples/pom.xml                              |    4 +-
 jena-extras/jena-querybuilder/pom.xml              |    2 +-
 jena-extras/pom.xml                                |    6 +-
 jena-fuseki2/apache-jena-fuseki/fuseki             |    2 +-
 jena-fuseki2/apache-jena-fuseki/pom.xml            |    4 +-
 jena-fuseki2/jena-fuseki-access/pom.xml            |    4 +-
 .../jena/fuseki/access/AccessCtl_AllowGET.java     |   74 +
 .../jena/fuseki/access/AccessCtl_DenyUpdate.java   |   63 +
 .../apache/jena/fuseki/access/AccessCtl_GSP_R.java |   39 +
 .../jena/fuseki/access/AccessCtl_REST_Quads_R.java |   43 -
 .../fuseki/access/AccessCtl_REST_Quads_RW.java     |   49 -
 .../jena/fuseki/access/AccessCtl_SPARQL_GSP_R.java |   39 -
 .../fuseki/access/AccessCtl_SPARQL_GSP_RW.java     |   49 -
 .../access/AccessCtl_SPARQL_QueryDataset.java      |   29 +-
 .../fuseki/access/AccessCtl_SPARQL_Update.java     |   69 -
 .../fuseki/access/AccessCtl_SPARQL_Upload.java     |   49 -
 .../jena/fuseki/access/AssemblerAccessDataset.java |   28 +-
 .../fuseki/access/AssemblerSecurityRegistry.java   |   66 +-
 .../jena/fuseki/access/AuthorizationService.java   |    2 +-
 .../apache/jena/fuseki/access/DataAccessCtl.java   |   22 +-
 .../apache/jena/fuseki/access/DataAccessLib.java   |   12 +-
 .../fuseki/access/DatasetGraphAccessControl.java   |   16 +-
 .../org/apache/jena/fuseki/access/GraphFilter.java |   16 +-
 .../apache/jena/fuseki/access/GraphFilterTDB1.java |    8 +-
 .../apache/jena/fuseki/access/GraphFilterTDB2.java |    6 +-
 .../apache/jena/fuseki/access/InitSecurity.java    |    6 +-
 .../apache/jena/fuseki/access/SecurityContext.java |   18 +-
 .../fuseki/access/SecurityContextAllowAll.java     |   12 +-
 .../access/SecurityContextAllowNamedGraphs.java    |   12 +-
 .../fuseki/access/SecurityContextAllowNone.java    |   16 +-
 .../jena/fuseki/access/SecurityContextView.java    |   24 +-
 .../jena/fuseki/access/SecurityRegistry.java       |   14 +-
 .../apache/jena/fuseki/access/VocabSecurity.java   |   12 +-
 .../org/apache/jena/fuseki/access/TS_Access.java   |    2 +-
 .../fuseki/access/TestSecurityFilterLocal.java     |   80 +-
 .../jena/fuseki/access/TestSecurityRegistry.java   |   14 +-
 jena-fuseki2/jena-fuseki-core/pom.xml              |   21 +-
 .../src/main/java/org/apache/jena/fuseki/DEF.java  |   65 +-
 .../main/java/org/apache/jena/fuseki/Fuseki.java   |  191 +--
 .../apache/jena/fuseki/FusekiConfigException.java  |    8 +-
 .../org/apache/jena/fuseki/FusekiException.java    |   10 +-
 .../org/apache/jena/fuseki/async/AsyncPool.java    |   82 +-
 .../org/apache/jena/fuseki/async/AsyncTask.java    |  108 +-
 .../java/org/apache/jena/fuseki/auth/Auth.java     |   22 +-
 .../org/apache/jena/fuseki/auth/AuthPolicy.java    |    2 +-
 .../apache/jena/fuseki/auth/AuthPolicyList.java    |   18 +-
 .../org/apache/jena/fuseki/auth/AuthUserList.java  |   10 +-
 .../java/org/apache/jena/fuseki/auth/Users.java    |    6 +-
 .../org/apache/jena/fuseki/build/BuildLib.java     |  168 +++
 .../jena/fuseki/build/DatasetDescriptionMap.java   |   58 +
 .../fuseki/build/DatasetDescriptionRegistry.java   |   62 -
 .../apache/jena/fuseki/build/FusekiBuildLib.java   |  170 ---
 .../apache/jena/fuseki/build/FusekiBuilder.java    |  172 ---
 .../org/apache/jena/fuseki/build/FusekiConfig.java |  537 +++++---
 .../org/apache/jena/fuseki/build/FusekiConst.java  |   41 -
 .../apache/jena/fuseki/build/FusekiPrefixes.java   |   42 +
 .../apache/jena/fuseki/ctl/ActionAsyncTask.java    |   40 +-
 .../jena/fuseki/ctl/ActionContainerItem.java       |  124 +-
 .../java/org/apache/jena/fuseki/ctl/ActionCtl.java |  118 +-
 .../apache/jena/fuseki/ctl/ActionDumpRequest.java  |   37 +-
 .../org/apache/jena/fuseki/ctl/ActionItem.java     |   18 +-
 .../org/apache/jena/fuseki/ctl/ActionMetrics.java  |   25 +-
 .../org/apache/jena/fuseki/ctl/ActionPing.java     |   44 +-
 .../org/apache/jena/fuseki/ctl/ActionSleep.java    |   84 +-
 .../org/apache/jena/fuseki/ctl/ActionStats.java    |  275 ++--
 .../org/apache/jena/fuseki/ctl/ActionTasks.java    |  121 +-
 .../java/org/apache/jena/fuseki/ctl/Async.java     |   50 +-
 .../org/apache/jena/fuseki/ctl/JsonConstCtl.java   |   10 +-
 .../apache/jena/fuseki/ctl/JsonDescription.java    |   68 +-
 .../java/org/apache/jena/fuseki/ctl/TaskBase.java  |   24 +-
 .../jena/fuseki/jetty/FusekiErrorHandler.java      |   64 +-
 .../jena/fuseki/jetty/FusekiErrorHandler1.java     |   49 +-
 .../org/apache/jena/fuseki/jetty/JettyHttps.java   |   16 +-
 .../org/apache/jena/fuseki/jetty/JettyLib.java     |   34 +-
 .../jena/fuseki/jetty/JettyServerConfig.java       |   30 +-
 .../java/org/apache/jena/fuseki/package-info.java  |    8 +-
 .../org/apache/jena/fuseki/server/Counter.java     |   14 +-
 .../apache/jena/fuseki/server/CounterMXBean.java   |   25 -
 .../org/apache/jena/fuseki/server/CounterName.java |   20 +-
 .../org/apache/jena/fuseki/server/CounterSet.java  |   37 +-
 .../org/apache/jena/fuseki/server/Counters.java    |    4 +-
 .../apache/jena/fuseki/server/DataAccessPoint.java |   49 +-
 .../fuseki/server/DataAccessPointRegistry.java     |   40 +-
 .../org/apache/jena/fuseki/server/DataService.java |  143 +-
 .../jena/fuseki/server/DataServiceStatus.java      |   24 +-
 .../apache/jena/fuseki/server/DatasetMXBean.java   |   35 -
 .../org/apache/jena/fuseki/server/Endpoint.java    |   14 +-
 .../org/apache/jena/fuseki/server/EndpointSet.java |  119 ++
 .../org/apache/jena/fuseki/server/FusekiInfo.java  |   34 +-
 .../jena/fuseki/server/FusekiInitialConfig.java    |   54 +-
 .../org/apache/jena/fuseki/server/FusekiVocab.java |   21 +-
 .../org/apache/jena/fuseki/server/NameMgr.java     |    4 +-
 .../org/apache/jena/fuseki/server/Operation.java   |   37 +-
 .../org/apache/jena/fuseki/server/RequestLog.java  |  142 +-
 .../org/apache/jena/fuseki/server/ServerConst.java |   30 +-
 .../org/apache/jena/fuseki/server/ServiceOnly.java |   44 -
 .../apache/jena/fuseki/servlets/ActionBase.java    |  283 +---
 .../jena/fuseki/servlets/ActionErrorException.java |   16 +-
 .../apache/jena/fuseki/servlets/ActionExecLib.java |  310 +++++
 .../org/apache/jena/fuseki/servlets/ActionLib.java |  248 ++--
 .../jena/fuseki/servlets/ActionLifecycle.java      |   28 +
 .../jena/fuseki/servlets/ActionProcessor.java      |   52 +
 .../apache/jena/fuseki/servlets/ActionREST.java    |  156 +--
 .../apache/jena/fuseki/servlets/ActionService.java |  282 +---
 .../jena/fuseki/servlets/CrossOriginFilter.java    |   10 +-
 .../apache/jena/fuseki/servlets/Dispatcher.java    |  416 ++++++
 .../apache/jena/fuseki/servlets/FusekiFilter.java  |   85 +-
 .../org/apache/jena/fuseki/servlets/GSPTarget.java |  105 ++
 .../org/apache/jena/fuseki/servlets/GSP_Base.java  |  164 +++
 .../org/apache/jena/fuseki/servlets/GSP_R.java     |  177 +++
 .../org/apache/jena/fuseki/servlets/GSP_RW.java    |  364 +++++
 .../apache/jena/fuseki/servlets/HttpAction.java    |  386 +++---
 .../servlets/HttpServletResponseTracker.java       |   20 +-
 .../jena/fuseki/servlets/OperationRegistry.java    |  135 ++
 .../apache/jena/fuseki/servlets/REST_Quads.java    |   62 -
 .../apache/jena/fuseki/servlets/REST_Quads_R.java  |  121 --
 .../apache/jena/fuseki/servlets/REST_Quads_RW.java |  150 ---
 .../jena/fuseki/servlets/ResponseCallback.java     |    4 +-
 .../jena/fuseki/servlets/ResponseDataset.java      |  122 +-
 .../apache/jena/fuseki/servlets/ResponseJson.java  |  133 +-
 .../apache/jena/fuseki/servlets/ResponseOps.java   |   90 +-
 .../jena/fuseki/servlets/ResponseResultSet.java    |  190 +--
 .../jena/fuseki/servlets/SPARQLProtocol.java       |  104 ++
 .../jena/fuseki/servlets/SPARQLQueryProcessor.java |  450 +++++++
 .../apache/jena/fuseki/servlets/SPARQL_GSP.java    |  225 ----
 .../apache/jena/fuseki/servlets/SPARQL_GSP_R.java  |  140 --
 .../apache/jena/fuseki/servlets/SPARQL_GSP_RW.java |  216 ---
 .../jena/fuseki/servlets/SPARQL_Protocol.java      |  111 --
 .../apache/jena/fuseki/servlets/SPARQL_Query.java  |  466 -------
 .../jena/fuseki/servlets/SPARQL_QueryDataset.java  |   52 +-
 .../jena/fuseki/servlets/SPARQL_QueryGeneral.java  |  246 ++--
 .../apache/jena/fuseki/servlets/SPARQL_Update.java |  278 ++--
 .../apache/jena/fuseki/servlets/SPARQL_Upload.java |  136 +-
 .../fuseki/servlets/ServiceDispatchRegistry.java   |  139 --
 .../apache/jena/fuseki/servlets/ServiceRouter.java |  360 -----
 .../apache/jena/fuseki/servlets/ServletAction.java |   62 +
 .../apache/jena/fuseki/servlets/ServletBase.java   |   69 +-
 .../apache/jena/fuseki/servlets/ServletOps.java    |  153 ++-
 .../jena/fuseki/servlets/ServletProcessor.java     |   60 +
 .../java/org/apache/jena/fuseki/system/ConNeg.java |  217 +--
 .../apache/jena/fuseki/system/FusekiLogging.java   |  132 +-
 .../apache/jena/fuseki/system/FusekiNetLib.java    |  167 ++-
 .../apache/jena/fuseki/system/GraphLoadUtils.java  |   63 +-
 .../jena/fuseki/system/StreamRDFLimited.java       |   36 +-
 .../java/org/apache/jena/fuseki/system/Upload.java |  258 ++--
 .../apache/jena/fuseki/system/UploadDetails.java   |   74 +-
 .../jena/fuseki/system/UploadDetailsWithName.java  |   12 +-
 .../jena/fuseki/validation/ValidatorBase.java      |  154 +--
 .../jena/fuseki/validation/ValidatorBaseJson.java  |  230 ++--
 .../fuseki/validation/html/DataValidatorHTML.java  |  236 ++--
 .../fuseki/validation/html/IRIValidatorHTML.java   |  127 +-
 .../fuseki/validation/html/QueryValidatorHTML.java |  300 ++---
 .../validation/html/UpdateValidatorHTML.java       |  152 +--
 .../fuseki/validation/html/ValidatorHtmlLib.java   |  148 +-
 .../fuseki/validation/json/DataValidatorJSON.java  |  108 +-
 .../fuseki/validation/json/IRIValidatorJSON.java   |  112 +-
 .../fuseki/validation/json/QueryValidatorJSON.java |  154 +--
 .../validation/json/UpdateValidatorJSON.java       |   94 +-
 .../fuseki/validation/json/ValidationAction.java   |   95 +-
 .../fuseki/validation/json/ValidatorJsonLib.java   |   69 +-
 .../test/java/org/apache/jena/fuseki/Dummy.java    |    4 +-
 .../org/apache/jena/fuseki/test/FusekiTest.java    |  150 +++
 jena-fuseki2/jena-fuseki-fulljar/pom.xml           |    2 +-
 .../jena-fuseki-geosparql/geosparql_test.rdf       |  199 +++
 jena-fuseki2/jena-fuseki-geosparql/pom.xml         |  233 ++++
 .../jena/fuseki/geosparql/DatasetException.java    |   33 +
 .../jena/fuseki/geosparql/DatasetOperations.java   |  213 +++
 .../jena/fuseki/geosparql/GeosparqlServer.java     |  139 ++
 .../org/apache/jena/fuseki/geosparql/Main.java     |   75 ++
 .../jena/fuseki/geosparql/cli/ArgsConfig.java      |  203 +++
 .../fuseki/geosparql/cli/FileGraphDelimiter.java   |   86 ++
 .../jena/fuseki/geosparql/cli/FileGraphFormat.java |   87 ++
 .../fuseki/geosparql/cli/IntegerListConverter.java |   40 +
 .../fuseki/geosparql/cli/LongListConverter.java    |   40 +
 .../fuseki/geosparql/cli/RDFFileParameter.java     |   91 ++
 .../fuseki/geosparql/cli/TabFileParameter.java     |   95 ++
 .../src/main/resources/META-INF/NOTICE             |  176 +++
 .../org/apache/jena/fuseki/geosparql/MainTest.java |  124 ++
 .../fuseki/geosparql/cli/RDFFileParameterTest.java |  101 ++
 .../fuseki/geosparql/cli/TabFileParameterTest.java |  100 ++
 jena-fuseki2/jena-fuseki-main/pom.xml              |   14 +-
 .../org/apache/jena/fuseki/main/FusekiLib.java     |   64 +-
 .../org/apache/jena/fuseki/main/FusekiServer.java  |  353 +++--
 .../org/apache/jena/fuseki/main/JettyServer.java   |   21 +-
 .../apache/jena/fuseki/main/cmds/FusekiMain.java   |  150 +--
 .../jena/fuseki/main/cmds/FusekiMainCmd.java       |    6 +-
 .../apache/jena/fuseki/main/cmds/PlatformInfo.java |   22 +-
 .../apache/jena/fuseki/main/cmds/ServerConfig.java |   22 +-
 .../apache/jena/fuseki/main/CustomTestService.java |    6 +-
 .../apache/jena/fuseki/main/FusekiTestAuth.java    |  180 ---
 .../org/apache/jena/fuseki/main/FusekiTestLib.java |  119 ++
 .../apache/jena/fuseki/main/FusekiTestServer.java  |  146 +-
 .../org/apache/jena/fuseki/main/TC_Fuseki.java     |   32 -
 .../org/apache/jena/fuseki/main/TC_FusekiMain.java |   41 +
 .../org/apache/jena/fuseki/main/TS_FusekiMain.java |   19 +-
 .../jena/fuseki/main/TestEmbeddedFuseki.java       |  387 +++---
 .../fuseki/main/TestFusekiCustomOperation.java     |   52 +-
 .../apache/jena/fuseki/main/TestFusekiMainCmd.java |   18 +-
 .../jena/fuseki/main/TestFusekiTestAuth.java       |  100 --
 .../jena/fuseki/main/TestFusekiTestServer.java     |   61 -
 .../jena/fuseki/main/TestMultipleEmbedded.java     |  170 +--
 .../org/apache/jena/fuseki/main/TestStdSetup.java  |  170 +++
 .../AbstractTestFusekiSecurityAssembler.java       |   71 +-
 .../access/AbstractTestServiceDatasetAuth.java     |  112 ++
 .../jena/fuseki/main/access/AccessTestLib.java     |   24 +-
 .../jena/fuseki/main/access/TS_SecurityFuseki.java |   17 +-
 .../jena/fuseki/main/access/TestAuthorized.java    |   26 +-
 .../jena/fuseki/main/access/TestPasswdOnly.java    |  103 ++
 .../main/access/TestSecurityBuilderSetup.java      |   50 +-
 .../fuseki/main/access/TestSecurityConfig.java     |   52 +-
 .../main/access/TestSecurityFilterFuseki.java      |   68 +-
 .../main/access/TestServiceDataAuthBuild.java      |   38 +
 .../main/access/TestServiceDataAuthConfig.java     |   60 +
 .../jena/fuseki/main/examples/ExampleService.java  |    6 +-
 .../main/examples/ExtendFuseki_AddService_1.java   |   46 +-
 .../main/examples/ExtendFuseki_AddService_2.java   |   48 +-
 .../main/examples/ExtendFuseki_AddService_3.java   |   36 +-
 .../jena/fuseki/main/old/FusekiTestAuth.java       |  181 +++
 .../fuseki/main/old/TestFusekiTestAuthOld.java     |   92 ++
 .../testing/Access/config-auth.ttl                 |   44 +
 .../jena-fuseki-main/testing/Access/passwd         |    4 +-
 jena-fuseki2/jena-fuseki-server/pom.xml            |    4 +-
 jena-fuseki2/jena-fuseki-war/pom.xml               |    2 +-
 jena-fuseki2/jena-fuseki-webapp/pom.xml            |   27 +-
 .../jena/fuseki/authz/AuthorizationFilter403.java  |   44 +-
 .../org/apache/jena/fuseki/authz/DenyFilter.java   |    8 +-
 .../apache/jena/fuseki/authz/LocalhostFilter.java  |   30 +-
 .../java/org/apache/jena/fuseki/cmd/FusekiCmd.java |  324 ++---
 .../apache/jena/fuseki/cmd/JettyFusekiWebapp.java  |  292 ++--
 .../org/apache/jena/fuseki/mgt/ActionBackup.java   |   44 +-
 .../apache/jena/fuseki/mgt/ActionBackupList.java   |   88 +-
 .../org/apache/jena/fuseki/mgt/ActionDatasets.java |  484 +++----
 .../org/apache/jena/fuseki/mgt/ActionLogs.java     |   48 +-
 .../apache/jena/fuseki/mgt/ActionServerStatus.java |   91 +-
 .../java/org/apache/jena/fuseki/mgt/Backup.java    |   98 +-
 .../org/apache/jena/fuseki/mgt/ServerMgtConst.java |   26 +-
 .../java/org/apache/jena/fuseki/mgt/Template.java  |   51 +-
 .../apache/jena/fuseki/mgt/TemplateFunctions.java  |   60 +-
 .../org/apache/jena/fuseki/webapp/FusekiEnv.java   |  144 +-
 .../fuseki/webapp/FusekiServerEnvironmentInit.java |   22 +-
 .../jena/fuseki/webapp/FusekiServerListener.java   |   67 +-
 .../apache/jena/fuseki/webapp/FusekiWebapp.java    |  419 +++---
 .../jena/fuseki/webapp/ShiroEnvironmentLoader.java |  140 +-
 .../org/apache/jena/fuseki/webapp/SystemState.java |   84 +-
 .../apache/jena/fuseki/webapp/templates/config-mem |    4 +
 .../jena/fuseki/webapp/templates/config-service    |   23 -
 .../apache/jena/fuseki/webapp/templates/config-tdb |   21 +-
 .../jena/fuseki/webapp/templates/config-tdb-dir    |   20 +-
 .../jena/fuseki/webapp/templates/config-tdb-mem    |   20 +-
 .../jena/fuseki/webapp/templates/config-tdb2       |   21 +-
 .../jena/fuseki/webapp/templates/config-tdb2-dir   |   21 +-
 .../jena/fuseki/webapp/templates/config-tdb2-mem   |   22 +-
 .../org/apache/jena/fuseki/AbstractFusekiTest.java |   16 +-
 .../java/org/apache/jena/fuseki/FileSender.java    |   72 +-
 .../java/org/apache/jena/fuseki/FusekiTest.java    |  101 --
 .../java/org/apache/jena/fuseki/ServerCtl.java     |  216 +--
 .../java/org/apache/jena/fuseki/ServerTest.java    |   34 +-
 .../org/apache/jena/fuseki/TS_FusekiWebapp.java    |   34 +-
 .../java/org/apache/jena/fuseki/TestAdmin.java     |  610 +++++----
 .../java/org/apache/jena/fuseki/TestAdminAPI.java  |   38 +-
 .../test/java/org/apache/jena/fuseki/TestAuth.java |   96 +-
 .../java/org/apache/jena/fuseki/TestBuilder.java   |    8 +-
 .../jena/fuseki/TestDatasetAccessorHTTP.java       |  456 +++----
 .../jena/fuseki/TestDatasetGraphAccessorHTTP.java  |   18 +-
 .../org/apache/jena/fuseki/TestDatasetOps.java     |  137 +-
 .../org/apache/jena/fuseki/TestFileUpload.java     |  176 +--
 .../java/org/apache/jena/fuseki/TestHttpOp.java    |  199 +--
 .../org/apache/jena/fuseki/TestHttpOperations.java |   90 +-
 .../org/apache/jena/fuseki/TestHttpOptions.java    |   25 +-
 .../java/org/apache/jena/fuseki/TestQuery.java     |  164 +--
 .../org/apache/jena/fuseki/TestSPARQLProtocol.java |   12 +-
 .../org/apache/jena/fuseki/TestServerReadOnly.java |   88 +-
 jena-fuseki2/pom.xml                               |   10 +-
 jena-geosparql/pom.xml                             |  189 +++
 .../geosparql/configuration/GeoSPARQLConfig.java   |  277 ++++
 .../configuration/GeoSPARQLOperations.java         | 1172 ++++++++++++++++
 .../jena/geosparql/configuration/ModeSRS.java      |  103 ++
 .../jena/geosparql/configuration/SrsException.java |   33 +
 .../GenericGeometryPropertyFunction.java           |  168 +++
 .../geo/topological/GenericPropertyFunction.java   |  327 +++++
 .../topological/SpatialObjectGeometryLiteral.java  |  143 ++
 .../property_functions/egenhofer/EhContainsPF.java |   34 +
 .../egenhofer/EhCoveredByPF.java                   |   34 +
 .../property_functions/egenhofer/EhCoversPF.java   |   34 +
 .../property_functions/egenhofer/EhDisjointPF.java |   34 +
 .../property_functions/egenhofer/EhEqualsPF.java   |   34 +
 .../property_functions/egenhofer/EhInsidePF.java   |   34 +
 .../property_functions/egenhofer/EhMeetPF.java     |   34 +
 .../property_functions/egenhofer/EhOverlapPF.java  |   33 +
 .../geometry_property/CoordinateDimensionPF.java   |   36 +
 .../geometry_property/DimensionPF.java             |   36 +
 .../geometry_property/IsEmptyPF.java               |   36 +
 .../geometry_property/IsSimplePF.java              |   36 +
 .../geometry_property/IsValidPF.java               |   37 +
 .../geometry_property/SpatialDimensionPF.java      |   36 +
 .../property_functions/rcc8/RccDisconnectedPF.java |   33 +
 .../property_functions/rcc8/RccEqualsPF.java       |   34 +
 .../rcc8/RccExternallyConnectedPF.java             |   34 +
 .../rcc8/RccNonTangentialProperPartInversePF.java  |   34 +
 .../rcc8/RccNonTangentialProperPartPF.java         |   34 +
 .../rcc8/RccPartiallyOverlappingPF.java            |   34 +
 .../rcc8/RccTangentialProperPartInversePF.java     |   34 +
 .../rcc8/RccTangentialProperPartPF.java            |   34 +
 .../simple_features/SfContainsPF.java              |   34 +
 .../simple_features/SfCrossesPF.java               |   34 +
 .../simple_features/SfDisjointPF.java              |   34 +
 .../simple_features/SfEqualsPF.java                |   34 +
 .../simple_features/SfIntersectsPF.java            |   34 +
 .../simple_features/SfOverlapsPF.java              |   34 +
 .../simple_features/SfTouchesPF.java               |   34 +
 .../simple_features/SfWithinPF.java                |   34 +
 .../filter_functions/BoundaryFF.java               |   45 +
 .../nontopological/filter_functions/BufferFF.java  |   69 +
 .../filter_functions/ConvexHullFF.java             |   46 +
 .../filter_functions/DifferenceFF.java             |   56 +
 .../filter_functions/DistanceFF.java               |   61 +
 .../nontopological/filter_functions/EnvelopFF.java |   46 +
 .../nontopological/filter_functions/GetSRIDFF.java |   46 +
 .../filter_functions/IntersectionFF.java           |   57 +
 .../filter_functions/SymmetricDifferenceFF.java    |   56 +
 .../nontopological/filter_functions/UnionFF.java   |   56 +
 .../geof/topological/GenericFilterFunction.java    |   81 ++
 .../jena/geosparql/geof/topological/RelateFF.java  |   64 +
 .../filter_functions/egenhofer/EhContainsFF.java   |   54 +
 .../filter_functions/egenhofer/EhCoveredByFF.java  |   53 +
 .../filter_functions/egenhofer/EhCoversFF.java     |   53 +
 .../filter_functions/egenhofer/EhDisjointFF.java   |   53 +
 .../filter_functions/egenhofer/EhEqualsFF.java     |   53 +
 .../filter_functions/egenhofer/EhInsideFF.java     |   53 +
 .../filter_functions/egenhofer/EhMeetFF.java       |   53 +
 .../filter_functions/egenhofer/EhOverlapFF.java    |   53 +
 .../geometry_property/CoordinateDimensionFF.java   |   45 +
 .../geometry_property/DimensionFF.java             |   45 +
 .../geometry_property/IsEmptyFF.java               |   45 +
 .../geometry_property/IsSimpleFF.java              |   45 +
 .../geometry_property/IsValidFF.java               |   46 +
 .../geometry_property/SpatialDimensionFF.java      |   45 +
 .../filter_functions/rcc8/RccDisconnectedFF.java   |   53 +
 .../filter_functions/rcc8/RccEqualsFF.java         |   53 +
 .../rcc8/RccExternallyConnectedFF.java             |   53 +
 .../rcc8/RccNonTangentialProperPartFF.java         |   53 +
 .../rcc8/RccNonTangentialProperPartInverseFF.java  |   53 +
 .../rcc8/RccPartiallyOverlappingFF.java            |   54 +
 .../rcc8/RccTangentialProperPartFF.java            |   53 +
 .../rcc8/RccTangentialProperPartInverseFF.java     |   53 +
 .../simple_features/SfContainsFF.java              |   53 +
 .../simple_features/SfCrossesFF.java               |   52 +
 .../simple_features/SfDisjointFF.java              |   52 +
 .../simple_features/SfEqualsFF.java                |   54 +
 .../simple_features/SfIntersectsFF.java            |   52 +
 .../simple_features/SfOverlapsFF.java              |   52 +
 .../simple_features/SfTouchesFF.java               |   52 +
 .../simple_features/SfWithinFF.java                |   52 +
 .../geosparql/implementation/DimensionInfo.java    |  216 +++
 .../geosparql/implementation/GeometryReverse.java  |  226 ++++
 .../geosparql/implementation/GeometryWrapper.java  | 1248 +++++++++++++++++
 .../implementation/GeometryWrapperFactory.java     |  357 +++++
 .../jena/geosparql/implementation/SRSInfo.java     |  325 +++++
 .../geosparql/implementation/SRSInfoException.java |   33 +
 .../implementation/UnitsConversionException.java   |   33 +
 .../geosparql/implementation/UnitsOfMeasure.java   |  224 +++
 .../implementation/WKTLiteralFactory.java          |  134 ++
 .../implementation/datatype/GMLDatatype.java       |  100 ++
 .../implementation/datatype/GeometryDatatype.java  |  104 ++
 .../implementation/datatype/WKTDatatype.java       |  103 ++
 .../function_registration/Egenhofer.java           |   84 ++
 .../function_registration/GeometryProperty.java    |   75 ++
 .../function_registration/NonTopological.java      |   61 +
 .../implementation/function_registration/RCC8.java |   84 ++
 .../function_registration/Relate.java              |   45 +
 .../function_registration/SimpleFeatures.java      |   84 ++
 .../function_registration/Spatial.java             |  109 ++
 .../implementation/great_circle/Angle.java         |  112 ++
 .../implementation/great_circle/Azimuth.java       |  109 ++
 .../great_circle/CoordinatePair.java               |  152 +++
 .../great_circle/GreatCircleDistance.java          |  193 +++
 .../great_circle/GreatCirclePointDistance.java     |  197 +++
 .../implementation/great_circle/LatLonPoint.java   |   73 +
 .../implementation/index/CollisionResult.java      |   26 +
 .../implementation/index/GeometryLiteralIndex.java |  162 +++
 .../index/GeometryTransformIndex.java              |  159 +++
 .../implementation/index/IndexConfiguration.java   |  140 ++
 .../implementation/index/QueryRewriteIndex.java    |  301 +++++
 .../EgenhoferIntersectionPattern.java              |   47 +
 .../RCC8IntersectionPattern.java                   |   42 +
 .../SimpleFeaturesIntersectionPattern.java         |   28 +
 .../jts/CoordinateSequenceDimensions.java          |   89 ++
 .../jts/CustomCoordinateSequence.java              |  569 ++++++++
 .../jts/CustomCoordinateSequenceFactory.java       |   57 +
 .../implementation/jts/CustomGeometryFactory.java  |   35 +
 .../implementation/jts/GeometryTransformation.java |  235 ++++
 .../implementation/parsers/ParserReader.java       |   38 +
 .../implementation/parsers/ParserWriter.java       |   26 +
 .../implementation/parsers/gml/GMLReader.java      |  749 +++++++++++
 .../implementation/parsers/gml/GMLWriter.java      |  282 ++++
 .../implementation/parsers/wkt/WKTReader.java      |  364 +++++
 .../implementation/parsers/wkt/WKTWriter.java      |  290 ++++
 .../registry/MathTransformRegistry.java            |   59 +
 .../implementation/registry/SRSRegistry.java       |  140 ++
 .../implementation/registry/UnitsRegistry.java     |  138 ++
 .../implementation/registry/UnitsURIException.java |   33 +
 .../geosparql/implementation/vocabulary/Geo.java   |  174 +++
 .../implementation/vocabulary/GeoSPARQL_URI.java   |   63 +
 .../geosparql/implementation/vocabulary/Geof.java  |   82 ++
 .../implementation/vocabulary/Other_URI.java       |   44 +
 .../implementation/vocabulary/SRS_URI.java         |   56 +
 .../vocabulary/SpatialExtension.java               |   76 ++
 .../implementation/vocabulary/Unit_URI.java        |   73 +
 .../jena/geosparql/spatial/CardinalDirection.java  |   26 +
 .../jena/geosparql/spatial/ConvertLatLon.java      |   92 ++
 .../jena/geosparql/spatial/ConvertLatLonBox.java   |   76 ++
 .../jena/geosparql/spatial/SearchEnvelope.java     |  342 +++++
 .../jena/geosparql/spatial/SpatialIndex.java       |  519 +++++++
 .../geosparql/spatial/SpatialIndexException.java   |   33 +
 .../jena/geosparql/spatial/SpatialIndexItem.java   |   50 +
 .../geosparql/spatial/SpatialIndexStorage.java     |  101 ++
 .../spatial/filter_functions/AngleDegreesFF.java   |   67 +
 .../spatial/filter_functions/AngleFF.java          |   66 +
 .../spatial/filter_functions/AzimuthDegreesFF.java |   66 +
 .../spatial/filter_functions/AzimuthFF.java        |   66 +
 .../filter_functions/ConvertLatLonBoxFF.java       |   41 +
 .../spatial/filter_functions/ConvertLatLonFF.java  |   43 +
 .../spatial/filter_functions/DistanceFF.java       |   61 +
 .../spatial/filter_functions/EqualsFF.java         |   54 +
 .../spatial/filter_functions/GreatCircleFF.java    |   83 ++
 .../filter_functions/GreatCircleGeomFF.java        |   61 +
 .../spatial/filter_functions/NearbyFF.java         |   76 ++
 .../filter_functions/TransformDatatypeFF.java      |   59 +
 .../spatial/filter_functions/TransformFF.java      |   74 +
 .../spatial/filter_functions/TransformSRSFF.java   |   60 +
 .../spatial/property_functions/EqualsPF.java       |   34 +
 .../GenericSpatialGeomPropertyFunction.java        |   84 ++
 .../GenericSpatialPropertyFunction.java            |  203 +++
 .../property_functions/SpatialArguments.java       |   87 ++
 .../box/GenericSpatialBoxPropertyFunction.java     |   89 ++
 .../box/GenericSpatialGeomBoxPropertyFunction.java |   37 +
 .../property_functions/box/IntersectBoxGeomPF.java |   43 +
 .../property_functions/box/IntersectBoxPF.java     |   43 +
 .../property_functions/box/WithinBoxGeomPF.java    |   43 +
 .../property_functions/box/WithinBoxPF.java        |   43 +
 .../property_functions/cardinal/EastGeomPF.java    |   33 +
 .../property_functions/cardinal/EastPF.java        |   33 +
 .../GenericCardinalGeomPropertyFunction.java       |   68 +
 .../cardinal/GenericCardinalPropertyFunction.java  |   85 ++
 .../property_functions/cardinal/NorthGeomPF.java   |   33 +
 .../property_functions/cardinal/NorthPF.java       |   32 +
 .../property_functions/cardinal/SouthGeomPF.java   |   33 +
 .../property_functions/cardinal/SouthPF.java       |   33 +
 .../property_functions/cardinal/WestGeomPF.java    |   33 +
 .../property_functions/cardinal/WestPF.java        |   33 +
 .../property_functions/nearby/NearbyGeomPF.java    |  112 ++
 .../property_functions/nearby/NearbyPF.java        |  103 ++
 .../schema/geosparql_vocab_all_v1_0_1_updated.rdf  |  986 ++++++++++++++
 .../configuration/GeoSPARQLOperationsTest.java     |  339 +++++
 .../jena/geosparql/configuration/ModeSRSTest.java  |  103 ++
 .../GenericGeometryPropertyFunctionTest.java       |  140 ++
 .../topological/GenericPropertyFunctionTest.java   |  586 ++++++++
 .../geo/topological/QueryRewriteTestData.java      |  117 ++
 .../SpatialObjectGeometryLiteralTest.java          |  153 +++
 .../egenhofer/EhContainsPFTest.java                |  139 ++
 .../egenhofer/EhCoveredByPFTest.java               |  141 ++
 .../egenhofer/EhCoversPFTest.java                  |  113 ++
 .../egenhofer/EhDisjointPFTest.java                |  139 ++
 .../egenhofer/EhEqualsPFTest.java                  |  202 +++
 .../egenhofer/EhInsidePFTest.java                  |  169 +++
 .../property_functions/egenhofer/EhMeetPFTest.java |  141 ++
 .../egenhofer/EhOverlapPFTest.java                 |  130 ++
 .../CoordinateDimensionPFTest.java                 |  107 ++
 .../geometry_property/DimensionPFTest.java         |   94 ++
 .../geometry_property/IsEmptyPFTest.java           |   81 ++
 .../geometry_property/IsSimplePFTest.java          |   81 ++
 .../geometry_property/IsValidPFTest.java           |   81 ++
 .../geometry_property/SpatialDimensionPFTest.java  |  107 ++
 .../rcc8/RccDisconnectedPFTest.java                |   84 ++
 .../property_functions/rcc8/RccEqualsPFTest.java   |  118 ++
 .../rcc8/RccExternallyConnectedPFTest.java         |   83 ++
 .../RccNonTangentialProperPartInversePFTest.java   |   83 ++
 .../rcc8/RccNonTangentialProperPartPFTest.java     |   83 ++
 .../rcc8/RccPartiallyOverlappingPFTest.java        |   82 ++
 .../rcc8/RccTangentialProperPartInversePFTest.java |   84 ++
 .../rcc8/RccTangentialProperPartPFTest.java        |   84 ++
 .../simple_features/SfContainsPFTest.java          |  139 ++
 .../simple_features/SfCrossesPFTest.java           |  172 +++
 .../simple_features/SfDisjointPFTest.java          |  139 ++
 .../simple_features/SfEqualsPFTest.java            |  202 +++
 .../simple_features/SfIntersectsPFTest.java        |  139 ++
 .../simple_features/SfOverlapsPFTest.java          |  141 ++
 .../simple_features/SfTouchesPFTest.java           |  140 ++
 .../simple_features/SfWithinPFTest.java            |  139 ++
 .../filter_functions/BoundaryFFTest.java           |   82 ++
 .../filter_functions/BufferFFTest.java             |  180 +++
 .../filter_functions/ConvexHullFFTest.java         |   80 ++
 .../filter_functions/DifferenceFFTest.java         |   68 +
 .../filter_functions/DistanceFFTest.java           |   86 ++
 .../filter_functions/EnvelopFFTest.java            |   93 ++
 .../filter_functions/GetSRIDFFTest.java            |   81 ++
 .../filter_functions/IntersectionFFTest.java       |   96 ++
 .../SymmetricDifferenceFFTest.java                 |   68 +
 .../filter_functions/UnionFFTest.java              |   68 +
 .../egenhofer/EhContainsFFTest.java                |  293 ++++
 .../egenhofer/EhCoveredByFFTest.java               |  295 ++++
 .../filter_functions/egenhofer/EhCoversFFTest.java |  266 ++++
 .../egenhofer/EhDisjointFFTest.java                |  292 ++++
 .../filter_functions/egenhofer/EhEqualsFFTest.java |  320 +++++
 .../filter_functions/egenhofer/EhInsideFFTest.java |  322 +++++
 .../filter_functions/egenhofer/EhMeetFFTest.java   |  294 ++++
 .../egenhofer/EhOverlapFFTest.java                 |  283 ++++
 .../CoordinateDimensionFFTest.java                 |  106 ++
 .../geometry_property/DimensionFFTest.java         |   93 ++
 .../geometry_property/IsEmptyFFTest.java           |   80 ++
 .../geometry_property/IsSimpleFFTest.java          |   80 ++
 .../geometry_property/IsValidFFTest.java           |   80 ++
 .../geometry_property/SpatialDimensionFFTest.java  |  106 ++
 .../rcc8/RccDisconnectedFFTest.java                |  238 ++++
 .../filter_functions/rcc8/RccEqualsFFTest.java     |  237 ++++
 .../rcc8/RccExternallyConnectedFFTest.java         |  236 ++++
 .../rcc8/RccNonTangentialProperPartFFTest.java     |  236 ++++
 .../RccNonTangentialProperPartInverseFFTest.java   |  246 ++++
 .../rcc8/RccPartiallyOverlappingFFTest.java        |  236 ++++
 .../rcc8/RccTangentialProperPartFFTest.java        |  237 ++++
 .../rcc8/RccTangentialProperPartInverseFFTest.java |  246 ++++
 .../simple_features/SfContainsFFTest.java          |  293 ++++
 .../simple_features/SfCrossesFFTest.java           |  325 +++++
 .../simple_features/SfDisjointFFTest.java          |  292 ++++
 .../simple_features/SfEqualsFFTest.java            |  320 +++++
 .../simple_features/SfIntersectsFFTest.java        |  292 ++++
 .../simple_features/SfOverlapsFFTest.java          |  294 ++++
 .../simple_features/SfTouchesFFTest.java           |  293 ++++
 .../simple_features/SfWithinFFTest.java            |  292 ++++
 .../implementation/DimensionInfoTest.java          |  102 ++
 .../implementation/GeometryReverseTest.java        |  293 ++++
 .../implementation/GeometryWrapperFactoryTest.java |  159 +++
 .../implementation/GeometryWrapperTest.java        |  506 +++++++
 .../jena/geosparql/implementation/SRSInfoTest.java |  148 ++
 .../implementation/UnitsOfMeasureTest.java         |  303 +++++
 .../implementation/datatype/GMLDatatypeTest.java   |  304 +++++
 .../datatype/GeometryDatatypeTest.java             |  140 ++
 .../implementation/datatype/WKTDatatypeTest.java   |  450 +++++++
 .../implementation/great_circle/AngleTest.java     |  112 ++
 .../implementation/great_circle/AzimuthTest.java   |  142 ++
 .../great_circle/CoordinatePairTest.java           |  216 +++
 .../great_circle/GreatCircleDistanceTest.java      |   82 ++
 .../great_circle/GreatCirclePointDistanceTest.java |  205 +++
 .../jts/CoordinateSequenceDimensionsTest.java      |  116 ++
 .../implementation/jts/GeometryTransformTest.java  |  110 ++
 .../implementation/parsers/gml/GMLReaderTest.java  |  743 ++++++++++
 .../implementation/parsers/gml/GMLWriterTest.java  |  328 +++++
 .../implementation/parsers/wkt/WKTReaderTest.java  |  497 +++++++
 .../implementation/parsers/wkt/WKTWriterTest.java  |  418 ++++++
 .../implementation/registry/SRSRegistryTest.java   |  139 ++
 .../geosparql/spatial/ConvertLatLonBoxTest.java    |  118 ++
 .../jena/geosparql/spatial/ConvertLatLonTest.java  |  198 +++
 .../jena/geosparql/spatial/SearchEnvelopeTest.java |  378 ++++++
 .../geosparql/spatial/SpatialIndexTestData.java    |  112 ++
 .../filter_functions/AngleDegreesFFTest.java       |  116 ++
 .../spatial/filter_functions/AngleFFTest.java      |  116 ++
 .../filter_functions/AzimuthDegreesFFTest.java     |  115 ++
 .../spatial/filter_functions/AzimuthFFTest.java    |  115 ++
 .../filter_functions/ConvertLatLonBoxFFTest.java   |  180 +++
 .../filter_functions/ConvertLatLonFFTest.java      |  143 ++
 .../spatial/filter_functions/DistanceFFTest.java   |  211 +++
 .../spatial/filter_functions/EqualsFFTest.java     |  320 +++++
 .../filter_functions/GreatCircleFFTest.java        |  240 ++++
 .../filter_functions/GreatCircleGeomFFTest.java    |  196 +++
 .../spatial/filter_functions/NearbyFFTest.java     |  345 +++++
 .../filter_functions/TransformDatatypeFFTest.java  |  146 ++
 .../spatial/filter_functions/TransformFFTest.java  |  196 +++
 .../filter_functions/TransformSRSFFTest.java       |  146 ++
 .../spatial/property_functions/EqualsPFTest.java   |  202 +++
 .../GenericSpatialGeomPropertyFunctionTest.java    |  245 ++++
 .../GenericSpatialPropertyFunctionTest.java        |  227 ++++
 .../box/GenericSpatialBoxPropertyFunctionTest.java |  353 +++++
 .../box/IntersectBoxGeomPFTest.java                |  176 +++
 .../property_functions/box/IntersectBoxPFTest.java |  172 +++
 .../box/WithinBoxGeomPFTest.java                   |  176 +++
 .../property_functions/box/WithinBoxPFTest.java    |  173 +++
 .../cardinal/EastGeomPFTest.java                   |  147 ++
 .../property_functions/cardinal/EastPFTest.java    |  146 ++
 .../GenericCardinalGeomPropertyFunctionTest.java   |  120 ++
 .../GenericCardinalPropertyFunctionTest.java       |  254 ++++
 .../cardinal/NorthGeomPFTest.java                  |  110 ++
 .../property_functions/cardinal/NorthPFTest.java   |  109 ++
 .../cardinal/SouthGeomPFTest.java                  |  111 ++
 .../property_functions/cardinal/SouthPFTest.java   |  109 ++
 .../cardinal/WestGeomPFTest.java                   |  147 ++
 .../property_functions/cardinal/WestPFTest.java    |  146 ++
 .../nearby/NearbyGeomPFTest.java                   |  448 ++++++
 .../property_functions/nearby/NearbyPFTest.java    |  406 ++++++
 jena-geosparql/src/test/resources/logback-test.xml |   32 +
 jena-integration-tests/LICENSE                     |  177 ---
 jena-integration-tests/NOTICE                      |    4 -
 jena-integration-tests/pom.xml                     |   24 +-
 .../jena/test/assembler/TestDatasetAssembler.java  |   10 -
 .../apache/jena/test/txn/TestDataset2Graph.java    |   27 +-
 jena-iri/DEPENDENCIES                              |   13 -
 jena-iri/LICENSE                                   |  175 ---
 jena-iri/NOTICE                                    |   11 -
 jena-iri/NotesAFS.txt                              |    3 +
 jena-iri/pom.xml                                   |    4 +-
 .../java/org/apache/jena/iri/impl/LexerHost.java   |    1 -
 .../java/org/apache/jena/iri/impl/LexerPath.java   |    1 -
 .../java/org/apache/jena/iri/impl/LexerPort.java   |    3 +-
 .../java/org/apache/jena/iri/impl/LexerQuery.java  |    3 +-
 .../java/org/apache/jena/iri/impl/LexerScheme.java |    3 +-
 .../org/apache/jena/iri/impl/LexerUserinfo.java    |    3 +-
 .../java/org/apache/jena/iri/impl/LexerXHost.java  |    3 +-
 jena-iri/src/main/resources/META-INF/DEPENDENCIES  |   13 -
 jena-iri/src/main/resources/META-INF/LICENSE       |  175 ---
 jena-iri/src/main/resources/META-INF/NOTICE        |   11 -
 jena-jdbc/LICENSE                                  |  275 ----
 jena-jdbc/NOTICE                                   |   10 -
 jena-jdbc/jena-jdbc-core/pom.xml                   |    4 +-
 jena-jdbc/jena-jdbc-driver-bundle/LICENSE          |  275 ----
 jena-jdbc/jena-jdbc-driver-bundle/NOTICE           |   10 -
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml          |   18 +-
 jena-jdbc/jena-jdbc-driver-mem/LICENSE             |  275 ----
 jena-jdbc/jena-jdbc-driver-mem/NOTICE              |   10 -
 jena-jdbc/jena-jdbc-driver-mem/pom.xml             |    6 +-
 jena-jdbc/jena-jdbc-driver-remote/LICENSE          |  275 ----
 jena-jdbc/jena-jdbc-driver-remote/NOTICE           |   10 -
 jena-jdbc/jena-jdbc-driver-remote/pom.xml          |   14 +-
 .../jena/jdbc/remote/RemoteEndpointDriver.java     |    8 +-
 .../TestRemoteEndpointConnectionWithAuth.java      |    2 +-
 .../results/TestRemoteEndpointResultsWithAuth.java |    2 +-
 jena-jdbc/jena-jdbc-driver-tdb/LICENSE             |  275 ----
 jena-jdbc/jena-jdbc-driver-tdb/NOTICE              |   10 -
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml             |   10 +-
 jena-jdbc/pom.xml                                  |    4 +-
 jena-maven-tools/LICENSE                           |  202 ---
 jena-maven-tools/pom.xml                           |   13 +-
 jena-permissions/LICENSE                           |  202 ---
 jena-permissions/NOTICE                            |    9 -
 jena-permissions/pom.xml                           |   10 +-
 jena-rdfconnection/LICENSE                         |  177 ---
 jena-rdfconnection/NOTICE                          |    5 -
 jena-rdfconnection/pom.xml                         |   12 +-
 .../jena/rdfconnection/RDFConnectionRemote.java    |    2 +-
 jena-sdb/LICENSE                                   |  202 ---
 jena-sdb/NOTICE                                    |   11 -
 jena-sdb/pom.xml                                   |   14 +-
 .../apache/jena/sdb/layout2/SQLBridge2Oracle.java  |    2 +-
 jena-sdb/src/main/resources/META-INF/DEPENDENCIES  |   19 -
 jena-sdb/src/main/resources/META-INF/LICENSE       |  202 ---
 jena-sdb/src/main/resources/META-INF/NOTICE        |   11 -
 jena-shaded-guava/DEPENDENCIES                     |    2 -
 jena-shaded-guava/LICENSE                          |  175 ---
 jena-shaded-guava/pom.xml                          |    4 +-
 jena-spatial/DEPENDENCIES                          |   25 -
 jena-spatial/LICENSE                               |  202 ---
 jena-spatial/NOTICE                                |    5 -
 jena-spatial/pom.xml                               |   10 +-
 jena-spatial/src/main/resources/META-INF/NOTICE    |    5 -
 jena-tdb/DEPENDENCIES                              |   16 -
 jena-tdb/LICENSE                                   |  175 ---
 jena-tdb/NOTICE                                    |   11 -
 jena-tdb/pom.xml                                   |   12 +-
 .../java/org/apache/jena/tdb/StoreConnection.java  |    9 +-
 .../src/main/java/org/apache/jena/tdb/TDB.java     |    3 +-
 .../main/java/org/apache/jena/tdb/migrate/A2.java  |   38 -
 .../org/apache/jena/tdb/migrate/CachingPF.java     |   51 -
 .../java/org/apache/jena/tdb/migrate/LockTx.java   |   71 -
 .../jena/tdb/migrate/TransformGraphRename.java     |   54 -
 .../org/apache/jena/tdb/solver/QueryEngineTDB.java |    4 +-
 .../apache/jena/tdb/store/DatasetPrefixesTDB.java  |    7 +-
 .../java/org/apache/jena/tdb/sys/TDBInternal.java  |   27 +-
 .../java/org/apache/jena/tdb/sys/TDBMaker.java     |   72 +-
 .../tdb/transaction/DatasetGraphTransaction.java   |  158 +--
 jena-tdb/src/main/resources/META-INF/DEPENDENCIES  |   19 -
 jena-tdb/src/main/resources/META-INF/LICENSE       |  175 ---
 jena-tdb/src/main/resources/META-INF/NOTICE        |   11 -
 .../src/test/java/org/apache/jena/tdb/TC_TDB.java  |    2 +-
 .../test/java/org/apache/jena/tdb/TS_Factory.java  |   33 -
 .../java/org/apache/jena/tdb/TS_TDBFactory.java    |   33 +
 .../java/org/apache/jena/tdb/TestTDBFactory.java   |    5 +-
 .../jena/tdb/assembler/TestTDBAssembler.java       |   10 +-
 .../java/org/apache/jena/tdb/graph/TS_Graph.java   |    4 +-
 .../org/apache/jena/tdb/graph/TestGraphsTDB1.java  |   34 -
 .../org/apache/jena/tdb/graph/TestGraphsTDB2.java  |   36 -
 .../jena/tdb/graph/TestGraphsTDBinsideTxn.java     |   36 +
 .../apache/jena/tdb/graph/TestGraphsTDBnonTxn.java |   34 +
 .../jena/tdb/graph/TestPrefixMappingTDB.java       |   10 +-
 .../jena/tdb/setup/TestStoreParamsCreate.java      |    2 +-
 .../jena/tdb/store/AbstractStoreConnections.java   |    7 +-
 .../jena/tdb/store/TestDatasetGraphTDBFind.java    |    2 +-
 .../tdb/store/TestDatasetGraphTDBFindPattern.java  |    2 +-
 .../jena/tdb/store/TestDatasetTDBPersist.java      |    7 +-
 .../jena/tdb/store/TestDynamicDatasetTDB.java      |    5 +-
 .../apache/jena/tdb/store/TestGraphNamedTDB.java   |    4 +-
 .../org/apache/jena/tdb/store/TestGraphTDB.java    |   19 +-
 .../java/org/apache/jena/tdb/store/TestLoader.java |    2 +
 .../jena/tdb/store/TestStoreConnectionsMapped.java |    2 +
 .../org/apache/jena/tdb/store/Test_SPARQL_TDB.java |   69 +-
 .../AbstractTestTransSequentialDisk.java           |    3 +-
 .../apache/jena/tdb/transaction/TestTransMem.java  |    3 +-
 .../jena/tdb/transaction/TestTransRestart.java     |    3 +
 .../jena/tdb/transaction/TestTransactionTDB.java   |   53 +-
 jena-text-es/LICENSE                               |  202 ---
 jena-text-es/NOTICE                                |    5 -
 jena-text-es/pom.xml                               |    6 +-
 jena-text-es/src/main/resources/META-INF/LICENSE   |  202 ---
 jena-text-es/src/main/resources/META-INF/NOTICE    |    5 -
 jena-text/LICENSE                                  |  202 ---
 jena-text/NOTICE                                   |    5 -
 jena-text/pom.xml                                  |    8 +-
 jena-text/src/main/resources/META-INF/LICENSE      |  202 ---
 jena-text/src/main/resources/META-INF/NOTICE       |    5 -
 .../text/assembler/TestTextDatasetAssembler.java   |   17 +-
 pom.xml                                            |   65 +-
 1137 files changed, 75495 insertions(+), 29927 deletions(-)