You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/04/03 10:59:21 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a6817f32
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a6817f32
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a6817f32
Branch: refs/heads/master
Commit: a6817f32f84b3b125ab08088ca859d1518fa340d
Parents: 8888b05 aeb66aa
Author: fmartelli <fa...@gmail.com>
Authored: Thu Apr 3 10:58:54 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Apr 3 10:58:54 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/AbstractServices.java | 14 +---
.../java/org/apache/olingo/fit/V3Services.java | 31 +++++++++
fit/src/main/resources/v3/openTypeMetadata.xml | 67 ++++++++++++++++++++
.../client/core/edm/EdmEntityContainerImpl.java | 13 ++--
.../client/core/edm/EdmEntityTypeImpl.java | 8 +++
.../olingo/client/core/edm/EdmSchemaImpl.java | 47 +++++++++++++-
.../apache/olingo/client/core/uri/URIUtils.java | 7 +-
.../client/core/it/v3/AbstractTestITCase.java | 6 +-
.../client/core/it/v3/OpenTypeTestITCase.java | 17 ++---
.../commons/api/edm/EdmEntityContainer.java | 23 +++++--
.../olingo/commons/api/edm/EdmEntityType.java | 11 +++-
.../olingo/commons/api/edm/EdmSchema.java | 36 ++++++++---
.../core/edm/AbstractEdmEntityContainer.java | 16 ++++-
.../commons/core/edm/AbstractEdmEntityType.java | 7 +-
.../commons/core/edm/AbstractEdmSchemaImpl.java | 26 ++++++++
.../core/edm/provider/EdmEntityTypeImpl.java | 11 +++-
16 files changed, 284 insertions(+), 56 deletions(-)
----------------------------------------------------------------------