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 2014/04/11 09:07:41 UTC
[7/7] git commit: Merge branch 'master' into OLINGO-231_PocForAndroid
Merge branch 'master' into OLINGO-231_PocForAndroid
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/20205cab
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/20205cab
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/20205cab
Branch: refs/heads/OLINGO-231_PocForAndroid
Commit: 20205caba654578c5eae94b14bb44cb2bdb449cd
Parents: 2d262c3 df76930
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Apr 11 08:54:04 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Apr 11 08:54:04 2014 +0200
----------------------------------------------------------------------
.../processor/api/ODataJPAServiceFactory.java | 17 ++
.../jpa/processor/api/OnJPAWriteContent.java | 54 +++++
.../api/exception/ODataJPARuntimeException.java | 5 +
.../processor/core/access/data/JPAEntity.java | 66 ++++--
.../core/access/data/JPAEntityParser.java | 105 +++++++++
.../core/access/model/JPATypeConvertor.java | 41 ++--
.../main/resources/jpaprocessor_msg.properties | 2 +
.../JPAEntityParserTestForStaticMethods.java | 79 +++++++
.../core/access/data/JPAEntityTest.java | 71 +++++-
.../processor/core/mock/ODataContextMock.java | 14 ++
.../core/mock/ODataJPAContextMock.java | 1 +
.../core/mock/ODataJPAServiceFactoryMock.java | 47 ++++
.../core/mock/OnJPAWriteContentMock.java | 58 +++++
.../processor/core/mock/data/EdmMockUtilV2.java | 57 ++++-
.../processor/core/mock/data/JPATypeMock.java | 63 +++++
.../core/mock/data/ODataEntryMockUtil.java | 16 +-
odata2-jpa-processor/jpa-ref/pom.xml | 36 ++-
.../ref/converter/BlobToByteConverter.java | 64 +++++
.../jpa/processor/ref/model/Material.java | 21 ++
.../odata2/jpa/processor/ref/model/Note.java | 13 +-
.../odata2/jpa/processor/ref/model/NoteKey.java | 83 +++++++
.../src/main/resources/META-INF/persistence.xml | 4 +
odata2-jpa-processor/jpa-web/pom.xml | 236 ++++++++++---------
.../ref/extension/OnDBWriteContent.java | 55 +++++
.../ref/web/JPAReferenceServiceFactory.java | 4 +
.../main/resources/SQL_Insert_Note.properties | 2 +-
.../odata2/api/edm/EdmEntityContainer.java | 22 ++
.../odata2/core/debug/DebugInfoServer.java | 6 +-
.../core/debug/ODataDebugResponseWrapper.java | 31 +--
.../provider/EdmEntityContainerImplProv.java | 111 +++++++--
.../debug/ODataDebugResponseWrapperTest.java | 30 +--
.../EdmEntityContainerImplProvTest.java | 105 +++++++--
32 files changed, 1275 insertions(+), 244 deletions(-)
----------------------------------------------------------------------