[OLINGO-129] Merge branch 'master' into Olingo-129_PocJpaDataStore
Conflicts:
odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/7224e855
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/7224e855
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/7224e855
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 7224e855af20f6da23f82a01b860199afd804b5e
Parents: b85d531 4bab6aa
Author: mibo <[email protected]>
Authored: Wed Dec 10 20:30:05 2014 +0100
Committer: mibo <[email protected]>
Committed: Wed Dec 10 20:30:05 2014 +0100
----------------------------------------------------------------------
.../annotation-processor-api/pom.xml | 2 +-
.../annotation-processor-core/pom.xml | 2 +-
.../core/edm/AnnotationEdmProvider.java | 50 ++-
.../core/edm/AnnotationEdmProviderTest.java | 54 ++-
.../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 +-
.../annotation-processor-ref/pom.xml | 2 +-
.../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 +++++++++++++++++++
.../annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
.../api/exception/ODataJPARuntimeException.java | 2 +
.../api/jpql/JPQLSelectContextView.java | 10 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
.../processor/core/ODataExpressionParser.java | 86 +++--
.../core/ODataJPAProcessorDefault.java | 86 +++--
.../core/access/data/JPAEntityParser.java | 2 +-
.../jpa/processor/core/access/data/JPALink.java | 4 +-
.../core/access/data/JPAProcessorImpl.java | 321 ++++++++---------
.../core/access/model/JPAEdmNameBuilder.java | 23 +-
.../core/callback/JPAExpandCallBack.java | 17 +-
.../core/model/JPAEdmAssociationEnd.java | 6 +-
.../core/model/JPAEdmAssociationSet.java | 35 +-
.../processor/core/model/JPAEdmProperty.java | 11 +-
.../model/JPAEdmReferentialConstraintRole.java | 26 +-
.../main/resources/jpaprocessor_msg.properties | 1 +
.../core/ODataExpressionParserTest.java | 22 +-
.../core/ODataJPAProcessorDefaultTest.java | 9 +-
.../core/access/data/JPAExpandCallBackTest.java | 7 +-
.../core/access/data/JPAProcessorImplTest.java | 3 +
.../processor/core/mock/data/EdmMockUtilV2.java | 4 +-
.../core/model/JPAEdmFunctionImportTest.java | 4 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
.../jpa/processor/ref/model/Customer.java | 39 ++-
.../jpa/processor/ref/model/CustomerBase.java | 40 +++
.../jpa/processor/ref/model/SalesOrderItem.java | 4 +-
.../src/main/resources/META-INF/persistence.xml | 4 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
.../ref/web/JPAReferenceServiceFactory.java | 2 +-
.../jpa-web/src/main/webapp/index.jsp | 6 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
.../annotation/edm/EdmConcurrencyControl.java | 2 +-
.../odata2/api/annotation/edm/EdmFacets.java | 4 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
.../odata2/core/batch/v2/BatchBodyPart.java | 2 +-
.../odata2/core/batch/v2/BatchParserCommon.java | 32 +-
.../core/batch/v2/BatchTransformatorCommon.java | 2 +-
.../core/ep/producer/XmlMetadataProducer.java | 16 +-
.../odata2/core/servlet/ODataServlet.java | 56 +--
.../olingo/odata2/core/servlet/RestUtil.java | 2 +-
.../core/batch/BatchRequestParserTest.java | 81 +++--
.../core/batch/BatchResponseParserTest.java | 30 ++
.../olingo/odata2/core/batch/HeaderTest.java | 4 +-
.../ExpandSelectProducerWithBuilderTest.java | 77 +++++
.../ep/producer/XmlMetadataProducerTest.java | 18 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/pom.xml | 2 +-
pom.xml | 2 +-
82 files changed, 1218 insertions(+), 428 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7224e855/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7224e855/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
----------------------------------------------------------------------
diff --cc
odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
index b35f394,8b6e7f6..00ef56b
---
a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
+++
b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
@@@ -6,9 -6,9 +6,9 @@@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
-- *
++ *
* http://www.apache.org/licenses/LICENSE-2.0
-- *
++ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@@ -69,7 -73,7 +73,7 @@@ import org.apache.olingo.odata2.api.exc
/**
* Provider for the entity data model used in the reference scenario
-- *
++ *
*/
public class AnnotationEdmProvider extends EdmProvider {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7224e855/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
