You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by tb...@apache.org on 2013/12/19 16:32:01 UTC

[50/50] [abbrv] git commit: [OLINGO-67] Merge branch 'master' into ODataServlet

[OLINGO-67] Merge branch 'master' into ODataServlet


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/6ac9c522
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/6ac9c522
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/6ac9c522

Branch: refs/heads/ODataServlet
Commit: 6ac9c52227b18203fcd3ee1d7c4b9d7b554a70c3
Parents: 07a1c45 96e9d9e
Author: Tamara Boehm <ta...@sap.com>
Authored: Thu Dec 19 16:18:38 2013 +0100
Committer: Tamara Boehm <ta...@sap.com>
Committed: Thu Dec 19 16:18:38 2013 +0100

----------------------------------------------------------------------
 .../odata2/api/data/DataSourceProcessor.java    |    2 +-
 .../olingo/odata2/api/data/ValueAccess.java     |   18 +-
 .../annotation/data/AnnotationInMemoryDs.java   |  143 +-
 .../annotation/data/AnnotationValueAccess.java  |   27 +-
 .../annotation/data/BeanPropertyAccess.java     |    6 +-
 .../odata2/core/annotation/data/DataStore.java  |  160 ++-
 .../annotation/edm/AnnotationEdmProvider.java   |  128 +-
 .../annotation/processor/ListsProcessor.java    |   57 +-
 .../core/annotation/util/AnnotationHelper.java  |  285 ++--
 .../core/annotation/util/ClassHelper.java       |   67 +-
 .../data/AnnotationsInMemoryDsTest.java         |  458 ++++++-
 .../edm/AnnotationEdmProviderTest.java          |  158 ++-
 .../odata2/core/annotation/model/Building.java  |    6 +-
 .../odata2/core/annotation/model/City.java      |    3 +-
 .../odata2/core/annotation/model/Location.java  |    1 -
 .../odata2/core/annotation/model/Photo.java     |   14 +-
 .../odata2/core/annotation/model/RefBase.java   |   20 +-
 .../core/annotation/model/ResourceHelper.java   |   16 +-
 .../odata2/core/annotation/model/Room.java      |   12 +-
 .../odata2/core/annotation/model/Team.java      |    4 +-
 .../odata2/ref/annotation/model/Building.java   |    2 +-
 .../odata2/ref/annotation/model/City.java       |    2 +-
 .../odata2/ref/annotation/model/Photo.java      |   14 +-
 .../odata2/ref/annotation/model/RefBase.java    |   18 +-
 .../ref/annotation/model/ResourceHelper.java    |   23 +-
 .../odata2/ref/annotation/model/Team.java       |    4 +-
 .../processor/AnnotationPocServiceFactory.java  |  202 ---
 .../processor/AnnotationServiceFactory.java     |  215 +++
 .../src/main/webapp/WEB-INF/web.xml             |    2 +-
 odata2-jpa-processor/jpa-api/.gitignore         |    8 +
 odata2-jpa-processor/jpa-api/pom.xml            |   91 ++
 .../processor/api/jpa/ODataJPAContext.java      |  206 +++
 .../processor/api/jpa/ODataJPAProcessor.java    |   69 +
 .../api/jpa/ODataJPAServiceFactory.java         |  190 +++
 .../processor/api/jpa/access/JPAEdmBuilder.java |   57 +
 .../jpa/access/JPAEdmMappingModelAccess.java    |  191 +++
 .../processor/api/jpa/access/JPAFunction.java   |   85 ++
 .../processor/api/jpa/access/JPAJoinClause.java |  148 +++
 .../api/jpa/access/JPAMethodContext.java        |  130 ++
 .../api/jpa/access/JPAMethodContextView.java    |   46 +
 .../processor/api/jpa/access/JPAProcessor.java  |  260 ++++
 .../processor/api/jpa/access/package-info.java  |   26 +
 .../jpa/exception/ODataJPAErrorCallback.java    |   45 +
 .../api/jpa/exception/ODataJPAException.java    |   68 +
 .../jpa/exception/ODataJPAMessageService.java   |   49 +
 .../jpa/exception/ODataJPAModelException.java   |   92 ++
 .../jpa/exception/ODataJPARuntimeException.java |   97 ++
 .../api/jpa/exception/package-info.java         |   31 +
 .../api/jpa/factory/JPAAccessFactory.java       |   69 +
 .../api/jpa/factory/JPQLBuilderFactory.java     |   77 ++
 .../api/jpa/factory/ODataJPAAccessFactory.java  |   82 ++
 .../api/jpa/factory/ODataJPAFactory.java        |  105 ++
 .../processor/api/jpa/factory/package-info.java |   33 +
 .../processor/api/jpa/jpql/JPQLContext.java     |  204 +++
 .../processor/api/jpa/jpql/JPQLContextType.java |   73 +
 .../processor/api/jpa/jpql/JPQLContextView.java |   53 +
 .../api/jpa/jpql/JPQLJoinContextView.java       |   44 +
 .../jpql/JPQLJoinSelectSingleContextView.java   |   45 +
 .../api/jpa/jpql/JPQLSelectContextView.java     |   62 +
 .../jpa/jpql/JPQLSelectSingleContextView.java   |   53 +
 .../processor/api/jpa/jpql/JPQLStatement.java   |  148 +++
 .../processor/api/jpa/jpql/package-info.java    |   27 +
 .../api/jpa/model/JPAEdmAssociationEndView.java |   91 ++
 .../api/jpa/model/JPAEdmAssociationSetView.java |   69 +
 .../api/jpa/model/JPAEdmAssociationView.java    |  128 ++
 .../processor/api/jpa/model/JPAEdmBaseView.java |  101 ++
 .../jpa/model/JPAEdmComplexPropertyView.java    |   45 +
 .../api/jpa/model/JPAEdmComplexTypeView.java    |  116 ++
 .../jpa/model/JPAEdmEntityContainerView.java    |   72 +
 .../api/jpa/model/JPAEdmEntitySetView.java      |   64 +
 .../api/jpa/model/JPAEdmEntityTypeView.java     |   76 ++
 .../api/jpa/model/JPAEdmExtension.java          |   50 +
 .../api/jpa/model/JPAEdmFunctionImportView.java |   51 +
 .../processor/api/jpa/model/JPAEdmKeyView.java  |   51 +
 .../processor/api/jpa/model/JPAEdmMapping.java  |   63 +
 .../api/jpa/model/JPAEdmModelView.java          |   43 +
 .../jpa/model/JPAEdmNavigationPropertyView.java |   72 +
 .../api/jpa/model/JPAEdmPropertyView.java       |  104 ++
 .../JPAEdmReferentialConstraintRoleView.java    |  101 ++
 .../model/JPAEdmReferentialConstraintView.java  |   69 +
 .../api/jpa/model/JPAEdmSchemaView.java         |  116 ++
 .../jpa/model/mapping/JPAAttributeMapType.java  |  202 +++
 .../jpa/model/mapping/JPAEdmMappingModel.java   |   79 ++
 .../mapping/JPAEdmMappingModelFactory.java      |   85 ++
 .../model/mapping/JPAEmbeddableTypeMapType.java |  161 +++
 .../mapping/JPAEmbeddableTypesMapType.java      |   89 ++
 .../jpa/model/mapping/JPAEntityTypeMapType.java |  213 +++
 .../model/mapping/JPAEntityTypesMapType.java    |   89 ++
 .../mapping/JPAPersistenceUnitMapType.java      |  157 +++
 .../model/mapping/JPARelationshipMapType.java   |  175 +++
 .../api/jpa/model/mapping/package-info.java     |   28 +
 .../processor/api/jpa/model/package-info.java   |   27 +
 .../odata2/processor/api/jpa/package-info.java  |   33 +
 .../src/main/resources/JPAEDMMappingModel.xsd   |  165 +++
 odata2-jpa-processor/jpa-core/.gitignore        |    8 +
 odata2-jpa-processor/jpa-core/pom.xml           |  146 ++
 .../processor/core/jpa/ODataEntityParser.java   |  163 +++
 .../core/jpa/ODataExpressionParser.java         |  381 ++++++
 .../processor/core/jpa/ODataJPAContextImpl.java |  146 ++
 .../core/jpa/ODataJPAProcessorDefault.java      |  194 +++
 .../core/jpa/ODataJPAResponseBuilder.java       |  629 +++++++++
 .../core/jpa/access/data/JPAEntity.java         |  355 +++++
 .../core/jpa/access/data/JPAEntityParser.java   |  453 +++++++
 .../core/jpa/access/data/JPAExpandCallBack.java |  180 +++
 .../jpa/access/data/JPAFunctionContext.java     |  170 +++
 .../processor/core/jpa/access/data/JPALink.java |  225 ++++
 .../core/jpa/access/data/JPAProcessorImpl.java  |  491 +++++++
 .../core/jpa/access/model/EdmTypeConvertor.java |   69 +
 .../access/model/JPAEdmMappingModelService.java |  247 ++++
 .../jpa/access/model/JPAEdmNameBuilder.java     |  499 +++++++
 .../core/jpa/access/model/JPATypeConvertor.java |  119 ++
 .../core/jpa/edm/ODataJPAEdmProvider.java       |  295 +++++
 .../ODataJPAMessageServiceDefault.java          |  122 ++
 .../core/jpa/factory/ODataJPAFactoryImpl.java   |  237 ++++
 .../core/jpa/jpql/JPQLJoinSelectContext.java    |  171 +++
 .../jpa/jpql/JPQLJoinSelectSingleContext.java   |  158 +++
 .../JPQLJoinSelectSingleStatementBuilder.java   |  106 ++
 .../core/jpa/jpql/JPQLJoinStatementBuilder.java |  145 ++
 .../core/jpa/jpql/JPQLSelectContext.java        |  159 +++
 .../core/jpa/jpql/JPQLSelectSingleContext.java  |  109 ++
 .../jpql/JPQLSelectSingleStatementBuilder.java  |   66 +
 .../jpa/jpql/JPQLSelectStatementBuilder.java    |   98 ++
 .../core/jpa/model/JPAEdmAssociation.java       |  237 ++++
 .../core/jpa/model/JPAEdmAssociationEnd.java    |  183 +++
 .../core/jpa/model/JPAEdmAssociationSet.java    |  131 ++
 .../core/jpa/model/JPAEdmBaseViewImpl.java      |  101 ++
 .../core/jpa/model/JPAEdmComplexType.java       |  254 ++++
 .../core/jpa/model/JPAEdmEntityContainer.java   |  154 +++
 .../core/jpa/model/JPAEdmEntitySet.java         |  112 ++
 .../core/jpa/model/JPAEdmEntityType.java        |  230 ++++
 .../processor/core/jpa/model/JPAEdmFacets.java  |   94 ++
 .../core/jpa/model/JPAEdmFunctionImport.java    |  331 +++++
 .../processor/core/jpa/model/JPAEdmKey.java     |  129 ++
 .../core/jpa/model/JPAEdmMappingImpl.java       |   51 +
 .../processor/core/jpa/model/JPAEdmModel.java   |   65 +
 .../jpa/model/JPAEdmNavigationProperty.java     |   98 ++
 .../core/jpa/model/JPAEdmProperty.java          |  378 ++++++
 .../jpa/model/JPAEdmReferentialConstraint.java  |  147 ++
 .../model/JPAEdmReferentialConstraintRole.java  |  258 ++++
 .../processor/core/jpa/model/JPAEdmSchema.java  |  216 +++
 .../jpa/model/_JPAEdmFunctionImportBuilder.java |  237 ++++
 .../main/resources/jpaprocessor_msg.properties  |   61 +
 .../core/jpa/ODataExpressionParserTest.java     |  515 +++++++
 .../core/jpa/ODataJPAContextImplTest.java       |   98 ++
 .../core/jpa/ODataJPAProcessorDefaultTest.java  |  554 ++++++++
 .../core/jpa/ODataJPAResponseBuilderTest.java   |  566 ++++++++
 .../jpa/access/data/JPAEntityParserTest.java    |  599 +++++++++
 .../JPAEntityParserTestForStaticMethods.java    |  251 ++++
 .../core/jpa/access/data/JPAEntityTest.java     |  187 +++
 .../jpa/access/data/JPAExpandCallBackTest.java  |  160 +++
 .../jpa/access/data/JPAFunctionContextTest.java |  143 ++
 .../jpa/access/data/JPAProcessorImplTest.java   |  447 +++++++
 .../model/JPAEdmMappingModelServiceTest.java    |  213 +++
 .../jpa/access/model/JPAEdmNameBuilderTest.java |  151 +++
 .../jpa/access/model/JPATypeConvertorTest.java  |   94 ++
 .../core/jpa/common/ODataJPATestConstants.java  |   27 +
 .../edm/ODataJPAEdmProviderNegativeTest.java    |  191 +++
 .../core/jpa/edm/ODataJPAEdmProviderTest.java   |  385 ++++++
 .../core/jpa/jpql/JPQLBuilderFactoryTest.java   |  377 ++++++
 .../core/jpa/jpql/JPQLJoinContextTest.java      |  198 +++
 .../jpql/JPQLJoinSelectSingleContextTest.java   |  215 +++
 ...PQLJoinSelectSingleStatementBuilderTest.java |  142 ++
 .../jpa/jpql/JPQLJoinStatementBuilderTest.java  |  124 ++
 .../jpa/jpql/JPQLSelectContextImplTest.java     |  385 ++++++
 .../jpql/JPQLSelectSingleContextImplTest.java   |  198 +++
 .../JPQLSelectSingleStatementBuilderTest.java   |  123 ++
 .../jpql/JPQLSelectStatementBuilderTest.java    |  135 ++
 .../core/jpa/mock/ODataJPAContextMock.java      |   57 +
 .../core/jpa/mock/data/EdmMockUtil.java         |  337 +++++
 .../core/jpa/mock/data/EdmMockUtilV2.java       |  324 +++++
 .../core/jpa/mock/data/JPATypeMock.java         |  205 +++
 .../core/jpa/mock/data/ODataEntryMockUtil.java  |  127 ++
 .../core/jpa/mock/data/SalesOrderHeader.java    |   63 +
 .../core/jpa/mock/data/SalesOrderLineItem.java  |   38 +
 .../jpa/mock/data/SalesOrderLineItemKey.java    |   52 +
 .../core/jpa/mock/model/EdmSchemaMock.java      |  213 +++
 .../core/jpa/mock/model/JPAAttributeMock.java   |   63 +
 .../jpa/mock/model/JPACustomProcessorMock.java  |   74 ++
 .../core/jpa/mock/model/JPAEdmMockData.java     |   72 +
 .../core/jpa/mock/model/JPAEmbeddableMock.java  |  184 +++
 .../jpa/mock/model/JPAEmbeddableTypeMock.java   |  184 +++
 .../core/jpa/mock/model/JPAEntityTypeMock.java  |  246 ++++
 .../core/jpa/mock/model/JPAJavaMemberMock.java  |   74 ++
 .../core/jpa/mock/model/JPAManagedTypeMock.java |  184 +++
 .../core/jpa/mock/model/JPAMetaModelMock.java   |   60 +
 .../jpa/mock/model/JPAPluralAttributeMock.java  |   95 ++
 .../mock/model/JPASingularAttributeMock.java    |   94 ++
 .../jpa/mock/model/_JPACustomProcessorMock.java |   77 ++
 .../model/_JPACustomProcessorNegativeMock.java  |   70 +
 .../jpa/model/JPAEdmAssociationEndTest.java     |  177 +++
 .../jpa/model/JPAEdmAssociationSetTest.java     |  184 +++
 .../core/jpa/model/JPAEdmAssociationTest.java   |  423 ++++++
 .../core/jpa/model/JPAEdmBaseViewImplTest.java  |   89 ++
 .../core/jpa/model/JPAEdmComplexTypeTest.java   |  268 ++++
 .../jpa/model/JPAEdmEntityContainerTest.java    |  234 ++++
 .../core/jpa/model/JPAEdmEntitySetTest.java     |  224 ++++
 .../core/jpa/model/JPAEdmEntityTypeTest.java    |  198 +++
 .../jpa/model/JPAEdmFunctionImportTest.java     |  566 ++++++++
 .../processor/core/jpa/model/JPAEdmKeyTest.java |  176 +++
 .../core/jpa/model/JPAEdmModelTest.java         |  145 ++
 .../jpa/model/JPAEdmNavigationPropertyTest.java |  218 +++
 .../core/jpa/model/JPAEdmPropertyTest.java      |  440 ++++++
 .../JPAEdmReferentialConstraintRoleTest.java    |  233 ++++
 .../model/JPAEdmReferentialConstraintTest.java  |  177 +++
 .../core/jpa/model/JPAEdmSchemaTest.java        |  103 ++
 .../core/jpa/model/JPAEdmTestModelView.java     |  396 ++++++
 .../jpa/model/_JPAEdmFunctionImportTest.java    |  570 ++++++++
 .../SalesOrderProcessingMappingModels.xml       |   62 +
 odata2-jpa-processor/jpa-ref/.gitignore         |    8 +
 odata2-jpa-processor/jpa-ref/pom.xml            |  109 ++
 .../ref/factory/JPAEntityManagerFactory.java    |   46 +
 .../odata2/jpa/processor/ref/model/Address.java |   83 ++
 .../jpa/processor/ref/model/Material.java       |  116 ++
 .../odata2/jpa/processor/ref/model/Note.java    |  116 ++
 .../processor/ref/model/SalesOrderHeader.java   |  236 ++++
 .../jpa/processor/ref/model/SalesOrderItem.java |  133 ++
 .../processor/ref/model/SalesOrderItemKey.java  |   89 ++
 .../odata2/jpa/processor/ref/model/Store.java   |   92 ++
 .../src/main/resources/META-INF/persistence.xml |   38 +
 odata2-jpa-processor/jpa-web/.gitignore         |    8 +
 odata2-jpa-processor/jpa-web/pom.xml            |  123 ++
 .../extension/SalesOrderHeaderProcessor.java    |  115 ++
 .../SalesOrderProcessingExtension.java          |   38 +
 .../extension/_SalesOrderHeaderProcessor.java   |  127 ++
 .../jpa/processor/ref/util/DataGenerator.java   |  158 +++
 .../ref/web/JPAReferenceServiceFactory.java     |   56 +
 .../main/resources/DataDeleteSQLs.properties    |   22 +
 .../jpa-web/src/main/resources/META-INF/LICENSE | 1252 ++++++++++++++++++
 .../src/main/resources/MaterialSQLs.properties  |   30 +
 .../src/main/resources/NoteSQLs.properties      |   20 +
 .../main/resources/SQLInsertConfig.properties   |   22 +
 .../resources/SalesOrderHeaderSQLs.properties   |   30 +
 .../resources/SalesOrderItemSQLs.properties     |   30 +
 .../src/main/resources/StoreSQLs.properties     |   30 +
 .../src/main/resources/serviceConfig.properties |   19 +
 .../webapp/SalesOrderProcessingMappingModel.xml |   61 +
 .../jpa-web/src/main/webapp/WEB-INF/web.xml     |   47 +
 .../jpa-web/src/main/webapp/index.jsp           |  312 +++++
 odata2-jpa-processor/pom.xml                    |   31 +
 .../api/annotation/edm/Documentation.java       |   28 +-
 .../api/annotation/edm/EdmComplexType.java      |    1 +
 .../annotation/edm/EdmConcurrencyControl.java   |    8 +-
 .../api/annotation/edm/EdmDocumentation.java    |   27 +-
 .../odata2/api/annotation/edm/EdmEntitySet.java |    1 +
 .../api/annotation/edm/EdmEntityType.java       |    3 +-
 .../odata2/api/annotation/edm/EdmFacets.java    |    5 +-
 .../api/annotation/edm/EdmFunctionImport.java   |   41 +-
 .../edm/EdmFunctionImportParameter.java         |    4 +-
 .../annotation/edm/EdmMediaResourceContent.java |    9 +-
 .../edm/EdmMediaResourceMimeType.java           |    6 +-
 .../annotation/edm/EdmMediaResourceSource.java  |    8 +-
 .../annotation/edm/EdmNavigationProperty.java   |    7 +-
 .../odata2/api/annotation/edm/EdmProperty.java  |    6 +-
 .../odata2/api/annotation/edm/EdmType.java      |    6 +-
 .../odata2/api/annotation/edm/Facets.java       |   28 +-
 .../api/annotation/edm/FunctionImport.java      |   28 +-
 .../odata2/api/annotation/edm/Parameter.java    |   30 +-
 .../odata2/api/annotation/edmx/HttpMethod.java  |   28 +-
 .../api/ODataDebugResponseWrapperCallback.java  |    8 +-
 .../olingo/odata2/api/edm/EdmAnnotatable.java   |    2 +-
 .../odata2/api/edm/EdmAnnotationElement.java    |   11 +-
 .../olingo/odata2/api/edm/EdmAnnotations.java   |   12 +-
 .../olingo/odata2/api/edm/EdmAssociation.java   |    2 +-
 .../odata2/api/edm/EdmAssociationEnd.java       |    2 +-
 .../odata2/api/edm/EdmAssociationSet.java       |    2 +-
 .../odata2/api/edm/EdmAssociationSetEnd.java    |    2 +-
 .../odata2/api/edm/EdmEntityContainer.java      |    2 +-
 .../olingo/odata2/api/edm/EdmEntitySet.java     |    2 +-
 .../odata2/api/edm/EdmFunctionImport.java       |    2 +-
 .../odata2/api/edm/EdmNavigationProperty.java   |    2 +-
 .../olingo/odata2/api/edm/EdmParameter.java     |    2 +-
 .../olingo/odata2/api/edm/EdmProperty.java      |    2 +-
 .../api/edm/EdmReferentialConstraint.java       |    2 +-
 .../odata2/api/edm/EdmStructuralType.java       |    2 +-
 .../odata2/api/edm/provider/AliasInfo.java      |    4 +-
 .../api/edm/provider/AnnotationElement.java     |   10 +-
 .../olingo/odata2/api/edm/provider/Mapping.java |    9 +-
 .../api/ep/EntityProviderWriteProperties.java   |    5 +-
 .../odata2/api/uri/UriNotMatchingException.java |    2 +-
 .../apache/olingo/odata2/api/uri/UriParser.java |   12 +-
 .../api/uri/expression/OrderExpression.java     |    2 +-
 .../api/uri/expression/PropertyExpression.java  |    2 +-
 .../api/uri/expression/UnaryExpression.java     |    2 +-
 .../olingo/odata2/core/ODataRequestHandler.java |    2 +-
 .../olingo/odata2/core/commons/XmlHelper.java   |    3 +-
 .../provider/EdmAnnotationElementImplProv.java  |   77 ++
 .../edm/provider/EdmAnnotationsImplProv.java    |   43 +-
 .../edm/provider/EdmAssociationEndImplProv.java |    8 +-
 .../edm/provider/EdmAssociationImplProv.java    |    7 +-
 .../provider/EdmAssociationSetEndImplProv.java  |    6 +-
 .../edm/provider/EdmAssociationSetImplProv.java |    8 +-
 .../edm/provider/EdmComplexTypeImplProv.java    |    7 -
 .../provider/EdmEntityContainerImplProv.java    |    8 +-
 .../core/edm/provider/EdmEntitySetImplProv.java |    6 +-
 .../edm/provider/EdmEntityTypeImplProv.java     |    6 -
 .../edm/provider/EdmFunctionImportImplProv.java |    7 +-
 .../provider/EdmNavigationPropertyImplProv.java |    8 +-
 .../core/edm/provider/EdmParameterImplProv.java |    6 +-
 .../core/edm/provider/EdmPropertyImplProv.java  |    6 +-
 .../EdmReferentialConstraintImplProv.java       |   15 +-
 .../EdmReferentialConstraintRoleImplProv.java   |   12 +-
 .../edm/provider/EdmStructuralTypeImplProv.java |   11 +
 .../odata2/core/edm/provider/EdmxProvider.java  |   10 +-
 .../consumer/AtomServiceDocumentConsumer.java   |   23 +-
 .../core/ep/consumer/XmlMetadataConsumer.java   |   87 +-
 .../ep/producer/JsonEntryEntityProducer.java    |   11 -
 .../odata2/core/rest/ODataExceptionWrapper.java |    3 +-
 .../odata2/core/rest/ODataRootLocator.java      |    9 +-
 .../odata2/core/rest/ODataSubLocator.java       |    6 +-
 .../olingo/odata2/core/rest/RestUtil.java       |   38 +-
 .../core/ODataRequestHandlerValidationTest.java |    2 +-
 .../debug/ODataDebugResponseWrapperTest.java    |    6 +-
 .../provider/EdmAnnotationsImplProvTest.java    |   20 +-
 .../core/edm/provider/EdmImplProvTest.java      |    8 +-
 .../core/edm/provider/EdmxProviderTest.java     |  123 ++
 .../producer/JsonEntryEntityProducerTest.java   |    4 +-
 .../core/rest/ODataExceptionMapperImplTest.java |    2 +-
 .../fit/misc/ODataApplicationFactory.java       |    2 -
 .../odata2/fit/ref/EntryXmlReadOnlyTest.java    |    4 +-
 .../testutil/fit/FitStaticServiceFactory.java   |    4 +-
 .../odata2/testutil/helper/StringHelper.java    |    2 +-
 .../odata2/testutil/mock/EdmTestProvider.java   |    4 +-
 .../mock/TechnicalScenarioEdmProvider.java      |    2 +-
 .../odata2/testutil/server/TestServer.java      |    2 +-
 odata2-processor-jpa/jpa-api/.gitignore         |    8 -
 odata2-processor-jpa/jpa-api/pom.xml            |   91 --
 .../jpa-api/src/main/java/META-INF/MANIFEST.MF  |    3 -
 .../processor/api/jpa/ODataJPAContext.java      |  206 ---
 .../processor/api/jpa/ODataJPAProcessor.java    |   69 -
 .../api/jpa/ODataJPAServiceFactory.java         |  190 ---
 .../processor/api/jpa/access/JPAEdmBuilder.java |   57 -
 .../jpa/access/JPAEdmMappingModelAccess.java    |  191 ---
 .../processor/api/jpa/access/JPAFunction.java   |   85 --
 .../processor/api/jpa/access/JPAJoinClause.java |  148 ---
 .../api/jpa/access/JPAMethodContext.java        |  130 --
 .../api/jpa/access/JPAMethodContextView.java    |   46 -
 .../processor/api/jpa/access/JPAProcessor.java  |  260 ----
 .../processor/api/jpa/access/package-info.java  |   26 -
 .../jpa/exception/ODataJPAErrorCallback.java    |   45 -
 .../api/jpa/exception/ODataJPAException.java    |   68 -
 .../jpa/exception/ODataJPAMessageService.java   |   49 -
 .../jpa/exception/ODataJPAModelException.java   |   92 --
 .../jpa/exception/ODataJPARuntimeException.java |   97 --
 .../api/jpa/exception/package-info.java         |   31 -
 .../api/jpa/factory/JPAAccessFactory.java       |   69 -
 .../api/jpa/factory/JPQLBuilderFactory.java     |   77 --
 .../api/jpa/factory/ODataJPAAccessFactory.java  |   82 --
 .../api/jpa/factory/ODataJPAFactory.java        |  105 --
 .../processor/api/jpa/factory/package-info.java |   33 -
 .../processor/api/jpa/jpql/JPQLContext.java     |  204 ---
 .../processor/api/jpa/jpql/JPQLContextType.java |   73 -
 .../processor/api/jpa/jpql/JPQLContextView.java |   53 -
 .../api/jpa/jpql/JPQLJoinContextView.java       |   44 -
 .../jpql/JPQLJoinSelectSingleContextView.java   |   45 -
 .../api/jpa/jpql/JPQLSelectContextView.java     |   62 -
 .../jpa/jpql/JPQLSelectSingleContextView.java   |   53 -
 .../processor/api/jpa/jpql/JPQLStatement.java   |  148 ---
 .../processor/api/jpa/jpql/package-info.java    |   27 -
 .../api/jpa/model/JPAEdmAssociationEndView.java |   91 --
 .../api/jpa/model/JPAEdmAssociationSetView.java |   69 -
 .../api/jpa/model/JPAEdmAssociationView.java    |  128 --
 .../processor/api/jpa/model/JPAEdmBaseView.java |  101 --
 .../jpa/model/JPAEdmComplexPropertyView.java    |   45 -
 .../api/jpa/model/JPAEdmComplexTypeView.java    |  116 --
 .../jpa/model/JPAEdmEntityContainerView.java    |   72 -
 .../api/jpa/model/JPAEdmEntitySetView.java      |   64 -
 .../api/jpa/model/JPAEdmEntityTypeView.java     |   76 --
 .../api/jpa/model/JPAEdmExtension.java          |   50 -
 .../api/jpa/model/JPAEdmFunctionImportView.java |   51 -
 .../processor/api/jpa/model/JPAEdmKeyView.java  |   51 -
 .../processor/api/jpa/model/JPAEdmMapping.java  |   63 -
 .../api/jpa/model/JPAEdmModelView.java          |   43 -
 .../jpa/model/JPAEdmNavigationPropertyView.java |   72 -
 .../api/jpa/model/JPAEdmPropertyView.java       |  104 --
 .../JPAEdmReferentialConstraintRoleView.java    |  101 --
 .../model/JPAEdmReferentialConstraintView.java  |   69 -
 .../api/jpa/model/JPAEdmSchemaView.java         |  116 --
 .../jpa/model/mapping/JPAAttributeMapType.java  |  202 ---
 .../jpa/model/mapping/JPAEdmMappingModel.java   |   79 --
 .../mapping/JPAEdmMappingModelFactory.java      |   85 --
 .../model/mapping/JPAEmbeddableTypeMapType.java |  161 ---
 .../mapping/JPAEmbeddableTypesMapType.java      |   89 --
 .../jpa/model/mapping/JPAEntityTypeMapType.java |  213 ---
 .../model/mapping/JPAEntityTypesMapType.java    |   89 --
 .../mapping/JPAPersistenceUnitMapType.java      |  157 ---
 .../model/mapping/JPARelationshipMapType.java   |  175 ---
 .../api/jpa/model/mapping/package-info.java     |   28 -
 .../processor/api/jpa/model/package-info.java   |   27 -
 .../odata2/processor/api/jpa/package-info.java  |   33 -
 .../src/main/resources/JPAEDMMappingModel.xsd   |  165 ---
 odata2-processor-jpa/jpa-core/.gitignore        |    8 -
 odata2-processor-jpa/jpa-core/pom.xml           |  146 --
 .../jpa-core/src/main/java/META-INF/MANIFEST.MF |    3 -
 .../processor/core/jpa/ODataEntityParser.java   |  163 ---
 .../core/jpa/ODataExpressionParser.java         |  381 ------
 .../processor/core/jpa/ODataJPAContextImpl.java |  146 --
 .../core/jpa/ODataJPAProcessorDefault.java      |  194 ---
 .../core/jpa/ODataJPAResponseBuilder.java       |  629 ---------
 .../core/jpa/access/data/JPAEntity.java         |  355 -----
 .../core/jpa/access/data/JPAEntityParser.java   |  453 -------
 .../core/jpa/access/data/JPAExpandCallBack.java |  180 ---
 .../jpa/access/data/JPAFunctionContext.java     |  170 ---
 .../processor/core/jpa/access/data/JPALink.java |  225 ----
 .../core/jpa/access/data/JPAProcessorImpl.java  |  491 -------
 .../core/jpa/access/model/EdmTypeConvertor.java |   69 -
 .../access/model/JPAEdmMappingModelService.java |  247 ----
 .../jpa/access/model/JPAEdmNameBuilder.java     |  499 -------
 .../core/jpa/access/model/JPATypeConvertor.java |  101 --
 .../core/jpa/edm/ODataJPAEdmProvider.java       |  295 -----
 .../ODataJPAMessageServiceDefault.java          |  122 --
 .../core/jpa/factory/ODataJPAFactoryImpl.java   |  237 ----
 .../core/jpa/jpql/JPQLJoinSelectContext.java    |  171 ---
 .../jpa/jpql/JPQLJoinSelectSingleContext.java   |  158 ---
 .../JPQLJoinSelectSingleStatementBuilder.java   |  106 --
 .../core/jpa/jpql/JPQLJoinStatementBuilder.java |  145 --
 .../core/jpa/jpql/JPQLSelectContext.java        |  159 ---
 .../core/jpa/jpql/JPQLSelectSingleContext.java  |  109 --
 .../jpql/JPQLSelectSingleStatementBuilder.java  |   66 -
 .../jpa/jpql/JPQLSelectStatementBuilder.java    |   98 --
 .../core/jpa/model/JPAEdmAssociation.java       |  237 ----
 .../core/jpa/model/JPAEdmAssociationEnd.java    |  183 ---
 .../core/jpa/model/JPAEdmAssociationSet.java    |  131 --
 .../core/jpa/model/JPAEdmBaseViewImpl.java      |  101 --
 .../core/jpa/model/JPAEdmComplexType.java       |  254 ----
 .../core/jpa/model/JPAEdmEntityContainer.java   |  154 ---
 .../core/jpa/model/JPAEdmEntitySet.java         |  112 --
 .../core/jpa/model/JPAEdmEntityType.java        |  230 ----
 .../processor/core/jpa/model/JPAEdmFacets.java  |   94 --
 .../core/jpa/model/JPAEdmFunctionImport.java    |  311 -----
 .../processor/core/jpa/model/JPAEdmKey.java     |  129 --
 .../core/jpa/model/JPAEdmMappingImpl.java       |   51 -
 .../processor/core/jpa/model/JPAEdmModel.java   |   65 -
 .../jpa/model/JPAEdmNavigationProperty.java     |   98 --
 .../core/jpa/model/JPAEdmProperty.java          |  378 ------
 .../jpa/model/JPAEdmReferentialConstraint.java  |  147 --
 .../model/JPAEdmReferentialConstraintRole.java  |  258 ----
 .../processor/core/jpa/model/JPAEdmSchema.java  |  216 ---
 .../main/resources/jpaprocessor_msg.properties  |   61 -
 .../jpa-core/src/test/java/META-INF/MANIFEST.MF |    3 -
 .../core/jpa/ODataExpressionParserTest.java     |  515 -------
 .../core/jpa/ODataJPAContextImplTest.java       |   98 --
 .../core/jpa/ODataJPAProcessorDefaultTest.java  |  554 --------
 .../core/jpa/ODataJPAResponseBuilderTest.java   |  566 --------
 .../jpa/access/data/JPAEntityParserTest.java    |  599 ---------
 .../JPAEntityParserTestForStaticMethods.java    |  251 ----
 .../core/jpa/access/data/JPAEntityTest.java     |  187 ---
 .../jpa/access/data/JPAExpandCallBackTest.java  |  160 ---
 .../jpa/access/data/JPAFunctionContextTest.java |  143 --
 .../jpa/access/data/JPAProcessorImplTest.java   |  447 -------
 .../model/JPAEdmMappingModelServiceTest.java    |  213 ---
 .../jpa/access/model/JPAEdmNameBuilderTest.java |  151 ---
 .../jpa/access/model/JPATypeConvertorTest.java  |   94 --
 .../core/jpa/common/ODataJPATestConstants.java  |   27 -
 .../edm/ODataJPAEdmProviderNegativeTest.java    |  191 ---
 .../core/jpa/edm/ODataJPAEdmProviderTest.java   |  385 ------
 .../core/jpa/jpql/JPQLBuilderFactoryTest.java   |  377 ------
 .../core/jpa/jpql/JPQLJoinContextTest.java      |  198 ---
 .../jpql/JPQLJoinSelectSingleContextTest.java   |  215 ---
 ...PQLJoinSelectSingleStatementBuilderTest.java |  142 --
 .../jpa/jpql/JPQLJoinStatementBuilderTest.java  |  124 --
 .../jpa/jpql/JPQLSelectContextImplTest.java     |  385 ------
 .../jpql/JPQLSelectSingleContextImplTest.java   |  198 ---
 .../JPQLSelectSingleStatementBuilderTest.java   |  123 --
 .../jpql/JPQLSelectStatementBuilderTest.java    |  135 --
 .../core/jpa/mock/ODataJPAContextMock.java      |   57 -
 .../core/jpa/mock/data/EdmMockUtil.java         |  337 -----
 .../core/jpa/mock/data/EdmMockUtilV2.java       |  324 -----
 .../core/jpa/mock/data/JPATypeMock.java         |  205 ---
 .../core/jpa/mock/data/ODataEntryMockUtil.java  |  127 --
 .../core/jpa/mock/data/SalesOrderHeader.java    |   63 -
 .../core/jpa/mock/data/SalesOrderLineItem.java  |   38 -
 .../jpa/mock/data/SalesOrderLineItemKey.java    |   52 -
 .../core/jpa/mock/model/EdmSchemaMock.java      |  213 ---
 .../core/jpa/mock/model/JPAAttributeMock.java   |   63 -
 .../jpa/mock/model/JPACustomProcessorMock.java  |   76 --
 .../model/JPACustomProcessorNegativeMock.java   |   69 -
 .../core/jpa/mock/model/JPAEdmMockData.java     |   72 -
 .../core/jpa/mock/model/JPAEmbeddableMock.java  |  184 ---
 .../jpa/mock/model/JPAEmbeddableTypeMock.java   |  184 ---
 .../core/jpa/mock/model/JPAEntityTypeMock.java  |  246 ----
 .../core/jpa/mock/model/JPAJavaMemberMock.java  |   74 --
 .../core/jpa/mock/model/JPAManagedTypeMock.java |  184 ---
 .../core/jpa/mock/model/JPAMetaModelMock.java   |   60 -
 .../jpa/mock/model/JPAPluralAttributeMock.java  |   95 --
 .../mock/model/JPASingularAttributeMock.java    |   94 --
 .../jpa/model/JPAEdmAssociationEndTest.java     |  177 ---
 .../jpa/model/JPAEdmAssociationSetTest.java     |  184 ---
 .../core/jpa/model/JPAEdmAssociationTest.java   |  422 ------
 .../core/jpa/model/JPAEdmBaseViewImplTest.java  |   89 --
 .../core/jpa/model/JPAEdmComplexTypeTest.java   |  268 ----
 .../jpa/model/JPAEdmEntityContainerTest.java    |  234 ----
 .../core/jpa/model/JPAEdmEntitySetTest.java     |  224 ----
 .../core/jpa/model/JPAEdmEntityTypeTest.java    |  198 ---
 .../jpa/model/JPAEdmFunctionImportTest.java     |  575 --------
 .../processor/core/jpa/model/JPAEdmKeyTest.java |  176 ---
 .../core/jpa/model/JPAEdmModelTest.java         |  145 --
 .../jpa/model/JPAEdmNavigationPropertyTest.java |  218 ---
 .../core/jpa/model/JPAEdmPropertyTest.java      |  440 ------
 .../JPAEdmReferentialConstraintRoleTest.java    |  233 ----
 .../model/JPAEdmReferentialConstraintTest.java  |  177 ---
 .../core/jpa/model/JPAEdmSchemaTest.java        |  103 --
 .../core/jpa/model/JPAEdmTestModelView.java     |  396 ------
 .../SalesOrderProcessingMappingModels.xml       |   62 -
 odata2-processor-jpa/jpa-ref/.gitignore         |    8 -
 odata2-processor-jpa/jpa-ref/pom.xml            |  109 --
 .../ref/factory/JPAEntityManagerFactory.java    |   46 -
 .../odata2/jpa/processor/ref/model/Address.java |   83 --
 .../jpa/processor/ref/model/Material.java       |  116 --
 .../odata2/jpa/processor/ref/model/Note.java    |  116 --
 .../processor/ref/model/SalesOrderHeader.java   |  236 ----
 .../jpa/processor/ref/model/SalesOrderItem.java |  133 --
 .../processor/ref/model/SalesOrderItemKey.java  |   89 --
 .../odata2/jpa/processor/ref/model/Store.java   |   92 --
 .../src/main/resources/META-INF/persistence.xml |   46 -
 odata2-processor-jpa/jpa-web/.gitignore         |    8 -
 odata2-processor-jpa/jpa-web/pom.xml            |  123 --
 .../extension/SalesOrderHeaderProcessor.java    |  126 --
 .../SalesOrderProcessingExtension.java          |   38 -
 .../jpa/processor/ref/util/DataGenerator.java   |  158 ---
 .../ref/web/JPAReferenceServiceFactory.java     |   56 -
 .../main/resources/DataDeleteSQLs.properties    |   22 -
 .../jpa-web/src/main/resources/META-INF/LICENSE | 1252 ------------------
 .../src/main/resources/MaterialSQLs.properties  |   30 -
 .../src/main/resources/NoteSQLs.properties      |   20 -
 .../main/resources/SQLInsertConfig.properties   |   22 -
 .../resources/SalesOrderHeaderSQLs.properties   |   30 -
 .../resources/SalesOrderItemSQLs.properties     |   30 -
 .../src/main/resources/StoreSQLs.properties     |   30 -
 .../src/main/resources/serviceConfig.properties |   19 -
 .../webapp/SalesOrderProcessingMappingModel.xml |   62 -
 .../jpa-web/src/main/webapp/WEB-INF/web.xml     |   47 -
 .../jpa-web/src/main/webapp/index.jsp           |  312 -----
 odata2-processor-jpa/pom.xml                    |   31 -
 pom.xml                                         |    2 +-
 534 files changed, 35388 insertions(+), 33483 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/6ac9c522/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/processor/ListsProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/6ac9c522/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
----------------------------------------------------------------------