You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/04/01 16:18:39 UTC

[12/51] [abbrv] git commit: Merge branch 'olingo200' of https://git-wip-us.apache.org/repos/asf/olingo-odata4 into olingo200

Merge branch 'olingo200' of https://git-wip-us.apache.org/repos/asf/olingo-odata4 into olingo200


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cde94fc0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cde94fc0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cde94fc0

Branch: refs/heads/master
Commit: cde94fc09b9972d7be053aed28d8fb8b9f776ec0
Parents: fc2881f 2614218
Author: fmartelli <fa...@gmail.com>
Authored: Thu Mar 27 15:35:14 2014 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Mar 27 15:35:14 2014 +0100

----------------------------------------------------------------------
 .../org/apache/olingo/fit/AbstractServices.java |  12 +-
 .../java/org/apache/olingo/fit/V4NorthWind.java |  46 +++
 .../org/apache/olingo/fit/V4NorthWindExt.java   |  46 +++
 .../main/resources/v4/northwind-metadata.xml    |  91 +++++
 .../main/resources/v4/northwindExt-metadata.xml | 408 +++++++++++++++++++
 .../main/webapp/WEB-INF/applicationContext.xml  |   4 +-
 .../retrieve/CommonRetrieveRequestFactory.java  |  62 +--
 .../request/retrieve/EdmMetadataRequest.java    |  28 ++
 .../request/retrieve/ODataMetadataRequest.java  |  28 --
 .../request/retrieve/XMLMetadataRequest.java    |  29 ++
 .../olingo/client/api/op/CommonODataReader.java |  13 +-
 .../communication/request/ODataRequestImpl.java |   2 +-
 .../retrieve/AbstractMetadataRequestImpl.java   |  52 +++
 .../retrieve/AbstractODataRetrieveRequest.java  |   4 +
 .../AbstractRetrieveRequestFactory.java         |   7 +-
 .../retrieve/EdmMetadataRequestImpl.java        |  73 ++++
 .../retrieve/ODataMetadataRequestImpl.java      | 108 -----
 .../retrieve/v3/RetrieveRequestFactoryImpl.java |   8 +-
 .../retrieve/v3/XMLMetadataRequestImpl.java     |  79 ++++
 .../retrieve/v4/RetrieveRequestFactoryImpl.java |   7 +
 .../retrieve/v4/XMLMetadataRequestImpl.java     | 122 ++++++
 .../edm/AbstractEdmServiceMetadataImpl.java     |  24 +-
 .../olingo/client/core/edm/EdmClientImpl.java   |  46 ++-
 .../client/core/edm/EdmEntityContainerImpl.java |  48 +--
 .../olingo/client/core/edm/EdmSchemaImpl.java   |   9 +-
 .../client/core/edm/v3/EdmEntitySetProxy.java   |  11 +-
 .../core/edm/v3/EdmServiceMetadataImpl.java     |   9 +-
 .../core/edm/v4/EdmServiceMetadataImpl.java     |  24 +-
 .../client/core/edm/xml/v4/XMLMetadataImpl.java |   1 +
 .../client/core/op/AbstractODataReader.java     |  19 +
 .../core/op/impl/v3/ODataDeserializerImpl.java  |   3 +-
 .../client/core/op/impl/v3/ODataReaderImpl.java |  15 -
 .../client/core/op/impl/v4/ODataReaderImpl.java |  16 -
 .../core/it/AbstractMetadataTestITCase.java     |   4 +
 .../client/core/it/v4/MetadataTestITCase.java   |  22 +-
 .../olingo/client/core/v4/MetadataTest.java     |   1 -
 .../olingo/client/core/v4/fromdoc1-metadata.xml |   2 +-
 37 files changed, 1188 insertions(+), 295 deletions(-)
----------------------------------------------------------------------