Merge branch 'develop' of https://github.com/apache/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5a18f249 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5a18f249 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5a18f249 Branch: refs/heads/develop Commit: 5a18f24956d12f8970d3797649b0f6ebb46ff94f Parents: 7349143 228f79a Author: Kai Schlegel <[email protected]> Authored: Thu May 7 09:18:17 2015 +0200 Committer: Kai Schlegel <[email protected]> Committed: Thu May 7 09:18:17 2015 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 2 +- client/marmotta-client-java/pom.xml | 9 +- launchers/marmotta-webapp/pom.xml | 83 +++++++++++- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../kiwi/sparql/builder/SQLBuilder.java | 7 +- .../ldpath/parser/DefaultConfiguration.java | 4 +- parent/pom.xml | 3 +- .../marmotta-backend-accumulograph/pom.xml | 63 +++++++++ .../AccumuloGraphLoggingModule.java | 79 +++++++++++ .../accumulograph/AccumuloGraphProvider.java | 128 ++++++++++++++++++ .../src/main/resources/META-INF/beans.xml | 28 ++++ .../main/resources/config-defaults.properties | 28 ++++ .../resources/config-descriptions.properties | 133 +++++++++++++++++++ .../src/main/resources/kiwi-module.properties | 37 ++++++ .../src/main/resources/web/admin/about.html | 36 +++++ .../main/resources/web/admin/configuration.html | 54 ++++++++ platform/backends/pom.xml | 1 + .../platform/ldp/webservices/LdpWebService.java | 5 +- pom.xml | 5 + 19 files changed, 695 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
