Merge the recent changes in 'develop' to 'ldp'
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b8d367a9 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b8d367a9 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b8d367a9 Branch: refs/heads/develop Commit: b8d367a96c6dd2da584c5b296540bf547b5003fd Parents: 673ddc3 dd004d3 Author: Jakob Frank <[email protected]> Authored: Wed Mar 12 16:47:46 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Wed Mar 12 16:47:46 2014 +0100 ---------------------------------------------------------------------- .gitignore | 2 + launchers/marmotta-installer/pom.xml | 2 +- launchers/marmotta-webapp/pom.xml | 35 +- .../marmotta-webapp/src/deb/control/control | 12 +- .../marmotta-webapp/src/deb/control/postinst | 2 +- .../marmotta-webapp/src/deb/control/postrm | 4 +- .../marmotta-webapp/src/deb/control/preinst | 2 +- launchers/marmotta-webapp/src/deb/control/prerm | 4 +- launchers/marmotta-webapp/src/deb/pkg/README | 1 + launchers/marmotta-webapp/src/deb/pkg/changelog | 5 + launchers/marmotta-webapp/src/deb/pkg/copyright | 8 + .../marmotta/kiwi/caching/KiWiCacheManager.java | 59 +- .../apache/marmotta/kiwi/config/CacheMode.java | 45 + .../marmotta/kiwi/config/KiWiConfiguration.java | 46 + libraries/kiwi/pom.xml | 12 +- libraries/ldcache/ldcache-api/pom.xml | 16 + libraries/ldcache/pom.xml | 10 + libraries/ldclient/ldclient-api/pom.xml | 18 + libraries/ldclient/pom.xml | 10 + libraries/ldpath/ldpath-api/pom.xml | 36 +- libraries/ldpath/ldpath-backend-file/pom.xml | 24 +- libraries/ldpath/ldpath-backend-jena/pom.xml | 25 +- .../ldpath/ldpath-backend-linkeddata/pom.xml | 22 +- libraries/ldpath/ldpath-backend-sesame/pom.xml | 24 +- .../backend/sesame/AbstractSesameBackend.java | 144 +-- .../ContextAwareSesameConnectionBackend.java | 23 +- .../backend/sesame/SesameConnectionBackend.java | 88 +- .../backend/sesame/SesameRepositoryBackend.java | 32 +- .../backend/sesame/SesameValueBackend.java | 420 +++---- libraries/ldpath/ldpath-core-bundle/LICENSE | 202 ++++ libraries/ldpath/ldpath-core-bundle/pom.xml | 124 ++ libraries/ldpath/ldpath-core/pom.xml | 42 - .../ldpath/parser/DefaultConfiguration.java | 37 +- .../at/newmedialab/ldpath/parser/rdfpath.jj | 1102 ----------------- .../org/apache/marmotta/ldpath/parser/ldpath.jj | 1106 ++++++++++++++++++ .../ldpath/ldpath-functions-collections/pom.xml | 40 +- libraries/ldpath/ldpath-functions-date/pom.xml | 40 +- libraries/ldpath/ldpath-functions-html/pom.xml | 45 +- libraries/ldpath/ldpath-functions-math/pom.xml | 40 +- libraries/ldpath/ldpath-functions-text/pom.xml | 40 +- libraries/ldpath/ldpath-functions-xml/pom.xml | 45 +- libraries/ldpath/ldpath-template/pom.xml | 54 +- libraries/ldpath/pom.xml | 12 + .../marmotta/loader/statistics/Statistics.java | 74 +- .../loader/core/test/LoaderTestBase.java | 7 +- .../core/test/dummy/DummyLoaderBackend.java | 4 +- .../core/test/dummy/DummyLoaderHandler.java | 17 +- parent/pom.xml | 23 +- platform/backends/marmotta-backend-http/pom.xml | 2 +- .../core/services/cache/CachingServiceImpl.java | 65 +- .../servlet/MarmottaPreStartupListener.java | 10 +- .../core/startup/MarmottaStartupService.java | 116 +- .../main/resources/config-defaults.properties | 3 + .../resources/config-descriptions.properties | 17 +- platform/marmotta-zookeeper/pom.xml | 2 +- 55 files changed, 2437 insertions(+), 1963 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/b8d367a9/launchers/marmotta-webapp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/b8d367a9/parent/pom.xml ----------------------------------------------------------------------
