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/05/07 12:39:36 UTC
[3/5] 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/936e19ca
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/936e19ca
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/936e19ca
Branch: refs/heads/master
Commit: 936e19ca49dd68457e3f79a9ae44c62175e6d750
Parents: 4a07d59 f02d9a0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue May 6 11:00:38 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue May 6 11:00:38 2014 +0200
----------------------------------------------------------------------
ext/client-proxy/pom.xml | 76 ++++
.../olingo/ext/proxy/api/AbstractContainer.java | 32 ++
.../ext/proxy/api/AbstractEntityCollection.java | 25 ++
.../olingo/ext/proxy/api/AbstractEntityKey.java | 54 +++
.../olingo/ext/proxy/api/AbstractEntitySet.java | 108 +++++
.../olingo/ext/proxy/api/AbstractOpenType.java | 31 ++
.../olingo/ext/proxy/api/NoResultException.java | 35 ++
.../ext/proxy/api/NonUniqueResultException.java | 35 ++
.../olingo/ext/proxy/api/OperationType.java | 40 ++
.../org/apache/olingo/ext/proxy/api/Query.java | 128 ++++++
.../org/apache/olingo/ext/proxy/api/Sort.java | 65 +++
.../ext/proxy/api/annotations/ComplexType.java | 42 ++
.../ext/proxy/api/annotations/CompoundKey.java | 32 ++
.../api/annotations/CompoundKeyElement.java | 38 ++
.../proxy/api/annotations/EntityContainer.java | 36 ++
.../ext/proxy/api/annotations/EntitySet.java | 38 ++
.../ext/proxy/api/annotations/EntityType.java | 44 ++
.../ext/proxy/api/annotations/EnumType.java | 39 ++
.../olingo/ext/proxy/api/annotations/Key.java | 34 ++
.../ext/proxy/api/annotations/KeyClass.java | 39 ++
.../ext/proxy/api/annotations/KeyRef.java | 34 ++
.../ext/proxy/api/annotations/Namespace.java | 36 ++
.../api/annotations/NavigationProperty.java | 42 ++
.../ext/proxy/api/annotations/Operation.java | 62 +++
.../ext/proxy/api/annotations/Parameter.java | 50 +++
.../ext/proxy/api/annotations/Property.java | 76 ++++
.../api/annotations/ReferentialConstraint.java | 42 ++
.../ext/proxy/api/annotations/RowType.java | 32 ++
.../ext/proxy/api/annotations/Singleton.java | 35 ++
ext/pojogen-maven-plugin/pom.xml | 129 ++++++
.../src/it/actionOverloadingService/pom.xml | 92 +++++
.../it/actionOverloadingService/verify.groovy | 20 +
.../src/it/defaultService/pom.xml | 92 +++++
.../src/it/defaultService/verify.groovy | 20 +
.../src/it/keyAsSegmentService/pom.xml | 92 +++++
.../src/it/keyAsSegmentService/verify.groovy | 20 +
.../src/it/northwind/pom.xml | 92 +++++
.../src/it/northwind/verify.groovy | 20 +
.../src/it/odataWriterDefaultService/pom.xml | 92 +++++
.../it/odataWriterDefaultService/verify.groovy | 20 +
.../src/it/openTypeService/pom.xml | 92 +++++
.../src/it/openTypeService/verify.groovy | 20 +
.../src/it/primitiveKeysService/pom.xml | 92 +++++
.../src/it/primitiveKeysService/verify.groovy | 20 +
.../src/it/staticServiceV3/pom.xml | 92 +++++
.../src/it/staticServiceV3/verify.groovy | 20 +
.../src/it/staticServiceV4/pom.xml | 92 +++++
.../src/it/staticServiceV4/verify.groovy | 20 +
.../ext/pojogen/AbstractMetadataMojo.java | 161 ++++++++
.../olingo/ext/pojogen/AbstractUtility.java | 411 +++++++++++++++++++
.../ext/pojogen/NavPropertyBindingDetails.java | 141 +++++++
.../ext/pojogen/NavPropertyContainsTarget.java | 34 ++
.../olingo/ext/pojogen/V3MetadataMojo.java | 184 +++++++++
.../apache/olingo/ext/pojogen/V3Utility.java | 29 ++
.../olingo/ext/pojogen/V4MetadataMojo.java | 192 +++++++++
.../apache/olingo/ext/pojogen/V4Utility.java | 29 ++
.../src/main/resources/complexType.vm | 48 +++
.../src/main/resources/container.vm | 107 +++++
.../src/main/resources/entityCollection.vm | 96 +++++
.../src/main/resources/entitySet.vm | 65 +++
.../src/main/resources/entityType.vm | 169 ++++++++
.../src/main/resources/entityTypeKey.vm | 69 ++++
.../src/main/resources/enumType.vm | 56 +++
.../src/main/resources/package-info.vm | 20 +
.../src/main/resources/services.vm | 21 +
.../src/main/resources/singleton.vm | 48 +++
.../src/main/resources/v30/complexType.vm | 30 ++
.../src/main/resources/v30/container.vm | 19 +
.../src/main/resources/v30/entitySet.vm | 19 +
.../src/main/resources/v40/complexType.vm | 60 +++
.../src/main/resources/v40/container.vm | 22 +
.../src/main/resources/v40/entitySet.vm | 19 +
.../src/main/resources/v40/singleton.vm | 36 ++
ext/pom.xml | 2 +
fit/pom.xml | 29 ++
fit/src/it/staticServiceV3/pom.xml | 93 +++++
fit/src/it/staticServiceV3/verify.groovy | 20 +
fit/src/it/staticServiceV4/pom.xml | 93 +++++
fit/src/it/staticServiceV4/verify.groovy | 20 +
fit/src/main/resources/V40/metadata.xml | 1 +
.../fit/v3/ActionOverloadingTestITCase.java | 104 +++--
.../client/core/edm/EdmBindingTargetImpl.java | 40 --
.../client/core/edm/EdmEntityContainerImpl.java | 28 +-
.../client/core/edm/EdmOperationImpl.java | 8 +-
.../olingo/client/core/edm/EdmSchemaImpl.java | 3 +-
.../olingo/client/core/v3/MetadataTest.java | 4 +
.../olingo/client/core/v4/MetadataTest.java | 8 +-
.../commons/api/edm/EdmEntityContainer.java | 1 -
.../olingo/commons/core/edm/AbstractEdm.java | 41 +-
.../core/edm/AbstractEdmBindingTarget.java | 39 ++
.../core/edm/AbstractEdmEntityContainer.java | 17 +-
.../core/edm/AbstractEdmNavigationProperty.java | 1 +
.../olingo/commons/core/edm/EdmTypeInfo.java | 3 -
.../commons/core/edm/EdmImplCachingTest.java | 13 +-
.../core/edm/provider/EdmBindingTargetImpl.java | 39 --
pom.xml | 30 +-
96 files changed, 5058 insertions(+), 181 deletions(-)
----------------------------------------------------------------------