Merge branch 'MARMOTTA-605' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/261bd81e Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/261bd81e Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/261bd81e Branch: refs/heads/MARMOTTA-556 Commit: 261bd81e2e471277bdd2d490eeea0000d9d5f6bc Parents: 31360d4 acb0e5b Author: Raffaele Palmieri <[email protected]> Authored: Tue Apr 7 20:36:05 2015 +0200 Committer: Raffaele Palmieri <[email protected]> Committed: Tue Apr 7 20:36:05 2015 +0200 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 69 ++++++++++ parent/pom.xml | 1 + .../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 + 12 files changed, 657 insertions(+) ----------------------------------------------------------------------
