You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/09/17 09:25:33 UTC
[08/10] olingo-odata4 git commit: [OLINGO-659] Merge branch
'OLINGO-659_ReleaseFixes'
[OLINGO-659] Merge branch 'OLINGO-659_ReleaseFixes'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/91bd50bc
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/91bd50bc
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/91bd50bc
Branch: refs/heads/master
Commit: 91bd50bc258e2d5ae995555449de7458138cedd9
Parents: 0ed241e 805028d
Author: Michael Bolz <mi...@sap.com>
Authored: Thu Sep 17 08:56:06 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Sep 17 08:56:06 2015 +0200
----------------------------------------------------------------------
.../olingo/commons/api/data/DeletedEntity.java | 8 +-
.../olingo/commons/api/data/Operation.java | 2 +-
.../olingo/commons/api/data/package-info.java | 2 +-
.../commons/api/edm/constants/package-info.java | 3 +-
.../commons/api/edm/geo/ComposedGeospatial.java | 3 -
.../olingo/commons/api/ex/package-info.java | 2 +-
.../olingo/commons/api/format/AcceptType.java | 11 +--
.../olingo/commons/api/format/TypeUtil.java | 20 +++--
.../olingo/commons/api/format/package-info.java | 6 +-
.../olingo/commons/api/http/package-info.java | 2 +-
.../commons/api/format/AcceptTypeTest.java | 93 ++++++++++++--------
.../commons/api/format/ContentTypeTest.java | 80 ++++++++---------
.../apache/olingo/server/api/HttpHeaders.java | 6 +-
.../apache/olingo/server/api/ODataRequest.java | 2 +-
.../apache/olingo/server/api/package-info.java | 25 +++---
.../server/api/processor/package-info.java | 24 ++---
.../olingo/server/core/ContentNegotiator.java | 24 +++--
.../server/core/ContentNegotiatorException.java | 4 +-
.../olingo/server/core/ODataDispatcher.java | 41 +++++----
.../server/core/ODataExceptionHelper.java | 3 +-
.../server/core/ODataHandlerException.java | 2 +
.../server-core-exceptions-i18n.properties | 4 +-
.../server/core/ContentNegotiatorTest.java | 15 ++--
.../olingo/server/core/ODataHandlerTest.java | 9 ++
pom.xml | 2 +-
25 files changed, 204 insertions(+), 189 deletions(-)
----------------------------------------------------------------------