You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by tb...@apache.org on 2013/12/10 14:50:23 UTC
[28/50] [abbrv] git commit: Merge remote-tracking branch
'origin/master' into PocEdmAnnotationsExtension
Merge remote-tracking branch 'origin/master' into PocEdmAnnotationsExtension
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/d108298d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/d108298d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/d108298d
Branch: refs/heads/ODataServlet
Commit: d108298dbabd35af36dc712f9a7ea28a219c7df6
Parents: e19384d d51297f
Author: Michael Bolz <mi...@apache.org>
Authored: Wed Dec 4 06:26:33 2013 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed Dec 4 06:26:33 2013 +0100
----------------------------------------------------------------------
.../odata2/core/edm/provider/EdmxProvider.java | 2 -
.../consumer/AtomServiceDocumentConsumer.java | 33 +-
.../core/ep/consumer/XmlEntryConsumer.java | 6 +-
.../core/ep/consumer/XmlFeedConsumer.java | 5 +-
.../core/ep/consumer/XmlLinkConsumer.java | 12 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 9 +-
.../ep/consumer/AbstractXmlConsumerTest.java | 45 +
.../AtomServiceDocumentConsumerTest.java | 10 +-
.../consumer/ServiceDocumentConsumerTest.java | 3 +-
.../core/ep/consumer/XmlEntityConsumerTest.java | 15 +-
.../core/ep/consumer/XmlFeedConsumerTest.java | 22 +-
.../core/ep/consumer/XmlLinkConsumerTest.java | 25 +-
.../ep/consumer/XmlMetadataConsumerTest.java | 27 +-
.../ep/consumer/XmlPropertyConsumerTest.java | 6 +-
.../src/test/resources/LargeEmployeeFeed.xml | 12538 +++++++++++++++++
.../core/jpa/access/data/JPAEntity.java | 85 +-
.../core/jpa/access/data/JPAEntityParser.java | 6 +-
.../core/jpa/access/data/JPAExpandCallBack.java | 3 +-
.../jpa/access/model/JPAEdmNameBuilder.java | 5 +-
.../core/jpa/mock/data/EdmMockUtilV2.java | 4 +-
.../core/jpa/mock/data/JPATypeMock.java | 3 +-
.../processor/ref/model/SalesOrderHeader.java | 8 +-
22 files changed, 12744 insertions(+), 128 deletions(-)
----------------------------------------------------------------------