Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8b6ebc1a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8b6ebc1a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8b6ebc1a Branch: refs/heads/ldp Commit: 8b6ebc1aca99a40792134654718ef6e0371eca74 Parents: dfde1a8 b5cfb0a Author: Sebastian Schaffert <[email protected]> Authored: Thu May 15 15:17:07 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu May 15 15:17:07 2014 +0200 ---------------------------------------------------------------------- .../marmotta/commons/util/StringUtils.java | 40 ++++ launchers/marmotta-installer/pom.xml | 4 +- launchers/marmotta-webapp/pom.xml | 1 - .../test/provider/ProviderTestBase.java | 2 +- .../ldclient/ldclient-provider-freebase/pom.xml | 4 + .../provider/freebase/FreebaseProvider.java | 20 +- .../services/logging/LoggingServiceImpl.java | 11 +- .../core/test/base/AbstractMarmotta.java | 15 +- .../core/test/base/EmbeddedMarmotta.java | 9 +- .../platform/core/test/base/JettyMarmotta.java | 6 +- platform/marmotta-ldp/pom.xml | 19 -- .../platform/ldp/services/LdpServiceImpl.java | 1 + .../platform/ldp/testsuite/LdpManifestTest.java | 73 -------- .../platform/ldp/testsuite/LdpTestCase.java | 185 ------------------- .../ldp/testsuite/LdpTestCaseRunner.java | 61 ------ .../platform/ldp/testsuite/LdpTestCases.java | 80 -------- .../ldp/testsuite/LdpTestCasesRunner.java | 100 ---------- .../ldp/testsuite/LdpTestCasesUtils.java | 130 ------------- .../src/main/resources/kiwi-module.properties | 8 +- 19 files changed, 75 insertions(+), 694 deletions(-) ----------------------------------------------------------------------
