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/5cb6e15f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/5cb6e15f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/5cb6e15f Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: 5cb6e15fc683d2b1b4934a537613ab46d976ca6a Parents: 13b276f f86e307 Author: Michael Bolz <[email protected]> Authored: Sun May 18 00:04:06 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Sun May 18 00:04:06 2014 +0200 ---------------------------------------------------------------------- DISCLAIMER | 16 -- README | 2 +- .../annotation-processor-api/pom.xml | 8 +- .../processor/api/AnnotationServiceFactory.java | 2 +- .../annotation-processor-core/pom.xml | 16 +- .../processor/core/ListsProcessor.java | 11 +- .../core/edm/AnnotationEdmProvider.java | 62 ++-- .../processor/core/util/AnnotationHelper.java | 2 +- .../core/util/AnnotationRuntimeException.java | 8 +- .../processor/core/util/ClassHelper.java | 53 ++-- .../core/edm/AnnotationEdmProviderTest.java | 2 +- .../processor/core/util/ClassHelperTest.java | 33 ++- .../annotation-processor-ref/pom.xml | 16 +- .../annotation/processor/ref/model/City.java | 2 +- .../processor/ref/model/Location.java | 2 +- .../processor/ref/AbstractRefJsonTest.java | 2 +- .../processor/ref/AbstractRefTest.java | 2 +- .../processor/ref/AbstractRefXmlTest.java | 2 +- .../processor/ref/EntryJsonCreateTest.java | 60 ++-- .../processor/ref/ServiceJsonTest.java | 2 +- .../processor/ref/ServiceXmlTest.java | 2 +- .../annotation-processor-web/pom.xml | 10 +- odata2-annotation-processor/pom.xml | 6 +- odata2-dist/janos/pom.xml | 16 +- .../janos/src/main/assembly/janos-assembly.xml | 10 +- odata2-dist/javadoc/pom.xml | 6 +- odata2-dist/jpa/pom.xml | 16 +- .../jpa/src/main/assembly/jpa-assembly.xml | 10 +- odata2-dist/lib/pom.xml | 12 +- .../lib/src/main/assembly/lib-assembly.xml | 6 +- odata2-dist/pom.xml | 6 +- odata2-dist/ref/pom.xml | 22 +- odata2-jpa-processor/jpa-api/pom.xml | 8 +- .../processor/api/ODataJPAServiceFactory.java | 17 ++ .../jpa/processor/api/OnJPAWriteContent.java | 54 ++++ .../api/exception/ODataJPARuntimeException.java | 4 + odata2-jpa-processor/jpa-core/pom.xml | 14 +- .../processor/core/access/data/JPAEntity.java | 66 +++-- .../core/access/data/JPAEntityParser.java | 105 +++++++ .../core/access/model/JPAEdmNameBuilder.java | 6 +- .../core/access/model/JPATypeConvertor.java | 41 ++- .../core/model/JPAEdmFunctionImport.java | 1 - .../processor/core/model/JPAEdmProperty.java | 9 +- .../main/resources/jpaprocessor_msg.properties | 2 + .../JPAEntityParserTestForStaticMethods.java | 79 +++++ .../core/access/data/JPAEntityTest.java | 71 ++++- .../access/model/JPAEdmNameBuilderTest.java | 4 +- .../processor/core/mock/ODataContextMock.java | 14 + .../core/mock/ODataJPAContextMock.java | 1 + .../core/mock/ODataJPAServiceFactoryMock.java | 47 +++ .../core/mock/OnJPAWriteContentMock.java | 58 ++++ .../processor/core/mock/data/EdmMockUtilV2.java | 57 +++- .../processor/core/mock/data/JPATypeMock.java | 63 ++++ .../core/mock/data/ODataEntryMockUtil.java | 16 +- .../model/JPACustomProcessorNegativeMock.java | 2 +- .../core/model/JPAEdmAssociationTest.java | 10 +- odata2-jpa-processor/jpa-ref/pom.xml | 44 ++- .../ref/converter/BlobToByteConverter.java | 64 +++++ .../jpa/processor/ref/model/Material.java | 21 ++ .../odata2/jpa/processor/ref/model/Note.java | 13 +- .../odata2/jpa/processor/ref/model/NoteKey.java | 83 ++++++ .../src/main/resources/META-INF/persistence.xml | 4 + odata2-jpa-processor/jpa-web/pom.xml | 236 +++++++-------- .../ref/extension/OnDBWriteContent.java | 55 ++++ .../ref/web/JPAReferenceServiceFactory.java | 4 + .../main/resources/SQL_Insert_Note.properties | 2 +- odata2-jpa-processor/pom.xml | 6 +- odata2-lib/odata-annotation/pom.xml | 6 +- odata2-lib/odata-api/pom.xml | 6 +- .../odata2/api/edm/EdmEntityContainer.java | 22 ++ .../olingo/odata2/api/ep/EntityProvider.java | 24 ++ .../api/ep/EntityProviderReadProperties.java | 19 +- .../api/ep/EntityProviderWriteProperties.java | 27 +- .../api/exception/ODataMessageException.java | 8 +- .../olingo/odata2/api/rt/RuntimeDelegate.java | 2 +- odata2-lib/odata-core/pom.xml | 10 +- .../olingo/odata2/core/ODataContextImpl.java | 2 +- .../olingo/odata2/core/ODataRequestHandler.java | 9 +- .../odata2/core/batch/BatchRequestParser.java | 102 ++++--- .../odata2/core/batch/BatchRequestWriter.java | 24 +- .../odata2/core/batch/BatchResponseParser.java | 11 +- .../olingo/odata2/core/commons/XmlHelper.java | 4 + .../olingo/odata2/core/debug/DebugInfoBody.java | 4 +- .../odata2/core/debug/DebugInfoException.java | 6 +- .../odata2/core/debug/DebugInfoRequest.java | 2 +- .../odata2/core/debug/DebugInfoResponse.java | 4 +- .../odata2/core/debug/DebugInfoRuntime.java | 4 +- .../odata2/core/debug/DebugInfoServer.java | 8 +- .../olingo/odata2/core/debug/DebugInfoUri.java | 8 +- .../core/debug/ODataDebugResponseWrapper.java | 35 +-- .../olingo/odata2/core/edm/EdmDouble.java | 8 - .../provider/EdmEntityContainerImplProv.java | 111 +++++++- .../odata2/core/ep/AtomEntityProvider.java | 8 + .../core/ep/ContentTypeBasedEntityProvider.java | 3 + .../odata2/core/ep/JsonEntityProvider.java | 6 + .../odata2/core/ep/ProviderFacadeImpl.java | 6 + .../core/ep/consumer/JsonEntryConsumer.java | 23 +- .../ep/consumer/JsonErrorDocumentConsumer.java | 244 ++++++++++++++++ .../core/ep/consumer/JsonFeedConsumer.java | 3 +- .../core/ep/consumer/JsonPropertyConsumer.java | 33 ++- .../core/ep/consumer/XmlEntityConsumer.java | 7 +- .../core/ep/consumer/XmlEntryConsumer.java | 42 +-- .../ep/consumer/XmlErrorDocumentConsumer.java | 184 ++++++++++++ .../core/ep/consumer/XmlFeedConsumer.java | 2 +- .../core/ep/consumer/XmlPropertyConsumer.java | 32 ++- .../ep/producer/AtomEntryEntityProducer.java | 36 ++- .../ep/producer/JsonEntryEntityProducer.java | 21 +- .../odata2/core/rest/ODataSubLocator.java | 2 +- .../odata2/core/rt/RuntimeDelegateImpl.java | 2 +- .../core/servlet/ODataExceptionWrapper.java | 2 +- .../odata2/core/servlet/ODataServlet.java | 2 +- .../olingo/odata2/core/servlet/RestUtil.java | 18 +- .../odata2/core/ContentNegotiatorTest.java | 8 + .../core/batch/BatchRequestParserTest.java | 2 + .../odata2/core/batch/BatchRequestTest.java | 285 +++++++++++++++++++ .../core/batch/BatchRequestWriterTest.java | 22 +- .../core/batch/BatchResponseParserTest.java | 1 - .../odata2/core/batch/BatchResponseTest.java | 141 +++++++++ .../debug/ODataDebugResponseWrapperTest.java | 30 +- .../EdmEntityContainerImplProvTest.java | 105 +++++-- .../ep/ODataEntityProviderPropertiesTest.java | 9 + .../odata2/core/ep/ProviderFacadeImplTest.java | 35 ++- .../core/ep/consumer/JsonEntryConsumerTest.java | 27 ++ .../consumer/JsonEntryDeepInsertEntryTest.java | 18 ++ .../consumer/JsonErrorDocumentConsumerTest.java | 233 +++++++++++++++ .../core/ep/consumer/JsonFeedConsumerTest.java | 2 + .../ep/consumer/JsonPropertyConsumerTest.java | 53 +++- .../core/ep/consumer/XmlEntityConsumerTest.java | 19 +- .../consumer/XmlErrorDocumentConsumerTest.java | 280 ++++++++++++++++++ .../core/ep/consumer/XmlFeedConsumerTest.java | 27 ++ .../ep/consumer/XmlPropertyConsumerTest.java | 103 +++++-- .../core/ep/producer/AtomEntryProducerTest.java | 30 ++ .../producer/JsonEntryEntityProducerTest.java | 24 ++ .../core/exception/ODataExceptionTest.java | 11 +- .../resources/JsonInlineRoomWithInlineNull.json | 44 +++ .../odata-core/src/test/resources/JsonRoom.json | 24 ++ .../src/test/resources/batchResponse.batch | 2 - .../src/test/resources/feed_rooms_small.xml | 69 +++++ odata2-lib/odata-fit/pom.xml | 18 +- .../odata2/fit/basic/ServiceResolutionTest.java | 18 ++ .../odata2/fit/ref/AbstractRefJsonTest.java | 2 +- .../odata2/fit/ref/EntryJsonChangeTest.java | 30 +- .../odata2/fit/ref/FunctionImportXmlTest.java | 68 ++++- .../BasicContentNegotiationTest.java | 2 +- odata2-lib/odata-ref/pom.xml | 12 +- odata2-lib/odata-testutil/pom.xml | 10 +- .../odata2/testutil/fit/AbstractFitTest.java | 11 +- .../testutil/fit/FitStaticServiceFactory.java | 2 +- .../odata2/testutil/helper/StringHelper.java | 99 ++++++- .../odata2/testutil/server/TestServer.java | 42 +-- odata2-lib/odata-web/pom.xml | 10 +- odata2-lib/pom.xml | 6 +- odata2-sample/cars-annotation-archetype/pom.xml | 8 +- .../main/resources/archetype-resources/pom.xml | 12 +- odata2-sample/cars-jpa-archetype/pom.xml | 6 +- .../main/resources/archetype-resources/pom.xml | 12 +- odata2-sample/cars-service-archetype/pom.xml | 8 +- .../main/resources/archetype-resources/pom.xml | 4 +- odata2-sample/pom.xml | 6 +- pom.xml | 13 +- 160 files changed, 4002 insertions(+), 849 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/5cb6e15f/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/5cb6e15f/odata2-annotation-processor/annotation-processor-core/pom.xml ---------------------------------------------------------------------- diff --cc odata2-annotation-processor/annotation-processor-core/pom.xml index d6d0bc9,c91fba4..f0ac6e2 --- a/odata2-annotation-processor/annotation-processor-core/pom.xml +++ b/odata2-annotation-processor/annotation-processor-core/pom.xml @@@ -1,19 -1,19 +1,19 @@@ <?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file 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 KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +license agreements. See the NOTICE file distributed with this work for additional +information regarding copyright ownership. The ASF licenses this file 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 KIND, either express or implied. See the License for the specific +language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId> + <artifactId>olingo-odata2-annotation-processor-core</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/5cb6e15f/odata2-annotation-processor/annotation-processor-ref/pom.xml ---------------------------------------------------------------------- diff --cc odata2-annotation-processor/annotation-processor-ref/pom.xml index 47951bc,c014d2e..5ec0c5b --- a/odata2-annotation-processor/annotation-processor-ref/pom.xml +++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml @@@ -1,19 -1,19 +1,19 @@@ <?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file 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 KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +license agreements. See the NOTICE file distributed with this work for additional +information regarding copyright ownership. The ASF licenses this file 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 KIND, either express or implied. See the License for the specific +language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>olingo-odata2-annotation-processor-ref-incubating</artifactId> + <artifactId>olingo-odata2-annotation-processor-ref</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> @@@ -68,32 -68,8 +68,32 @@@ <dependencies> <dependency> + <!-- required because of auto detection of web facet 2.5 --> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>javax.persistence</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.10</version> + </dependency> + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>eclipselink</artifactId> + <version>2.5.1</version> + </dependency> + + <dependency> <groupId>org.apache.olingo</groupId> - <artifactId>olingo-odata2-api-incubating</artifactId> + <artifactId>olingo-odata2-api</artifactId> <version>${project.version}</version> </dependency> <dependency>
