You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/04/29 16:37:09 UTC
git commit: [OLINGO-262] Additional ext sub-module provided for
specific usage with Android
Repository: olingo-odata4
Updated Branches:
refs/heads/master 8042913be -> 8a6bcb3d2
[OLINGO-262] Additional ext sub-module provided for specific usage with Android
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8a6bcb3d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8a6bcb3d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8a6bcb3d
Branch: refs/heads/master
Commit: 8a6bcb3d2a36343fae3feb3357bfea17be18239f
Parents: 8042913
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 29 16:36:59 2014 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 29 16:36:59 2014 +0200
----------------------------------------------------------------------
ext/client-core-android/pom.xml | 82 ++++++++++++++++++++
ext/pom.xml | 41 ++++++++++
.../commons/core/data/AtomDeserializer.java | 3 +-
.../commons/core/data/AtomSerializer.java | 3 +-
pom.xml | 6 ++
5 files changed, 133 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a6bcb3d/ext/client-core-android/pom.xml
----------------------------------------------------------------------
diff --git a/ext/client-core-android/pom.xml b/ext/client-core-android/pom.xml
new file mode 100644
index 0000000..b584980
--- /dev/null
+++ b/ext/client-core-android/pom.xml
@@ -0,0 +1,82 @@
+<?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.
+
+-->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>olingo-client-core-android</artifactId>
+ <packaging>jar</packaging>
+ <name>${project.artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-ext</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-client-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jarjar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>javax.xml.stream:stax-api</include>
+ <include>org.codehaus.woodstox:stax2-api</include>
+ <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include>
+ <include>com.fasterxml:aalto-xml</include>
+ <include>org.apache.olingo:olingo-commons-core</include>
+ </includes>
+ <rules>
+ <rule>
+ <pattern>javax.xml.stream.**</pattern>
+ <result>org.apache.olingo.javax.xml.stream.@1</result>
+ </rule>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a6bcb3d/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
new file mode 100644
index 0000000..37c9436
--- /dev/null
+++ b/ext/pom.xml
@@ -0,0 +1,41 @@
+<?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.
+
+-->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-ext</artifactId>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-parent</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <modules>
+ <module>client-core-android</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a6bcb3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java
index cd1852a..fb9b0df 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java
@@ -18,6 +18,7 @@
*/
package org.apache.olingo.commons.core.data;
+import com.fasterxml.aalto.stax.InputFactoryImpl;
import org.apache.olingo.commons.core.data.v4.AtomDeltaImpl;
import org.apache.olingo.commons.core.domain.v4.ODataDeltaLinkImpl;
import org.apache.olingo.commons.core.domain.v4.ODataDeletedEntityImpl;
@@ -48,7 +49,7 @@ import org.apache.olingo.commons.core.edm.EdmTypeInfo;
public class AtomDeserializer extends AbstractAtomDealer {
- protected static final XMLInputFactory FACTORY = XMLInputFactory.newInstance();
+ protected static final XMLInputFactory FACTORY = new InputFactoryImpl();
private final AtomGeoValueDeserializer geoDeserializer;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a6bcb3d/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java
index 68782d4..0fdab42 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java
@@ -18,6 +18,7 @@
*/
package org.apache.olingo.commons.core.data;
+import com.fasterxml.aalto.stax.OutputFactoryImpl;
import java.io.Writer;
import java.util.Collections;
import java.util.List;
@@ -42,7 +43,7 @@ import org.apache.olingo.commons.core.edm.EdmTypeInfo;
public class AtomSerializer extends AbstractAtomDealer {
- private static final XMLOutputFactory FACTORY = XMLOutputFactory.newInstance();
+ private static final XMLOutputFactory FACTORY = new OutputFactoryImpl();
private final AtomGeoValueSerializer geoSerializer;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a6bcb3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f10e77d..18c133b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
<modules>
<module>lib</module>
+ <module>ext</module>
<module>fit</module>
</modules>
@@ -317,6 +318,11 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
</plugins>
</pluginManagement>