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/7d18b030 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7d18b030 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7d18b030 Branch: refs/heads/develop Commit: 7d18b0303d2e97ae7afe7273cf24f76df42d1158 Parents: d90e142 66be7f5 Author: Sebastian Schaffert <[email protected]> Authored: Thu Nov 6 18:47:45 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Nov 6 18:47:45 2014 +0100 ---------------------------------------------------------------------- .../marmotta/platform/ldp/api/Preference.java | 36 ++-- .../platform/ldp/services/LdpServiceImpl.java | 1 + .../marmotta/platform/ldp/util/LdpUtils.java | 4 +- .../platform/ldp/webservices/LdpWebService.java | 2 +- .../ldp/webservices/LdpWebServiceTest.java | 184 ++++++++++--------- .../ldpath/webservices/LDPathWebService.java | 27 +++ 6 files changed, 147 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
