Merge branch 'develop' into MARMOTTA-588
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/78ca9bfc Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/78ca9bfc Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/78ca9bfc Branch: refs/heads/MARMOTTA-588 Commit: 78ca9bfcfdb6c0366b4aab46567cb7867f739ad1 Parents: 77a5d12 d0810b4 Author: Sergio Fernández <[email protected]> Authored: Wed Jul 1 12:27:11 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed Jul 1 12:27:11 2015 +0200 ---------------------------------------------------------------------- client/marmotta-client-java/pom.xml | 9 +- launchers/marmotta-webapp/pom.xml | 81 ++++++++++- .../src/main/webapp/WEB-INF/web.xml | 4 + .../kiwi/sparql/builder/SQLBuilder.java | 7 +- .../test/youtube/TestYoutubeProvider.java | 2 + .../model/selectors/FunctionSelector.java | 26 ++-- .../ldpath/model/selectors/GroupedSelector.java | 7 + .../model/selectors/IntersectionSelector.java | 27 +++- .../ldpath/model/selectors/PathSelector.java | 29 ++-- .../model/selectors/PropertySelector.java | 17 ++- .../model/selectors/RecursivePathSelector.java | 26 +++- .../selectors/ReversePropertySelector.java | 7 + .../model/selectors/StringConstantSelector.java | 18 ++- .../ldpath/model/selectors/TestingSelector.java | 29 +++- .../ldpath/model/selectors/UnionSelector.java | 28 ++-- .../marmotta/ldpath/model/tests/AndTest.java | 20 ++- .../ldpath/model/tests/FunctionTest.java | 24 +++- .../marmotta/ldpath/model/tests/IsATest.java | 2 +- .../ldpath/model/tests/LiteralLanguageTest.java | 14 +- .../ldpath/model/tests/LiteralTypeTest.java | 18 ++- .../marmotta/ldpath/model/tests/NotTest.java | 8 ++ .../marmotta/ldpath/model/tests/OrTest.java | 20 ++- .../ldpath/model/tests/PathEqualityTest.java | 16 +++ .../marmotta/ldpath/model/tests/PathTest.java | 14 +- .../ldpath/parser/DefaultConfiguration.java | 4 +- parent/pom.xml | 5 +- .../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 | 14 +- .../src/main/resources/web/admin/squebi.html | 10 +- 38 files changed, 983 insertions(+), 90 deletions(-) ----------------------------------------------------------------------
