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/46e3b4f9 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/46e3b4f9 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/46e3b4f9 Branch: refs/heads/develop Commit: 46e3b4f9f96769fd1c8e09704cad1a0ed750e070 Parents: 3696d9d 5261eaa Author: Sebastian Schaffert <[email protected]> Authored: Fri Sep 19 09:58:46 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Sep 19 09:58:46 2014 +0200 ---------------------------------------------------------------------- .../commons/http/MarmottaHttpUtils.java | 14 +- .../apache/marmotta/commons/vocabulary/LDP.java | 18 + launchers/marmotta-installer/pom.xml | 2 +- parent/pom.xml | 6 +- .../core/filters/ModuleResourceFilter.java | 10 +- .../core/services/io/MarmottaIOServiceImpl.java | 8 +- .../core/servlet/MarmottaOptionsFilter.java | 12 +- .../core/servlet/MarmottaResourceFilter.java | 25 +- platform/marmotta-ldp/pom.xml | 24 + .../marmotta/platform/ldp/api/LdpService.java | 127 +++- .../marmotta/platform/ldp/api/Preference.java | 219 +++++++ .../platform/ldp/services/LdpServiceImpl.java | 177 +++-- .../platform/ldp/util/EntityTagUtils.java | 72 --- .../marmotta/platform/ldp/util/LdpUtils.java | 69 +- .../platform/ldp/util/ResponseBuilderImpl.java | 345 ++++++++++ .../platform/ldp/webservices/LdpWebService.java | 639 ++++++++++++------- .../platform/ldp/webservices/PreferHeader.java | 347 ++++++++++ .../marmotta/platform/ldp/LdpSuiteTest.java | 172 +++++ .../ldp/webservices/LdpWebServiceTest.java | 380 +++++++---- .../ldp/webservices/util/HeaderMatchers.java | 8 +- .../filters/MarmottaAuthenticationFilter.java | 10 +- 21 files changed, 2187 insertions(+), 497 deletions(-) ----------------------------------------------------------------------
