[OLINGO-467] Merge branch 'OLINGO-467_EdmFacetsSupport'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/af02ec0e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/af02ec0e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/af02ec0e Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: af02ec0e8c9c5f7f2824824998779fcc20a7be4b Parents: a92b4e8 e56d100 Author: Michael Bolz <[email protected]> Authored: Mon Nov 3 13:22:37 2014 +0100 Committer: Michael Bolz <[email protected]> Committed: Mon Nov 3 13:22:37 2014 +0100 ---------------------------------------------------------------------- .../core/edm/AnnotationEdmProvider.java | 23 +- .../core/edm/AnnotationEdmProviderTest.java | 31 ++ .../processor/core/model/Building.java | 3 +- .../annotation/processor/core/model/City.java | 3 +- .../processor/core/model/Employee.java | 5 +- .../processor/core/model/RefBase.java | 3 +- .../annotation/processor/core/model/Room.java | 5 +- .../processor/ref/model/Building.java | 3 +- .../processor/ref/model/Employee.java | 4 +- .../annotation/processor/ref/model/RefBase.java | 3 +- .../annotation/processor/ref/MetadataTest.java | 345 +++++++++++++++++++ .../core/model/JPAEdmFunctionImportTest.java | 4 +- .../annotation/edm/EdmConcurrencyControl.java | 2 +- .../odata2/api/annotation/edm/EdmFacets.java | 4 +- 14 files changed, 422 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
