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/03/16 10:06:08 UTC
[19/50] [abbrv] git commit: [OLINGO-67] Merge branch 'master' into
servlet
[OLINGO-67] Merge branch 'master' into servlet
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/9655f6b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/9655f6b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/9655f6b4
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 9655f6b47806ff0646211f106766d13ec807a6f5
Parents: 33ae8e8 a8461c7
Author: Stephan Klevenz <sk...@apache.org>
Authored: Wed Feb 12 09:43:20 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Wed Feb 12 09:44:04 2014 +0100
----------------------------------------------------------------------
NOTICE | 11 +-
.../annotation-processor-api/pom.xml | 44 +-
.../processor/api/AnnotationServiceFactory.java | 38 +-
.../annotation/processor/api/package-info.java | 25 +
.../annotation-processor-core/pom.xml | 75 +-
.../core/AnnotationServiceFactoryImpl.java | 63 -
.../processor/core/ListsProcessor.java | 57 +-
.../core/datasource/AnnotationInMemoryDs.java | 85 +-
.../core/datasource/AnnotationValueAccess.java | 14 +-
.../processor/core/datasource/DataStore.java | 26 +-
.../core/edm/AnnotationEdmProvider.java | 15 +-
.../core/rt/AnnotationServiceFactoryImpl.java | 64 +
.../processor/core/util/AnnotationHelper.java | 57 +-
.../core/util/AnnotationRuntimeException.java | 40 +
.../processor/core/util/ClassHelper.java | 112 +-
.../core/AnnotationServiceFactoryImplTest.java | 13 +-
.../processor/core/ListsProcessorTest.java | 56 +-
.../datasource/AnnotationValueAccessTest.java | 92 +-
.../datasource/AnnotationsInMemoryDsTest.java | 181 +-
.../core/datasource/BeanPropertyAccessTest.java | 102 +-
.../core/edm/AnnotationEdmProviderTest.java | 2 +-
.../processor/core/model/Building.java | 2 +-
.../annotation/processor/core/model/Room.java | 2 +-
.../core/util/AnnotationHelperTest.java | 35 +-
.../processor/core/util/ClassHelperTest.java | 100 ++
.../annotation-processor-ref/pom.xml | 109 ++
.../ref/AnnotationRefServiceFactory.java | 215 +++
.../processor/ref/model/Building.java | 97 +
.../annotation/processor/ref/model/City.java | 63 +
.../processor/ref/model/Employee.java | 192 ++
.../processor/ref/model/Location.java | 62 +
.../annotation/processor/ref/model/Manager.java | 43 +
.../ref/model/ModelSharedConstants.java | 25 +
.../annotation/processor/ref/model/Photo.java | 128 ++
.../annotation/processor/ref/model/RefBase.java | 78 +
.../processor/ref/model/ResourceHelper.java | 96 +
.../annotation/processor/ref/model/Room.java | 88 +
.../annotation/processor/ref/model/Team.java | 73 +
.../src/main/version/version.html | 27 +
.../processor/ref/AbstractRefJsonTest.java | 38 +
.../processor/ref/AbstractRefTest.java | 195 +++
.../processor/ref/AbstractRefXmlTest.java | 89 +
.../processor/ref/EntryJsonCreateTest.java | 161 ++
.../processor/ref/ServiceJsonTest.java | 87 +
.../processor/ref/ServiceXmlTest.java | 123 ++
.../annotation-processor-web/pom.xml | 110 ++
.../src/main/resources/META-INF/LICENSE | 908 ++++++++++
.../src/main/resources/META-INF/NOTICE | 23 +
.../src/main/resources/log4j.xml | 41 +
.../src/main/version/version.html | 27 +
.../src/main/webapp/WEB-INF/web.xml | 48 +
.../src/main/webapp/index.jsp | 116 ++
.../annotation-processor-webref/pom.xml | 126 --
.../ref/AnnotationRefServiceFactory.java | 215 ---
.../processor/ref/model/Building.java | 97 -
.../annotation/processor/ref/model/City.java | 61 -
.../processor/ref/model/Employee.java | 192 --
.../processor/ref/model/Location.java | 60 -
.../annotation/processor/ref/model/Manager.java | 43 -
.../ref/model/ModelSharedConstants.java | 25 -
.../annotation/processor/ref/model/Photo.java | 128 --
.../annotation/processor/ref/model/RefBase.java | 78 -
.../processor/ref/model/ResourceHelper.java | 96 -
.../annotation/processor/ref/model/Room.java | 88 -
.../annotation/processor/ref/model/Team.java | 73 -
.../src/main/resources/log4j.xml | 39 -
.../src/main/version/version.html | 27 -
.../src/main/webapp/WEB-INF/web.xml | 48 -
.../src/main/webapp/index.jsp | 116 --
.../processor/ref/AbstractRefTest.java | 195 ---
.../processor/ref/AbstractRefXmlTest.java | 89 -
.../processor/ref/ServiceJsonTest.java | 87 -
.../processor/ref/ServiceXmlTest.java | 123 --
odata2-annotation-processor/pom.xml | 5 +-
odata2-dist/janos/pom.xml | 103 ++
.../janos/src/main/assembly/janos-assembly.xml | 48 +
odata2-dist/janos/src/main/resources/LICENSE | 587 +++++++
odata2-dist/janos/src/main/resources/NOTICE | 14 +
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
.../jpa/src/main/assembly/jpa-assembly.xml | 2 +-
odata2-dist/jpa/src/main/resources/NOTICE | 24 +-
odata2-dist/lib/pom.xml | 2 +-
.../lib/src/main/assembly/lib-assembly.xml | 6 +-
odata2-dist/lib/src/main/resources/NOTICE | 17 +-
odata2-dist/pom.xml | 3 +-
odata2-dist/ref/pom.xml | 17 +-
.../ref/src/main/assembly/ref-assembly.xml | 11 +-
odata2-dist/ref/src/main/resources/NOTICE | 47 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
.../jpa/processor/api/ODataJPAProcessor.java | 2 +-
.../processor/api/ODataJPAResponseBuilder.java | 6 +-
.../jpa/processor/api/access/JPAProcessor.java | 8 +-
.../api/factory/JPQLBuilderFactory.java | 2 +-
.../api/model/JPAEdmComplexTypeView.java | 4 +-
.../processor/api/model/JPAEdmPropertyView.java | 9 +
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
.../jpa/processor/core/ODataEntityParser.java | 128 +-
.../core/ODataJPAProcessorDefault.java | 12 +-
.../core/ODataJPAResponseBuilderDefault.java | 89 +-
.../processor/core/access/data/JPAEntity.java | 161 +-
.../core/access/data/JPAEntityParser.java | 353 ++--
.../core/access/data/JPAExpandCallBack.java | 63 +-
.../jpa/processor/core/access/data/JPALink.java | 332 ++--
.../core/access/data/JPAProcessorImpl.java | 37 +-
.../access/model/JPAEdmMappingModelService.java | 2 +-
.../core/access/model/JPAEdmNameBuilder.java | 9 +-
.../processor/core/model/JPAEdmMappingImpl.java | 1 -
.../processor/core/model/JPAEdmProperty.java | 81 +-
.../core/model/JPAEdmReferentialConstraint.java | 2 +-
.../model/JPAEdmReferentialConstraintRole.java | 2 +-
.../processor/core/ODataEntityParserTest.java | 244 +++
.../core/ODataExpressionParserTest.java | 1 -
.../processor/core/ODataJPAContextImplTest.java | 1 -
.../core/ODataJPAProcessorDefaultTest.java | 2 +-
.../core/ODataJPAResponseBuilderTest.java | 1 +
.../core/access/data/JPAEntityParserTest.java | 51 +-
.../JPAEntityParserTestForStaticMethods.java | 19 +-
.../core/access/data/JPAEntityTest.java | 17 +-
.../core/access/data/JPAExpandCallBackTest.java | 6 +-
.../access/data/JPAFunctionContextTest.java | 1 -
.../processor/core/access/data/JPALinkTest.java | 23 +
.../core/access/data/JPAProcessorImplTest.java | 2 +-
.../model/JPAEdmMappingModelServiceTest.java | 1 -
.../access/model/JPAEdmNameBuilderTest.java | 2 -
.../core/access/model/JPATypeConvertorTest.java | 1 -
.../edm/ODataJPAEdmProviderNegativeTest.java | 1 -
.../core/edm/ODataJPAEdmProviderTest.java | 1 -
.../core/jpql/JPQLBuilderFactoryTest.java | 6 +-
.../core/jpql/JPQLJoinContextTest.java | 1 -
.../jpql/JPQLJoinSelectSingleContextTest.java | 1 -
...PQLJoinSelectSingleStatementBuilderTest.java | 1 -
.../core/jpql/JPQLJoinStatementBuilderTest.java | 1 -
.../core/jpql/JPQLSelectContextImplTest.java | 1 -
.../jpql/JPQLSelectSingleContextImplTest.java | 1 -
.../JPQLSelectSingleStatementBuilderTest.java | 4 +-
.../jpql/JPQLSelectStatementBuilderTest.java | 4 +-
.../processor/core/mock/ODataContextMock.java | 48 +
.../core/mock/ODataJPAContextMock.java | 24 +
.../processor/core/mock/ODataServiceMock.java | 106 ++
.../jpa/processor/core/mock/PathInfoMock.java | 51 +
.../processor/core/mock/PathSegmentMock.java | 44 +
.../processor/core/mock/data/EdmMockUtil.java | 16 +-
.../processor/core/mock/data/EdmMockUtilV2.java | 30 +-
.../core/mock/data/ODataEntryMockUtil.java | 31 +-
.../core/model/JPAEdmAssociationEndTest.java | 1 -
.../core/model/JPAEdmAssociationSetTest.java | 1 -
.../core/model/JPAEdmAssociationTest.java | 5 +-
.../core/model/JPAEdmBaseViewImplTest.java | 1 -
.../core/model/JPAEdmComplexTypeTest.java | 2 -
.../core/model/JPAEdmEntityContainerTest.java | 1 -
.../core/model/JPAEdmEntitySetTest.java | 1 -
.../core/model/JPAEdmEntityTypeTest.java | 1 -
.../core/model/JPAEdmFunctionImportTest.java | 1 -
.../jpa/processor/core/model/JPAEdmKeyTest.java | 1 -
.../processor/core/model/JPAEdmModelTest.java | 1 -
.../model/JPAEdmNavigationPropertyTest.java | 1 -
.../core/model/JPAEdmPropertyTest.java | 5 +-
.../JPAEdmReferentialConstraintRoleTest.java | 2 -
.../model/JPAEdmReferentialConstraintTest.java | 1 -
.../processor/core/model/JPAEdmSchemaTest.java | 1 -
.../core/model/JPAEdmTestModelView.java | 10 +-
.../core/model/_JPAEdmFunctionImportTest.java | 1 -
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
.../odata2/jpa/processor/ref/model/Address.java | 11 +
.../jpa/processor/ref/model/Category.java | 68 +
.../jpa/processor/ref/model/Customer.java | 81 +
.../jpa/processor/ref/model/Material.java | 28 +-
.../processor/ref/model/SalesOrderHeader.java | 72 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 28 +-
.../src/main/resources/META-INF/persistence.xml | 4 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
.../jpa/processor/ref/extension/OrderValue.java | 4 +-
.../extension/SalesOrderHeaderProcessor.java | 2 +-
.../SalesOrderProcessingExtension.java | 12 +-
.../extension/_SalesOrderHeaderProcessor.java | 2 +-
.../jpa/processor/ref/util/DataGenerator.java | 4 +-
.../main/resources/DataDeleteSQLs.properties | 22 -
.../jpa-web/src/main/resources/META-INF/NOTICE | 44 +
.../src/main/resources/MaterialSQLs.properties | 30 -
.../src/main/resources/NoteSQLs.properties | 20 -
.../main/resources/SQLInsertConfig.properties | 22 -
.../src/main/resources/SQL_Cleanup.properties | 22 +
.../resources/SQL_Insert_Category.properties | 22 +
.../main/resources/SQL_Insert_Config.properties | 22 +
.../resources/SQL_Insert_Customer.properties | 23 +
.../resources/SQL_Insert_Material.properties | 30 +
.../main/resources/SQL_Insert_Note.properties | 20 +
.../SQL_Insert_SalesOrderHeader.properties | 30 +
.../SQL_Insert_SalesOrderItem.properties | 30 +
.../main/resources/SQL_Insert_Store.properties | 30 +
.../resources/SalesOrderHeaderSQLs.properties | 30 -
.../resources/SalesOrderItemSQLs.properties | 30 -
.../src/main/resources/StoreSQLs.properties | 30 -
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 43 +-
.../odata2/api/annotation/edm/package-info.java | 27 +
.../api/annotation/edmx/package-info.java | 23 +
odata2-lib/odata-api/pom.xml | 2 +-
.../olingo/odata2/api/ep/EntityProvider.java | 38 +-
.../odata2/api/ep/EntityProviderException.java | 3 +
.../api/ep/EntityProviderWriteProperties.java | 19 +
.../api/ep/entry/DeletedEntryMetadata.java | 42 +
.../odata2/api/ep/feed/ODataDeltaFeed.java | 34 +
odata2-lib/odata-core/pom.xml | 29 +-
.../odata2/core/ep/AtomEntityProvider.java | 9 +-
.../core/ep/ContentTypeBasedEntityProvider.java | 4 +
.../odata2/core/ep/JsonEntityProvider.java | 7 +
.../odata2/core/ep/ProviderFacadeImpl.java | 8 +
.../core/ep/consumer/JsonEntityConsumer.java | 9 +-
.../core/ep/consumer/JsonEntryConsumer.java | 101 +-
.../core/ep/consumer/JsonFeedConsumer.java | 22 +-
.../core/ep/consumer/XmlEntityConsumer.java | 4 +-
.../core/ep/consumer/XmlEntryConsumer.java | 35 +-
.../core/ep/consumer/XmlFeedConsumer.java | 83 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 4 +-
.../core/ep/entry/DeletedEntryMetadataImpl.java | 48 +
.../odata2/core/ep/feed/JsonFeedEntry.java | 62 +
.../odata2/core/ep/feed/ODataDeltaFeedImpl.java | 60 +
.../odata2/core/ep/feed/ODataFeedImpl.java | 48 -
.../ep/producer/AtomEntryEntityProducer.java | 4 +-
.../JsonDeletedEntryEntityProducer.java | 75 +
.../ep/producer/JsonFeedEntityProducer.java | 58 +-
.../producer/XmlCollectionEntityProducer.java | 2 +-
.../ep/producer/XmlPropertyEntityProducer.java | 11 +
.../olingo/odata2/core/ep/util/FormatJson.java | 4 +
.../olingo/odata2/core/ep/util/FormatXml.java | 2 +
.../olingo/odata2/core/ep/util/JsonUtils.java | 4 +
.../src/main/resources/i18n.properties | 1 +
.../odata2/core/commons/XmlHelperTest.java | 83 +-
.../ep/ODataEntityProviderPropertiesTest.java | 4 +
.../ep/ProducerConsumerIntegrationTest.java | 84 +
.../odata2/core/ep/ProviderFacadeImplTest.java | 81 +-
.../core/ep/consumer/JsonFeedConsumerTest.java | 196 ++-
.../core/ep/consumer/XmlEntityConsumerTest.java | 6 +
.../core/ep/consumer/XmlFeedConsumerTest.java | 26 +-
.../core/ep/producer/AtomEntryProducerTest.java | 16 +
.../core/ep/producer/AtomFeedProducerTest.java | 16 +
.../JsonFeedWithDeltaLinkProducerTest.java | 193 ++
.../test/resources/JsonWithDeletedEntries.json | 30 +
.../src/test/resources/expandedBuilding.xml | 113 +-
.../resources/feed_with_deleted_entries.xml | 40 +
odata2-lib/odata-fit/pom.xml | 14 +-
.../fit/client/ClientDeltaResponseTest.java | 268 +++
.../olingo/odata2/fit/client/util/Client.java | 196 +++
.../odata2/fit/client/util/HttpException.java | 37 +
.../olingo/odata2/fit/ref/AbstractRefTest.java | 6 +-
.../odata2/fit/ref/EntryXmlReadOnlyTest.java | 2 +-
.../AbstractContentNegotiationTest.java | 6 +-
.../odata-fit/src/test/resources/log4j.xml | 39 +
odata2-lib/odata-ref/pom.xml | 26 +-
.../ref/processor/BeanPropertyAccess.java | 180 ++
.../odata2/ref/processor/ListsProcessor.java | 1653 ++++++++++++++++++
.../ref/processor/ScenarioDataSource.java | 41 +-
.../ref/processor/ScenarioServiceFactory.java | 4 +-
.../ref/processor/ListsProcessorTest.java | 80 +
.../olingo/odata2/ref/read/EntitySetTest.java | 5 +-
.../olingo/odata2/ref/read/EntityTest.java | 4 +-
odata2-lib/odata-testutil/pom.xml | 209 +--
.../odata2/testutil/mock/AnnotatedEntity.java | 26 +
odata2-lib/odata-web/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 23 +
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 70 +
.../META-INF/maven/archetype-metadata.xml | 56 +
.../main/resources/archetype-resources/pom.xml | 148 ++
.../src/main/java/model/Address.java | 79 +
.../src/main/java/model/Car.java | 115 ++
.../src/main/java/model/Driver.java | 104 ++
.../src/main/java/model/Manufacturer.java | 98 ++
.../src/main/java/model/ResourceHelper.java | 96 +
.../AnnotationSampleServiceFactory.java | 195 +++
.../src/main/resources/log4j.xml | 47 +
.../src/main/webapp/WEB-INF/web.xml | 51 +
.../src/main/webapp/index.jsp | 91 +
.../projects/basic/archetype.properties | 12 +
.../src/test/resources/projects/basic/goal.txt | 0
odata2-sample/cars-service-archetype/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 7 +
.../main/resources/archetype-resources/pom.xml | 166 +-
.../projects/basic/archetype.properties | 7 +
odata2-sample/pom.xml | 3 +-
pom.xml | 791 +++++----
283 files changed, 12989 insertions(+), 4123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/9655f6b4/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/9655f6b4/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
----------------------------------------------------------------------