[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8fc77829 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8fc77829 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8fc77829 Branch: refs/heads/OLINGO-632_OSGi-Support Commit: 8fc77829b024259fd5ca094bc361d70764dbe7f2 Parents: 41edf2d 7ad5b0f Author: Michael Bolz <[email protected]> Authored: Fri May 29 10:56:26 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Fri May 29 10:56:26 2015 +0200 ---------------------------------------------------------------------- .../fit/tecsvc/client/ConditionalITCase.java | 156 +++++- .../olingo/fit/tecsvc/client/MediaITCase.java | 6 +- .../tecsvc/client/PrimitiveComplexITCase.java | 121 +++- .../olingo/server/api/CustomETagSupport.java | 50 ++ .../olingo/server/api/EtagInformation.java | 4 +- .../olingo/server/api/ODataHttpHandler.java | 6 + .../olingo/server/core/ODataDispatcher.java | 560 +++++++++++++++++++ .../server/core/ODataExceptionHelper.java | 16 +- .../apache/olingo/server/core/ODataHandler.java | 527 +---------------- .../server/core/ODataHttpHandlerImpl.java | 6 + .../core/PreconditionRequiredException.java | 50 ++ .../server/core/PreconditionsValidator.java | 138 +++++ .../server-core-exceptions-i18n.properties | 4 +- .../olingo/server/tecsvc/ETagSupport.java | 34 ++ .../olingo/server/tecsvc/TechnicalServlet.java | 7 +- .../olingo/server/tecsvc/data/DataProvider.java | 10 +- .../processor/TechnicalEntityProcessor.java | 97 ++-- .../TechnicalPrimitiveComplexProcessor.java | 294 ++++++---- .../tecsvc/processor/TechnicalProcessor.java | 47 +- .../server/core/PreconditionsValidatorTest.java | 149 +++++ 20 files changed, 1582 insertions(+), 700 deletions(-) ----------------------------------------------------------------------
