You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/30 18:52:52 UTC
[3/3] git commit: Merge branch 'MARMOTTA-324' into develop
Merge branch 'MARMOTTA-324' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d566d5c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d566d5c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d566d5c5
Branch: refs/heads/develop
Commit: d566d5c56e5030c4d8bc0212d037f0ba78f645d5
Parents: b8a907b be31f8a
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:52:22 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:52:22 2013 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-triplestore/pom.xml | 6 +
.../marmotta/kiwi/config/KiWiConfiguration.java | 40 ++---
.../generator/DatabaseSequenceIDGenerator.java | 75 ++++++++
.../marmotta/kiwi/generator/IDGenerator.java | 61 +++++++
.../kiwi/generator/IDGeneratorType.java | 54 ++++++
.../generator/MemorySequenceIDGenerator.java | 178 +++++++++++++++++++
.../kiwi/generator/SnowflakeIDGenerator.java | 178 +++++++++++++++++++
.../kiwi/generator/UUIDRandomIDGenerator.java | 82 +++++++++
.../kiwi/generator/UUIDTimeIDGenerator.java | 108 +++++++++++
.../kiwi/persistence/KiWiConnection.java | 92 +++-------
.../kiwi/persistence/KiWiPersistence.java | 135 +++-----------
.../test/VersioningPersistenceTest.java | 24 +--
.../test/VersioningRepositoryTest.java | 26 ++-
parent/pom.xml | 13 ++
.../services/triplestore/SesameServiceImpl.java | 29 ++-
.../main/resources/config-defaults.properties | 5 +-
.../resources/config-descriptions.properties | 9 +-
17 files changed, 860 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d566d5c5/parent/pom.xml
----------------------------------------------------------------------