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/9b4e0a83 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9b4e0a83 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9b4e0a83 Branch: refs/heads/master Commit: 9b4e0a83e5e6b52d86cf134e67fcfa3aa6ee457d Parents: ed2c3eb 9d170cc Author: tkurz <[email protected]> Authored: Thu Nov 13 17:39:33 2014 +0100 Committer: tkurz <[email protected]> Committed: Thu Nov 13 17:39:33 2014 +0100 ---------------------------------------------------------------------- .../platform/core/test/ld/LinkedDataTest.java | 26 +++--- .../marmotta/platform/ldp/api/LdpService.java | 8 +- .../platform/ldp/services/LdpServiceImpl.java | 35 +++----- .../marmotta/platform/ldp/util/LdpUtils.java | 80 +++++++++++++++-- .../ServerManagedPropertiesInterceptor.java | 95 ++++++++++++++++++++ .../platform/ldp/webservices/LdpWebService.java | 17 ++-- 6 files changed, 206 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
