Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/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/44836449 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/44836449 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/44836449 Branch: refs/heads/develop Commit: 448364494cf48c7a76721ce00cb91591680a5a9d Parents: a789e49 e3c9fe6 Author: Sebastian Schaffert <[email protected]> Authored: Tue Apr 8 16:42:48 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Apr 8 16:42:48 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/webservices/MyWebService.java | 4 +- .../test/java/webservices/MyWebServiceTest.java | 18 +- .../main/resources/archetype-resources/pom.xml | 16 +- .../src/test/resources/verification.xml | 4 +- build/pom.xml | 1 - .../apache/marmotta/commons/vocabulary/LDP.java | 221 ++++++++++++++++++- commons/marmotta-sesame-tools/pom.xml | 2 + .../src/main/resources/installer/standalone.xml | 2 +- launchers/marmotta-webapp/pom.xml | 16 +- .../EHCacheRepositoryConnectionTest.java | 12 + .../HazelcastRepositoryConnectionTest.java | 12 + .../EmbeddedRepositoryConnectionTest.java | 13 ++ .../remote/HotRodRepositoryConnectionTest.java | 13 ++ .../KiWiRepositoryConnectionTest.java | 13 ++ parent/pom.xml | 2 +- .../backend/http/HTTPStoreProvider.java | 2 +- .../core/api/templating/TemplatingService.java | 7 +- .../core/services/prefix/PrefixServiceImpl.java | 30 +-- .../templating/TemplatingServiceImpl.java | 98 ++++---- platform/marmotta-ldp/pom.xml | 2 +- platform/pom.xml | 13 +- 21 files changed, 389 insertions(+), 112 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/44836449/parent/pom.xml ----------------------------------------------------------------------
