Author: fmui
Date: Thu Oct 13 13:14:24 2016
New Revision: 1764664
URL: http://svn.apache.org/viewvc?rev=1764664&view=rev
Log:
clean up and OSGi corrections
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml?rev=1764664&r1=1764663&r2=1764664&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/pom.xml
Thu Oct 13 13:14:24 2016
@@ -1,63 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed 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.
- -->
+<!--
+ 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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>chemistry-opencmis-android-client</artifactId>
- <name>OpenCMIS Android Client</name>
- <packaging>jar</packaging>
-
- <properties>
- <parentBasedir>../../</parentBasedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android</artifactId>
- <version>2.3.3</version>
- <scope>provided</scope>
- </dependency>
+ <parent>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <artifactId>chemistry-opencmis</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>chemistry-opencmis-android-client</artifactId>
+ <name>OpenCMIS Android Client</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <parentBasedir>../../</parentBasedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>2.3.3</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
<scope>provided</scope>
</dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <property name="gendir"
value="${project.build.directory}/opencmis-core" />
+ </dependencies>
- <property
name="basedir" value="${maven.basedir}" />
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <property name="gendir"
value="${project.build.directory}/opencmis-core" />
+ <property name="basedir"
value="${maven.basedir}" />
<property name="commons-api"
value="${basedir}/../../chemistry-opencmis-commons/chemistry-opencmis-commons-api"
/>
<property name="commons-impl"
value="${basedir}/../../chemistry-opencmis-commons/chemistry-opencmis-commons-impl"
/>
<property name="client-bindings"
value="${basedir}/../../chemistry-opencmis-client/chemistry-opencmis-client-bindings"
/>
@@ -66,78 +71,78 @@
<property name="sourcefiles"
value="src/main/java" />
- <copy
todir="${gendir}">
-
<fileset dir="${commons-api}/${sourcefiles}">
-
<include name="**/*.java" />
-
</fileset>
- </copy>
+ <copy todir="${gendir}">
+ <fileset
dir="${commons-api}/${sourcefiles}">
+ <include name="**/*.java" />
+ </fileset>
+ </copy>
- <copy todir="${gendir}">
-
<fileset dir="${commons-impl}/${sourcefiles}">
-
<include name="**/*.java" />
-
<exclude name="**/jaxb/**" />
-
<exclude name="**/webservices/**" />
-
<exclude name="**/impl/WSConverter.*" />
-
<exclude name="**/impl/XMLConverter.*" />
-
<exclude name="**/impl/XMLConverter.*" />
-
<exclude name="**/impl/XMLUtils.*" />
-
<exclude name="**/impl/XMLWalker.*" />
-
</fileset>
- </copy>
+ <copy todir="${gendir}">
+ <fileset
dir="${commons-impl}/${sourcefiles}">
+ <include name="**/*.java" />
+ <exclude name="**/jaxb/**" />
+ <exclude name="**/webservices/**" />
+ <exclude name="**/impl/WSConverter.*"
/>
+ <exclude name="**/impl/XMLConverter.*"
/>
+ <exclude name="**/impl/XMLConverter.*"
/>
+ <exclude name="**/impl/XMLUtils.*" />
+ <exclude name="**/impl/XMLWalker.*" />
+ </fileset>
+ </copy>
- <copy todir="${gendir}">
-
<fileset dir="${client-bindings}/${sourcefiles}">
-
<include name="**/*.java" />
-
<exclude name="**/spi/LTPAWSSecurityAuthenticationProvider.*" />
-
<exclude name="**/spi/local/**" />
-
<exclude name="**/spi/http/DefaultHttpInvoker.*" />
-
<exclude name="**/spi/http/ApacheClientHttpInvoker.*" />
-
<exclude name="**/spi/webservices/**" />
-
<exclude name="**/spi/atompub/**" />
-
</fileset>
- </copy>
+ <copy todir="${gendir}">
+ <fileset
dir="${client-bindings}/${sourcefiles}">
+ <include name="**/*.java" />
+ <exclude
name="**/spi/LTPAWSSecurityAuthenticationProvider.*" />
+ <exclude name="**/spi/local/**" />
+ <exclude
name="**/spi/http/DefaultHttpInvoker.*" />
+ <exclude
name="**/spi/http/ApacheClientHttpInvoker.*" />
+ <exclude name="**/spi/webservices/**"
/>
+ <exclude name="**/spi/atompub/**" />
+ </fileset>
+ </copy>
- <copy todir="${gendir}">
-
<fileset dir="${client-api}/${sourcefiles}">
-
<include name="**/*.java" />
-
</fileset>
- </copy>
+ <copy todir="${gendir}">
+ <fileset
dir="${client-api}/${sourcefiles}">
+ <include name="**/*.java" />
+ </fileset>
+ </copy>
- <copy todir="${gendir}">
-
<fileset dir="${client-impl}/${sourcefiles}">
-
<include name="**/*.java" />
-
<exclude name="**/TypeUtils.java" />
-
<exclude name="**/osgi/**" />
-
</fileset>
- </copy>
+ <copy todir="${gendir}">
+ <fileset
dir="${client-impl}/${sourcefiles}">
+ <include name="**/*.java" />
+ <exclude name="**/TypeUtils.java" />
+ <exclude name="**/osgi/**" />
+ </fileset>
+ </copy>
- <replace
dir="${gendir}" token="javax.xml.ws.handler.HandlerResolver"
value="org.apache.chemistry.opencmis.client.bindings.spi.HandlerResolver" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <replace dir="${gendir}"
token="javax.xml.ws.handler.HandlerResolver"
value="org.apache.chemistry.opencmis.client.bindings.spi.HandlerResolver" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${project.build.directory}/opencmis-core</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${project.build.directory}/opencmis-core</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -152,14 +157,13 @@
<tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>
- src/main/assembly/assembly.xml
+ src/main/assembly/assembly.xml
</descriptor>
</descriptors>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
- </plugins>
-
- </build>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=1764664&r1=1764663&r2=1764664&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Thu Oct 13 13:14:24 2016
@@ -72,12 +72,14 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.chemistry.opencmis.client.bindings;version=${project.version},
-
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
- !org.apache.chemistry.opencmis.commons.impl.json.*,
- !org.apache.chemistry.opencmis.commons.impl.jaxb.*,
- !org.apache.http.*,
- !org.apache.cxf.*
+
org.apache.chemistry.opencmis.client.bindings;version=${project.version},
+
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
+ !org.apache.chemistry.opencmis.commons.impl.json.*,
+ !org.apache.chemistry.opencmis.commons.impl.jaxb.*,
+ !org.apache.http.*,
+ !org.apache.cxf.*,
+ !okhttp3.*,
+ !okio.*
</Export-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
</instructions>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java?rev=1764664&r1=1764663&r2=1764664&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
Thu Oct 13 13:14:24 2016
@@ -117,7 +117,7 @@ public class CXFPortProvider extends Abs
// SOAP header
Element soapHeader = authProvider.getSOAPHeaders(portObject);
if (soapHeader != null) {
- List<Header> soapHeaderList = new ArrayList<>(2);
+ List<Header> soapHeaderList = new ArrayList<Header>(2);
soapHeaderList.add(new Header(new
QName(soapHeader.getNamespaceURI(), soapHeader.getLocalName()), soapHeader));
portObject.getRequestContext().put(Header.HEADER_LIST,
soapHeaderList);
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml?rev=1764664&r1=1764663&r2=1764664&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
Thu Oct 13 13:14:24 2016
@@ -58,6 +58,8 @@
org.slf4j.impl;resolution:=optional,
org.apache.cxf.*;resolution:=optional,
org.apache.http.*;resolution:=optional,
+ okhttp3.*;resolution:=optional,
+ okio.*;resolution:=optional,
*
</Import-Package>
<_exportcontents>
