Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-632] Merge branch 'OLINGO-632_OSGi-Support'

This commit is contained in:
Michael Bolz 2015-05-29 18:39:25 +02:00
parent 725f7a9b24 0ff0fc1b16
commit fd71b7ebdd
9 changed files with 135 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
View File

@ -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",

5
fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
View File

@ -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));

22
lib/client-api/pom.xml
View File

@ -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,23 @@
<artifactId>httpclient</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.client.api*
</Export-Package>
<Import-Package>
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

20
lib/client-core/pom.xml
View File

@ -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,24 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
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>
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
<resources>

22
lib/commons-api/pom.xml
View File

@ -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>

25
lib/commons-core/pom.xml
View File

@ -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,27 @@
<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,
org.apache.olingo.commons.core.edm.provider,
org.apache.olingo.commons.core.edm.primitivetype,
org.apache.olingo.commons.core.serialization
</Export-Package>
<Import-Package>
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

26
lib/server-api/pom.xml
View File

@ -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>

18
lib/server-core/pom.xml
View File

@ -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>

9
pom.xml
View File

@ -80,10 +80,10 @@
<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>
<aalto-xml.version>0.9.10</aalto-xml.version>
<antlr.version>4.1</antlr.version>
@ -130,6 +130,11 @@
<version>${antlr.version}</version>
</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>