Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sebastian Schaffert (5) and others # Via Sebastian Schaffert (3) and Sergio Fernández (1) * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: - allow configuration of cache cluster port and address even in platform - some library updates allow setting different multicast ports and addresses for clustered caches in the KiWi triplestore updated loader-poms to avoid dependency-reduced-pom creation fixed a few (minor) eclipse warnings MARMOTTA-431: added debian packaging for the webapp launcher updated to Sesame 2.7.10 cosmetics Fixed a minor warning work around a bug in CompressorStreamFactory (COMPRESS-259) cleanup kiwi-loader as it is replaced by marmotta-loader added Marmotta Loader implementation as better replacement for KiWiLoader Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/95122430 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/95122430 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/95122430 Branch: refs/heads/ldp Commit: 9512243047e780be556cc2add7514d8520b1e2f0 Parents: a110dcd 5f99c9e Author: Rupert Westenthaler <[email protected]> Authored: Mon Feb 3 13:36:40 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Mon Feb 3 13:36:40 2014 +0100 ---------------------------------------------------------------------- .../marmotta-rio-rss/pom.xml | 1 - launchers/marmotta-webapp/pom.xml | 57 +- .../marmotta-webapp/src/deb/control/control | 8 + .../marmotta-webapp/src/deb/control/postinst | 8 + .../marmotta-webapp/src/deb/control/postrm | 18 + .../marmotta-webapp/src/deb/control/preinst | 5 + launchers/marmotta-webapp/src/deb/control/prerm | 4 + .../marmotta-webapp/src/deb/home/marmotta.txt | 2 + .../marmotta-webapp/src/deb/tomcat/marmotta.xml | 10 + libraries/kiwi/kiwi-loader/pom.xml | 112 +--- .../apache/marmotta/kiwi/loader/KiWiLoader.java | 593 ------------------- .../kiwi/loader/KiWiLoaderConfiguration.java | 22 - .../kiwi/loader/generic/KiWiBatchHandler.java | 1 - .../kiwi/loader/generic/KiWiHandler.java | 34 +- .../kiwi/loader/generic/Statistics.java | 223 ------- .../kiwi/loader/util/UnitFormatter.java | 44 -- .../marmotta/kiwi/loader/KiWiLoaderTest.java | 246 -------- .../marmotta/kiwi/caching/KiWiCacheManager.java | 74 ++- .../marmotta/kiwi/config/KiWiConfiguration.java | 65 +- .../marmotta/kiwi/persistence/KiWiDialect.java | 2 +- .../src/main/resources/jgroups-kiwi.xml | 4 +- .../apache/marmotta/kiwi/test/ClusterTest.java | 158 +++++ loader/marmotta-loader-berkeley/pom.xml | 85 +++ .../berkeley/BerkeleyDBLoaderBackend.java | 80 +++ ...org.apache.marmotta.loader.api.LoaderBackend | 1 + .../src/main/resources/logback.xml | 27 + loader/marmotta-loader-core/pom.xml | 160 +++++ .../marmotta/loader/api/LoaderBackend.java | 42 ++ .../marmotta/loader/api/LoaderHandler.java | 28 + .../marmotta/loader/api/LoaderOptions.java | 64 ++ .../marmotta/loader/context/ContextHandler.java | 37 ++ .../marmotta/loader/core/MarmottaLoader.java | 542 +++++++++++++++++ .../functions/BackendIdentifierFunction.java | 16 + .../loader/sesame/SesameLoaderHandler.java | 39 ++ .../marmotta/loader/statistics/Statistics.java | 215 +++++++ .../loader/statistics/StatisticsHandler.java | 69 +++ .../marmotta/loader/util/DirectoryFilter.java | 25 + .../marmotta/loader/util/UnitFormatter.java | 44 ++ .../loader/wrapper/LoaderHandlerWrapper.java | 123 ++++ .../marmotta/loader/core/test/CLITest.java | 151 +++++ .../marmotta/loader/core/test/LoadTest.java | 150 +++++ .../core/test/dummy/DummyLoaderBackend.java | 51 ++ .../core/test/dummy/DummyLoaderHandler.java | 51 ++ ...org.apache.marmotta.loader.api.LoaderBackend | 1 + .../src/test/resources/demo-data.rdf | 78 +++ .../src/test/resources/demo-data.rdf.bz2 | Bin 0 -> 1469 bytes .../src/test/resources/demo-data.rdf.gz | Bin 0 -> 1314 bytes loader/marmotta-loader-hbase/pom.xml | 116 ++++ .../src/main/assembly/launcher.xml | 20 + .../loader/hbase/HBaseLoaderBackend.java | 105 ++++ ...org.apache.marmotta.loader.api.LoaderBackend | 1 + .../src/main/resources/logback.xml | 32 + loader/marmotta-loader-kiwi/pom.xml | 140 +++++ .../marmotta/loader/kiwi/KiWiLoaderBackend.java | 89 +++ .../marmotta/loader/kiwi/KiWiLoaderHandler.java | 190 ++++++ ...org.apache.marmotta.loader.api.LoaderBackend | 1 + loader/marmotta-loader-titan/pom.xml | 79 +++ .../loader/titan/TitanLoaderHandler.java | 111 ++++ .../marmotta/loader/titan/TitanRDFHandler.java | 274 +++++++++ loader/pom.xml | 85 +++ parent/pom.xml | 65 +- .../backend/kiwi/KiWiStoreProvider.java | 5 + .../core/services/cache/CachingServiceImpl.java | 52 +- .../src/main/resources/jgroups-marmotta.xml | 4 +- pom.xml | 5 +- 65 files changed, 3817 insertions(+), 1327 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/95122430/parent/pom.xml ----------------------------------------------------------------------
