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/09/02 13:50:10 UTC
[50/50] [abbrv] git commit: Merge branch 'master' into
Olingo-129_PocJpaDataStore
Merge branch 'master' into Olingo-129_PocJpaDataStore
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/c23dbcb5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/c23dbcb5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/c23dbcb5
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: c23dbcb5ee79dd1a4ca46da0cf46d7aa401c9eeb
Parents: 4528e8d fe1b1c9
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Sep 2 09:09:04 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Sep 2 09:09:04 2014 +0200
----------------------------------------------------------------------
.gitattributes | 6 +
.../annotation-processor-api/pom.xml | 2 +-
.../annotation-processor-core/pom.xml | 2 +-
.../processor/core/ListsProcessor.java | 11 +-
.../core/datasource/BeanPropertyAccess.java | 8 +-
.../core/datasource/BeanPropertyAccessTest.java | 2 +-
.../annotation-processor-ref/pom.xml | 2 +-
.../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 +-
.../jpa/processor/api/ODataJPAProcessor.java | 8 +
.../processor/api/ODataJPATombstoneContext.java | 90 +++
.../api/ODataJPATombstoneEntityListener.java | 60 ++
.../api/exception/ODataJPAErrorCallback.java | 2 +-
.../api/model/JPAEdmAssociationEndView.java | 4 +-
.../processor/api/model/JPAEdmExtension.java | 9 +
.../jpa/processor/api/model/JPAEdmMapping.java | 16 +
.../processor/api/model/JPAEdmPropertyView.java | 8 +
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
.../core/ODataJPAProcessorDefault.java | 45 +-
.../core/ODataJPAResponseBuilderDefault.java | 27 +-
.../processor/core/access/data/JPAEntity.java | 13 +
.../core/access/data/JPAEntityParser.java | 13 +
.../core/access/data/JPAExpandCallBack.java | 221 --------
.../jpa/processor/core/access/data/JPAPage.java | 81 ++-
.../core/access/data/JPAProcessorImpl.java | 103 +++-
.../core/access/model/EdmTypeConvertor.java | 69 ---
.../access/model/JPAEdmMappingModelService.java | 14 +-
.../core/access/model/JPAEdmNameBuilder.java | 10 +-
.../core/access/model/JPATypeConvertor.java | 8 +-
.../core/callback/JPAExpandCallBack.java | 224 ++++++++
.../core/callback/JPATombstoneCallBack.java | 60 ++
.../processor/core/model/JPAEdmAssociation.java | 13 +-
.../core/model/JPAEdmAssociationEnd.java | 33 +-
.../processor/core/model/JPAEdmEntityType.java | 18 +
.../processor/core/model/JPAEdmMappingImpl.java | 13 +
.../processor/core/model/JPAEdmProperty.java | 62 ++-
.../model/JPAEdmReferentialConstraintRole.java | 80 +--
.../core/ODataJPAResponseBuilderTest.java | 2 +-
.../JPAEntityParserForStaticMethodTest.java | 330 +++++++++++
.../JPAEntityParserTestForStaticMethods.java | 330 -----------
.../core/access/data/JPAExpandCallBackTest.java | 1 +
.../access/data/JPAPageBuilderDeltaTest.java | 357 ++++++++++++
.../core/access/data/JPAPageBuilderTest.java | 19 +-
.../core/access/data/JPAProcessorImplTest.java | 12 +-
.../access/model/JPAEdmNameBuilderTest.java | 4 +-
.../core/model/JPAEdmAssociationTest.java | 23 +-
.../core/model/JPAEdmEntityContainerTest.java | 5 +
.../core/model/JPAEdmEntitySetTest.java | 5 +
.../core/model/JPAEdmEntityTypeTest.java | 5 +
.../JPAEdmReferentialConstraintRoleTest.java | 13 +
.../model/JPAEdmReferentialConstraintTest.java | 14 +
.../core/model/JPAEdmTestModelView.java | 10 +-
odata2-jpa-processor/jpa-ref/pom.xml | 9 +-
.../ref/converter/BlobToByteConverter.java | 6 +
.../SalesOrderItemTombstoneListener.java | 93 ++++
.../listeners/SalesOrderTombstoneListener.java | 57 ++
.../jpa/processor/ref/model/Category.java | 12 +
.../jpa/processor/ref/model/Customer.java | 12 +
.../jpa/processor/ref/model/Material.java | 9 +-
.../processor/ref/model/SalesOrderHeader.java | 25 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 4 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
.../SalesOrderProcessingExtension.java | 6 +
.../ref/web/JPAReferenceServiceFactory.java | 1 +
.../resources/SQL_Insert_Category.properties | 8 +-
.../resources/SQL_Insert_Customer.properties | 10 +-
.../resources/SQL_Insert_Material.properties | 22 +-
.../SQL_Insert_SalesOrderHeader.properties | 22 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
.../olingo/odata2/api/edm/EdmMapping.java | 9 -
.../olingo/odata2/api/edm/provider/Mapping.java | 18 -
.../olingo/odata2/api/ep/EntityProvider.java | 34 ++
.../odata2/api/ep/EntityProviderException.java | 4 +
.../api/ep/EntityProviderWriteProperties.java | 59 +-
.../odata2/api/processor/ODataRequest.java | 14 +-
.../odata2/api/processor/ODataResponse.java | 14 +
.../apache/olingo/odata2/api/uri/UriParser.java | 16 +
.../odata2/api/uri/UriSyntaxException.java | 2 +
odata2-lib/odata-core/pom.xml | 2 +-
.../olingo/odata2/core/ODataRequestHandler.java | 2 +-
.../olingo/odata2/core/ODataRequestImpl.java | 86 ++-
.../olingo/odata2/core/batch/AcceptParser.java | 7 +-
.../odata2/core/batch/BatchRequestParser.java | 34 +-
.../odata2/core/batch/BatchRequestWriter.java | 2 +-
.../odata2/core/batch/BatchResponseParser.java | 63 +--
.../olingo/odata2/core/edm/EdmBinary.java | 17 +-
.../edm/provider/EdmAssociationImplProv.java | 11 +-
.../edm/provider/EdmFunctionImportImplProv.java | 11 +-
.../odata2/core/ep/AtomEntityProvider.java | 18 +
.../odata2/core/ep/BasicEntityProvider.java | 6 +-
.../core/ep/ContentTypeBasedEntityProvider.java | 3 +
.../odata2/core/ep/JsonEntityProvider.java | 18 +
.../odata2/core/ep/ProviderFacadeImpl.java | 6 +
.../core/ep/consumer/JsonEntityConsumer.java | 39 +-
.../core/ep/consumer/JsonEntryConsumer.java | 1 -
.../core/ep/consumer/JsonPropertyConsumer.java | 138 ++++-
.../core/ep/consumer/XmlEntityConsumer.java | 39 +-
.../core/ep/consumer/XmlEntryConsumer.java | 2 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 15 +-
.../core/ep/consumer/XmlPropertyConsumer.java | 63 ++-
.../ep/producer/AtomEntryEntityProducer.java | 125 +++--
.../ep/producer/JsonEntryEntityProducer.java | 89 ++-
.../ep/producer/JsonLinkEntityProducer.java | 10 +-
.../ep/producer/JsonLinksEntityProducer.java | 11 +-
.../ep/producer/XmlPropertyEntityProducer.java | 4 +-
.../core/ep/util/XmlMetadataConstants.java | 4 +-
.../core/rest/ODataExceptionMapperImpl.java | 13 +-
.../odata2/core/rest/ODataSubLocator.java | 2 +-
.../odata2/core/servlet/ODataServlet.java | 25 +-
.../olingo/odata2/core/servlet/RestUtil.java | 31 ++
.../olingo/odata2/core/uri/UriParserImpl.java | 62 ++-
.../core/uri/expression/FilterParserImpl.java | 88 ++-
.../uri/expression/ParameterSetCombination.java | 2 +-
.../src/main/resources/i18n.properties | 2 +
.../src/main/resources/i18n_en.properties | 2 +-
.../core/ODataRequestHandlerValidationTest.java | 16 +
.../olingo/odata2/core/ODataRequestTest.java | 77 +++
.../olingo/odata2/core/ODataResponseTest.java | 17 +
.../core/batch/BatchRequestParserTest.java | 352 ++++++------
.../odata2/core/batch/BatchRequestTest.java | 26 +-
.../core/batch/BatchRequestWriterTest.java | 20 +-
.../core/batch/BatchResponseParserTest.java | 361 +++++++-----
.../odata2/core/batch/BatchResponseTest.java | 17 +-
.../odata2/core/edm/EdmSimpleTypeTest.java | 12 +-
.../provider/EdmAssociationImplProvTest.java | 12 +-
.../provider/EdmFunctionImportImplProvTest.java | 6 +-
.../core/edm/provider/EdmMappingTest.java | 5 +-
.../edm/provider/EdmPropertyImplProvTest.java | 3 +-
.../odata2/core/ep/AbstractProviderTest.java | 1 +
.../ep/ODataEntityProviderPropertiesTest.java | 26 +-
.../odata2/core/ep/ProviderFacadeImplTest.java | 10 +
.../core/ep/consumer/JsonEntryConsumerTest.java | 74 ++-
.../consumer/JsonEntryDeepInsertEntryTest.java | 2 +-
.../ep/consumer/JsonPropertyConsumerTest.java | 132 ++++-
.../core/ep/consumer/XmlEntityConsumerTest.java | 75 ++-
.../core/ep/consumer/XmlFeedConsumerTest.java | 6 +-
.../ep/consumer/XmlMetadataConsumerTest.java | 98 +++-
.../ep/consumer/XmlPropertyConsumerTest.java | 153 +++--
.../core/ep/producer/AtomEntryProducerTest.java | 424 ++++++++++++--
.../core/ep/producer/AtomFeedProducerTest.java | 16 +-
.../producer/JsonEntryEntityProducerTest.java | 323 +++++++++--
.../ep/producer/JsonFeedEntityProducerTest.java | 33 ++
.../ep/producer/JsonLinkEntityProducerTest.java | 17 +
.../producer/JsonLinksEntityProducerTest.java | 76 +++
.../core/rest/ODataExceptionMapperImplTest.java | 4 +-
.../odata2/core/servlet/ODataServletTest.java | 114 ++++
.../olingo/odata2/core/uri/UriParserTest.java | 42 +-
.../uri/expression/TestAbapCompatibility.java | 187 +++++++
.../odata2/core/uri/expression/TestParser.java | 4 +-
.../BatchResponseWithAdditionalLineEnding.batch | 12 +
.../BatchResponseWithLinesInBodyWin.batch | 16 +
.../src/test/resources/EmployeeContentOnly.xml | 37 ++
.../EmployeeContentOnlyWithAdditionalLink.xml | 38 ++
.../test/resources/JsonEmployeeContentOnly.json | 25 +
...onEmployeeContentOnlyWithAdditionalLink.json | 30 +
.../src/test/resources/JsonRoomContentOnly.json | 8 +
.../JsonRoomContentOnlyWithAdditionalLink.json | 13 +
.../src/test/resources/RoomContentOnly.xml | 28 +
.../RoomContentOnlyWithAdditionalLink.xml | 29 +
odata2-lib/odata-fit/pom.xml | 2 +-
.../olingo/odata2/fit/basic/BasicHttpTest.java | 4 +-
.../fit/basic/HttpExceptionResponseTest.java | 13 +-
.../fit/basic/LanguageNegotiationTest.java | 6 +-
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 2 +-
.../odata2/fit/ref/FunctionImportJsonTest.java | 106 +++-
.../odata2/fit/ref/FunctionImportXmlTest.java | 34 +-
.../src/test/resources/i18n.properties | 22 -
.../src/test/resources/i18n_it.properties | 1 +
odata2-lib/odata-ref/pom.xml | 2 +-
.../odata2/ref/edm/ScenarioEdmProvider.java | 15 +-
.../ref/processor/BeanPropertyAccess.java | 8 +-
.../odata2/ref/processor/ListsProcessor.java | 11 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
.../odata2/testutil/helper/StringHelper.java | 49 +-
.../olingo/odata2/testutil/mock/EdmMock.java | 6 +-
.../odata2/testutil/mock/EdmTestProvider.java | 8 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 140 ++---
.../main/resources/archetype-resources/pom.xml | 296 +++++-----
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
.../META-INF/maven/archetype-metadata.xml | 80 +--
.../main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/java/model/Key.java | 190 +++----
.../java/service/ODataJPACarServiceFactory.java | 182 +++---
.../src/main/resources/META-INF/persistence.xml | 78 +--
.../src/main/webapp/index.html | 178 +++---
odata2-sample/cars-service-archetype/pom.xml | 158 +++---
.../main/resources/archetype-resources/pom.xml | 190 +++----
.../src/main/java/CarEdmProvider.java | 556 +++++++++----------
.../src/main/java/CarODataSingleProcessor.java | 302 +++++-----
.../src/main/java/CarServiceFactory.java | 78 +--
odata2-sample/pom.xml | 4 +-
pom.xml | 2 +-
203 files changed, 6669 insertions(+), 3055 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c23dbcb5/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c23dbcb5/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------