Merge branch 'tdb-store-params'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4a45e361 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4a45e361 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4a45e361 Branch: refs/heads/master Commit: 4a45e361739bd2c8e2df56a9bc02015728b011bf Parents: d910ff4 15a9317 Author: Andy Seaborne <a...@apache.org> Authored: Sat Nov 8 16:34:26 2014 +0000 Committer: Andy Seaborne <a...@apache.org> Committed: Sat Nov 8 16:34:26 2014 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/jena/atlas/io/IO.java | 3 +- .../java/org/apache/jena/atlas/json/JSON.java | 19 +- .../java/org/apache/jena/atlas/lib/FileOps.java | 8 + .../apache/jena/fuseki/server/SystemState.java | 2 +- .../com/hp/hpl/jena/tdb/StoreConnection.java | 20 +- .../java/com/hp/hpl/jena/tdb/TDBFactory.java | 6 +- .../jena/tdb/assembler/DatasetAssemblerTDB.java | 2 +- .../jena/tdb/assembler/NodeTableAssembler.java | 4 +- .../jena/tdb/assembler/TDBGraphAssembler.java | 2 +- .../hp/hpl/jena/tdb/base/block/BlockParams.java | 6 +- .../com/hp/hpl/jena/tdb/base/file/FileSet.java | 4 +- .../com/hp/hpl/jena/tdb/base/file/Location.java | 10 +- .../com/hp/hpl/jena/tdb/index/IndexParams.java | 6 +- .../java/com/hp/hpl/jena/tdb/setup/Build.java | 72 +++- .../hpl/jena/tdb/setup/DatasetBuilderStd.java | 108 +++--- .../com/hp/hpl/jena/tdb/setup/StoreParams.java | 370 +++++++++++++------ .../hpl/jena/tdb/setup/StoreParamsBuilder.java | 275 +++++++------- .../hp/hpl/jena/tdb/setup/StoreParamsCodec.java | 65 +++- .../hp/hpl/jena/tdb/setup/StoreParamsConst.java | 118 ++++++ .../hpl/jena/tdb/setup/StoreParamsDynamic.java | 18 +- .../tdb/store/bulkloader2/CmdIndexBuild.java | 2 +- .../tdb/store/bulkloader2/CmdIndexCopy.java | 4 +- .../store/bulkloader2/CmdNodeTableBuilder.java | 4 +- .../java/com/hp/hpl/jena/tdb/sys/DebugTDB.java | 2 +- .../java/com/hp/hpl/jena/tdb/sys/TDBMaker.java | 32 +- jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +- .../src/main/java/tdb/cmdline/ModLocation.java | 2 +- .../main/java/tdb/cmdline/ModTDBDataset.java | 2 +- .../src/main/java/tdb/tools/dumpnodetable.java | 2 +- .../src/main/java/tdb/tools/tdbgenindex.java | 4 +- .../jena/tdb/base/file/TestLocationLock.java | 12 +- .../tdb/base/objectfile/TestStringFileDisk.java | 2 +- .../hpl/jena/tdb/extra/T_QuadsObjectIsNull.java | 2 +- .../jena/tdb/extra/T_TDBWriteTransaction.java | 2 +- .../hp/hpl/jena/tdb/extra/T_TransSystem.java | 6 +- .../tdb/extra/T_TransSystemMultiDatasets.java | 4 +- .../jena/tdb/graph/TestPrefixMappingTDB.java | 6 +- .../com/hp/hpl/jena/tdb/setup/TS_TDBSetup.java | 2 + .../hp/hpl/jena/tdb/setup/TestStoreParams.java | 90 +++-- .../jena/tdb/setup/TestStoreParamsChoose.java | 155 ++++++++ .../jena/tdb/setup/TestStoreParamsCreate.java | 171 +++++++++ .../jena/tdb/store/TestDatasetTDBPersist.java | 2 +- .../com/hp/hpl/jena/tdb/store/TestGraphTDB.java | 2 +- .../com/hp/hpl/jena/tdb/store/TestLoader.java | 2 +- .../tdb/transaction/TestNodeTableTransDisk.java | 2 +- .../transaction/TestObjectFileTransStorage.java | 4 +- .../jena/tdb/transaction/TestTransRestart.java | 4 +- .../tdb/transaction/TestTransactionTDB.java | 2 +- 48 files changed, 1238 insertions(+), 408 deletions(-) ----------------------------------------------------------------------