Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Jakob Frank (9) and Sebastian Schaffert (8) # Via Sebastian Schaffert (3) and Jakob Frank (2) * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: added more commonly used URI prefixes to KiWiIO added more commonly used URI prefixes to KiWiIO small bug fix in logging upgrade slf4j and logback fixed some warining in the usage of the refpack-maven-plugin fix kiwi-caching dependencies in parent pom fix dependencies of marmotta-backend-kiwi removed zookeeper from the installer add documentation moved zookeeper dependency into separate profile compress cached representation of very long literals Removed "DISCLAIMER.txt" from assembly and installer, we are not incubating any more! MARMOTTA-189: added redistribution LICENSE entry for timeknots (MARMOTTA-321) MARMOTTA-189: timeknots webjar is now available! MARMOTTA-189: added timeline for memento using timeknots see https://github.com/alangrafu/timeknots MARMOTTA-189: set default encoding in templating to enable url-encoding see http://freemarker.org/docs/ref_builtins_string.html#ref_builtin_url MARMOTTA-189: included simple timeline using timeknots.js Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9ff52585 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9ff52585 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9ff52585 Branch: refs/heads/ldp Commit: 9ff5258513ba95943d549ce8f699eafed8f8ab74 Parents: 41680c9 42cd7a9 Author: Rupert Westenthaler <[email protected]> Authored: Tue Mar 18 15:55:39 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Tue Mar 18 15:55:39 2014 +0100 ---------------------------------------------------------------------- .../maven/plugins/refpack/RefPackMojo.java | 4 +- launchers/marmotta-installer/pom.xml | 7 -- .../src/main/resources/installer/LICENSE.txt | 1 + .../src/main/resources/installer/standalone.xml | 1 - launchers/marmotta-webapp/assembly.xml | 8 +- launchers/marmotta-webapp/pom.xml | 17 +-- .../caching/HazelcastCacheManager.java | 2 +- .../test/externalizer/ExternalizerTest.java | 6 + .../org/apache/marmotta/kiwi/io/KiWiIO.java | 118 ++++++++++++++++++- parent/pom.xml | 30 +++-- platform/backends/marmotta-backend-kiwi/pom.xml | 4 - .../templating/TemplatingServiceImpl.java | 2 + platform/marmotta-versioning-kiwi/pom.xml | 8 ++ .../resources/templates/memento_timemap.ftl | 44 ++++++- 14 files changed, 211 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
