Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sebastian Schaffert # Via Sebastian Schaffert * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: - try being more liberal with calendar formats - custom externalizer for infinispan ldcache backend Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d5bbec57 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d5bbec57 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d5bbec57 Branch: refs/heads/ldp Commit: d5bbec5714f4739624b408a2c6f486b74e28da3d Parents: 9acbddf a7fe31d Author: Rupert Westenthaler <[email protected]> Authored: Tue Feb 4 12:03:54 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Tue Feb 4 12:03:54 2014 +0100 ---------------------------------------------------------------------- .../marmotta/kiwi/model/rdf/KiWiLiteral.java | 9 +- .../registry/CacheTripleRegistry.java | 2 +- .../ldcache/ldcache-backend-infinispan/pom.xml | 9 +- .../infinispan/LDCachingInfinispanBackend.java | 64 ++++-- .../infinispan/io/ModelExternalizer.java | 150 ++++++++++++++ .../infinispan/io/ValueExternalizer.java | 197 +++++++++++++++++++ .../ldcache/backend/infinispan/util/DataIO.java | 68 +++++++ .../src/main/resources/jgroups-ldcache.xml | 2 +- 8 files changed, 479 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
