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 2015/05/29 18:45:32 UTC
[1/8] olingo-odata4 git commit: [OLINGO-632] make Olingo jars to OSGi
bundles
Repository: olingo-odata4
Updated Branches:
refs/heads/master 725f7a9b2 -> fd71b7ebd
[OLINGO-632] make Olingo jars to OSGi bundles
Signed-off-by: Michael Bolz <mi...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8aa2d4d7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8aa2d4d7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8aa2d4d7
Branch: refs/heads/master
Commit: 8aa2d4d7d1f430b4fead56a8cc1a0de74f178a75
Parents: 9729428
Author: Aki Yoshida <el...@gmail.com>
Authored: Sat Apr 18 18:00:09 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed May 13 08:48:41 2015 +0200
----------------------------------------------------------------------
lib/client-api/pom.xml | 23 +++++++++++++++++++++--
lib/client-core/pom.xml | 18 +++++++++++++++++-
lib/commons-api/pom.xml | 22 ++++++++++++++++++++--
lib/commons-core/pom.xml | 23 ++++++++++++++++++++++-
lib/server-api/pom.xml | 26 ++++++++++++++++++++++++--
lib/server-core/pom.xml | 18 +++++++++++++++++-
pom.xml | 10 ++++++++--
7 files changed, 129 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/client-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index 3a9adf4..1340edf 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-client-api</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -50,5 +50,24 @@
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- REVISIT should be restricing the exports? -->
+ <Export-Package>
+ org.apache.olingo.client.api*
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/client-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml
index 55acb0c..ec9e2a9 100644
--- a/lib/client-core/pom.xml
+++ b/lib/client-core/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-client-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -77,6 +77,22 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- REVISIT should be restricing the exports? -->
+ <Export-Package>
+ org.apache.olingo.client.core*
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
<resources>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/commons-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index c286042..55ca40d 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-commons-api</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -55,5 +55,23 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.olingo.commons.api*
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/commons-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index d5bbcb1..f290e96 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-commons-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -77,4 +77,25 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.olingo.commons.core,
+ org.apache.olingo.commons.core.edm.provider,
+ org.apache.olingo.commons.core.edm.primitivetype,
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index e331f0f..393939f 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-server-api</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -51,5 +51,27 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.olingo.server.api*
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ <!-- workaround due to the current server-api server-core interdependency -->
+ <DynamicImport-Package>
+ org.apache.olingo.server.core
+ </DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/lib/server-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index f081ebc..1c2d1f5 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>odata-server-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>${project.artifactId}</name>
<parent>
@@ -78,6 +78,7 @@
<build>
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -114,6 +115,21 @@
<libDirectory>src/main/antlr4/org/apache/olingo/server/core/uri/antlr</libDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.olingo.server.core
+ </Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8aa2d4d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 235f30f..56dd4be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,10 +80,11 @@
<velocity.version>1.7</velocity.version>
<maven.plugin.api.version>3.2.2</maven.plugin.api.version>
<maven.plugin.tools.version>3.3</maven.plugin.tools.version>
-
+ <maven.bundle.plugin.version>2.3.4</maven.bundle.plugin.version>
<hc.client.version>4.2.6</hc.client.version>
<jackson.version>2.4.2</jackson.version>
- <aalto-xml.version>0.9.9</aalto-xml.version>
+ <!-- stay with aalto-xml-0.9.8 because 0.9.9 is not a bundle -->
+ <aalto-xml.version>0.9.8</aalto-xml.version>
<antlr.version>4.1</antlr.version>
@@ -131,6 +132,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.plugin.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${hc.client.version}</version>
[6/8] olingo-odata4 git commit: [OLINGO-632] Merge branch 'master'
into OLINGO-632_OSGi-Support
Posted by mi...@apache.org.
[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/934d81db
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/934d81db
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/934d81db
Branch: refs/heads/master
Commit: 934d81db63e39ab29b7d87fcf10f9dd82005fa39
Parents: 8fc7782 91c2f6a
Author: Michael Bolz <mi...@sap.com>
Authored: Fri May 29 11:57:06 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri May 29 11:57:06 2015 +0200
----------------------------------------------------------------------
.../ActionComplexCollectionProcessor.java | 2 +-
.../api/processor/ActionComplexProcessor.java | 2 +-
.../ActionEntityCollectionProcessor.java | 2 +-
.../api/processor/ActionEntityProcessor.java | 2 +-
.../ActionPrimitiveCollectionProcessor.java | 2 +-
.../api/processor/ActionPrimitiveProcessor.java | 2 +-
.../olingo/server/tecsvc/TechnicalServlet.java | 4 +-
.../processor/TechnicalActionProcessor.java | 315 +++++++++++++++++++
.../processor/TechnicalEntityProcessor.java | 159 ++--------
.../TechnicalPrimitiveComplexProcessor.java | 154 +--------
10 files changed, 355 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
[7/8] olingo-odata4 git commit: [OLINGO-632] Export
'org.apache.olingo.commons.core.serialization' package
Posted by mi...@apache.org.
[OLINGO-632] Export 'org.apache.olingo.commons.core.serialization' package
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0ff0fc1b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0ff0fc1b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0ff0fc1b
Branch: refs/heads/master
Commit: 0ff0fc1b1618f252394e4af5c23d3cfc4e284c0b
Parents: 934d81d
Author: Michael Bolz <mi...@sap.com>
Authored: Fri May 29 14:53:54 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri May 29 14:55:28 2015 +0200
----------------------------------------------------------------------
lib/commons-core/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0ff0fc1b/lib/commons-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index 2f0f319..c6d6f98 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -90,6 +90,7 @@
org.apache.olingo.commons.core.edm,
org.apache.olingo.commons.core.edm.provider,
org.apache.olingo.commons.core.edm.primitivetype,
+ org.apache.olingo.commons.core.serialization
</Export-Package>
<Import-Package>
*
[3/8] olingo-odata4 git commit: [OLINGO-632] Merge branch 'master'
into OLINGO-632_OSGi-Support
Posted by mi...@apache.org.
[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cd8d77c7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cd8d77c7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cd8d77c7
Branch: refs/heads/master
Commit: cd8d77c7bb1620670442afd16df2cfa6d36eb417
Parents: c536ce3 0c511f8
Author: Michael Bolz <mi...@sap.com>
Authored: Tue May 26 14:31:26 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue May 26 14:31:26 2015 +0200
----------------------------------------------------------------------
.../fit/tecsvc/client/ConditionalITCase.java | 80 +++
.../tecsvc/client/EntityReferencesITCase.java | 215 +++++++
.../olingo/fit/tecsvc/client/MediaITCase.java | 4 +
.../fit/tecsvc/http/EntityReferenceITCase.java | 91 +++
.../core/edm/primitivetype/EdmBooleanTest.java | 4 +-
.../olingo/server/api/ClientServerError.java | 143 -----
.../olingo/server/api/EtagInformation.java | 72 +++
.../org/apache/olingo/server/api/OData.java | 15 +-
.../olingo/server/api/ODataServerError.java | 143 +++++
.../server/api/processor/DefaultProcessor.java | 7 +-
.../server/api/processor/ErrorProcessor.java | 4 +-
.../server/api/serializer/ODataSerializer.java | 32 +-
.../apache/olingo/server/core/ErrorHandler.java | 26 +-
.../server/core/responses/EntityResponse.java | 4 +-
.../core/responses/EntitySetResponse.java | 4 +-
.../server/core/responses/MetadataResponse.java | 4 +-
.../server/core/responses/PropertyResponse.java | 4 +-
.../core/responses/ServiceDocumentResponse.java | 4 +-
.../apache/olingo/server/core/EtagParser.java | 86 +++
.../server/core/ODataExceptionHelper.java | 50 +-
.../apache/olingo/server/core/ODataHandler.java | 24 +-
.../server/core/ODataHttpHandlerImpl.java | 4 +-
.../apache/olingo/server/core/ODataImpl.java | 11 +
.../serializer/json/ODataJsonSerializer.java | 100 +++-
.../serializer/xml/ODataXmlSerializerImpl.java | 20 +-
.../server/core/uri/validator/UriValidator.java | 124 ++--
.../olingo/server/core/EtagParserTest.java | 131 +++++
.../json/ClientErrorSerializerTest.java | 136 -----
.../json/ServerErrorSerializerTest.java | 136 +++++
.../olingo/server/tecsvc/data/DataCreator.java | 589 +++++++++++++++----
.../olingo/server/tecsvc/data/DataProvider.java | 63 +-
.../processor/TechnicalEntityProcessor.java | 308 +++++++---
.../olingo/server/core/ODataHandlerTest.java | 4 +-
.../json/ODataJsonSerializerTest.java | 91 ++-
.../core/uri/antlr/TestFullResourcePath.java | 5 +-
.../core/uri/validator/UriValidatorTest.java | 203 ++++++-
pom.xml | 1 +
samples/client/pom.xml | 8 +
.../core/http/CookieHttpClientFactory.java | 2 +-
.../CustomConnectionsHttpClientFactory.java | 2 +-
.../core/http/ParametersHttpClientFactory.java | 2 +-
.../http/ParametersHttpUriRequestFactory.java | 2 +-
.../ProtocolInterceptorHttpClientFactory.java | 2 +-
.../http/RequestRetryHttpClientFactory.java | 2 +-
.../http/SocketFactoryHttpClientFactory.java | 2 +-
.../core/http/StatefulHttpClientFactory.java | 2 +-
46 files changed, 2273 insertions(+), 693 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cd8d77c7/pom.xml
----------------------------------------------------------------------
[5/8] olingo-odata4 git commit: [OLINGO-632] Merge branch 'master'
into OLINGO-632_OSGi-Support
Posted by mi...@apache.org.
[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8fc77829
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8fc77829
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8fc77829
Branch: refs/heads/master
Commit: 8fc77829b024259fd5ca094bc361d70764dbe7f2
Parents: 41edf2d 7ad5b0f
Author: Michael Bolz <mi...@sap.com>
Authored: Fri May 29 10:56:26 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri May 29 10:56:26 2015 +0200
----------------------------------------------------------------------
.../fit/tecsvc/client/ConditionalITCase.java | 156 +++++-
.../olingo/fit/tecsvc/client/MediaITCase.java | 6 +-
.../tecsvc/client/PrimitiveComplexITCase.java | 121 +++-
.../olingo/server/api/CustomETagSupport.java | 50 ++
.../olingo/server/api/EtagInformation.java | 4 +-
.../olingo/server/api/ODataHttpHandler.java | 6 +
.../olingo/server/core/ODataDispatcher.java | 560 +++++++++++++++++++
.../server/core/ODataExceptionHelper.java | 16 +-
.../apache/olingo/server/core/ODataHandler.java | 527 +----------------
.../server/core/ODataHttpHandlerImpl.java | 6 +
.../core/PreconditionRequiredException.java | 50 ++
.../server/core/PreconditionsValidator.java | 138 +++++
.../server-core-exceptions-i18n.properties | 4 +-
.../olingo/server/tecsvc/ETagSupport.java | 34 ++
.../olingo/server/tecsvc/TechnicalServlet.java | 7 +-
.../olingo/server/tecsvc/data/DataProvider.java | 10 +-
.../processor/TechnicalEntityProcessor.java | 97 ++--
.../TechnicalPrimitiveComplexProcessor.java | 294 ++++++----
.../tecsvc/processor/TechnicalProcessor.java | 47 +-
.../server/core/PreconditionsValidatorTest.java | 149 +++++
20 files changed, 1582 insertions(+), 700 deletions(-)
----------------------------------------------------------------------
[8/8] olingo-odata4 git commit: [OLINGO-632] Merge branch
'OLINGO-632_OSGi-Support'
Posted by mi...@apache.org.
[OLINGO-632] Merge branch 'OLINGO-632_OSGi-Support'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fd71b7eb
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fd71b7eb
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fd71b7eb
Branch: refs/heads/master
Commit: fd71b7ebdd159b79ffee0a380318b0c3dc5c33b4
Parents: 725f7a9 0ff0fc1
Author: Michael Bolz <mi...@sap.com>
Authored: Fri May 29 18:39:25 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri May 29 18:39:25 2015 +0200
----------------------------------------------------------------------
.../olingo/fit/v4/AbstractTestITCase.java | 4 +--
.../olingo/fit/v4/ConformanceTestITCase.java | 5 ++--
lib/client-api/pom.xml | 22 +++++++++++++++--
lib/client-core/pom.xml | 20 ++++++++++++++-
lib/commons-api/pom.xml | 22 +++++++++++++++--
lib/commons-core/pom.xml | 25 ++++++++++++++++++-
lib/server-api/pom.xml | 26 ++++++++++++++++++--
lib/server-core/pom.xml | 18 +++++++++++++-
pom.xml | 9 +++++--
9 files changed, 135 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[4/8] olingo-odata4 git commit: [OLINGO-632] Restricted '*-core'
exports
Posted by mi...@apache.org.
[OLINGO-632] Restricted '*-core' exports
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/41edf2da
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/41edf2da
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/41edf2da
Branch: refs/heads/master
Commit: 41edf2daf31d9cbafe879f3c8a74582d11f23adc
Parents: cd8d77c
Author: Michael Bolz <mi...@sap.com>
Authored: Fri May 29 10:11:29 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri May 29 10:11:29 2015 +0200
----------------------------------------------------------------------
.../test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java | 4 ++--
.../java/org/apache/olingo/fit/v4/ConformanceTestITCase.java | 5 ++---
lib/client-api/pom.xml | 1 -
lib/client-core/pom.xml | 6 ++++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 402a1e2..5339bff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -43,7 +43,6 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.domain.ClientEntityImpl;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
@@ -115,7 +114,8 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void createAndDeleteOrder(final String serviceRoot, final ODataFormat format, final int id) {
- final ClientEntity order = new ClientEntityImpl(
+
+ final ClientEntity order = getClient().getObjectFactory().newEntity(
new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
index e3e9eb8..472928f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
@@ -49,7 +49,6 @@ import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.client.core.domain.ClientEntityImpl;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
import org.apache.olingo.client.core.uri.URIUtils;
@@ -87,8 +86,8 @@ public class ConformanceTestITCase extends AbstractTestITCase {
*/
@Test
public void item2() {
- final ClientEntity order =
- new ClientEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+ final ClientEntity order = getClient().getObjectFactory().newEntity(
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/lib/client-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index 1340edf..4bc7b79 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -58,7 +58,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- REVISIT should be restricing the exports? -->
<Export-Package>
org.apache.olingo.client.api*
</Export-Package>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/lib/client-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml
index ec9e2a9..4e6068c 100644
--- a/lib/client-core/pom.xml
+++ b/lib/client-core/pom.xml
@@ -83,9 +83,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- REVISIT should be restricing the exports? -->
<Export-Package>
- org.apache.olingo.client.core*
+ org.apache.olingo.client.core,
+ org.apache.olingo.client.core.http,
+ org.apache.olingo.client.core.uri.URIUtils,
+ org.apache.olingo.client.core.communication.request*
</Export-Package>
<Import-Package>
*
[2/8] olingo-odata4 git commit: [OLINGO-632] adjusted to
4.0.0-SNAPSHOT
Posted by mi...@apache.org.
[OLINGO-632] adjusted to 4.0.0-SNAPSHOT
Signed-off-by: mibo <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c536ce35
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c536ce35
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c536ce35
Branch: refs/heads/master
Commit: c536ce35f7030cd7b4ced1ba4118cd53e704f9c2
Parents: 8aa2d4d
Author: Aki Yoshida <el...@gmail.com>
Authored: Wed May 13 17:34:02 2015 +0200
Committer: mibo <mi...@apache.org>
Committed: Thu May 21 23:01:19 2015 +0200
----------------------------------------------------------------------
lib/commons-core/pom.xml | 1 +
pom.xml | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c536ce35/lib/commons-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index f290e96..2f0f319 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -87,6 +87,7 @@
<instructions>
<Export-Package>
org.apache.olingo.commons.core,
+ org.apache.olingo.commons.core.edm,
org.apache.olingo.commons.core.edm.provider,
org.apache.olingo.commons.core.edm.primitivetype,
</Export-Package>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c536ce35/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56dd4be..80a9804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,8 +83,7 @@
<maven.bundle.plugin.version>2.3.4</maven.bundle.plugin.version>
<hc.client.version>4.2.6</hc.client.version>
<jackson.version>2.4.2</jackson.version>
- <!-- stay with aalto-xml-0.9.8 because 0.9.9 is not a bundle -->
- <aalto-xml.version>0.9.8</aalto-xml.version>
+ <aalto-xml.version>0.9.10</aalto-xml.version>
<antlr.version>4.1</antlr.version>