You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/01/23 17:32:16 UTC
[14/14] git commit: [OLINGO-117] merge from origin/master
[OLINGO-117] merge from origin/master
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/674f0fa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/674f0fa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/674f0fa7
Branch: refs/heads/olingo-117
Commit: 674f0fa7483dacbeaa6be90b391deb2653c3db9c
Parents: 38d06b2 416537b
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Jan 23 17:31:40 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Jan 23 17:31:40 2014 +0100
----------------------------------------------------------------------
.../processor/api/AnnotationServiceFactory.java | 2 +-
.../core/datasource/AnnotationInMemoryDs.java | 9 +-
.../datasource/AnnotationsInMemoryDsTest.java | 65 ++
.../core/datasource/BeanPropertyAccessTest.java | 102 ++--
.../processor/core/util/ClassHelperTest.java | 12 +
odata2-dist/janos/pom.xml | 103 ++++
.../janos/src/main/assembly/janos-assembly.xml | 48 ++
odata2-dist/janos/src/main/resources/LICENSE | 587 +++++++++++++++++++
odata2-dist/janos/src/main/resources/NOTICE | 5 +
.../lib/src/main/assembly/lib-assembly.xml | 4 +-
odata2-dist/pom.xml | 1 +
odata2-dist/ref/pom.xml | 15 +
.../ref/src/main/assembly/ref-assembly.xml | 9 +-
.../processor/api/ODataJPAResponseBuilder.java | 6 +-
.../jpa/processor/api/access/JPAProcessor.java | 8 +-
.../core/ODataJPAProcessorDefault.java | 4 +-
.../core/ODataJPAResponseBuilderDefault.java | 70 +--
.../processor/core/access/data/JPAEntity.java | 163 ++---
.../core/access/data/JPAEntityParser.java | 389 ++++++------
.../core/access/data/JPAExpandCallBack.java | 47 +-
.../jpa/processor/core/access/data/JPALink.java | 70 ++-
.../core/access/data/JPAProcessorImpl.java | 19 +-
.../core/access/data/JPAEntityParserTest.java | 50 +-
.../JPAEntityParserTestForStaticMethods.java | 18 +-
.../core/access/data/JPAEntityTest.java | 3 +-
.../processor/core/mock/data/EdmMockUtil.java | 16 +-
.../processor/core/mock/data/EdmMockUtilV2.java | 3 +-
.../core/mock/data/ODataEntryMockUtil.java | 34 +-
.../processor/ref/model/SalesOrderHeader.java | 16 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 13 +-
pom.xml | 52 +-
31 files changed, 1404 insertions(+), 539 deletions(-)
----------------------------------------------------------------------