Author: fmui
Date: Thu May 1 18:34:34 2014
New Revision: 1591725
URL: http://svn.apache.org/r1591725
Log:
CMIS-793: first JAX-WS reorganization step
Added:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
(with props)
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
(with props)
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
(with props)
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
(with props)
Modified:
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/CmisWebServicesSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-cxf-dependencies-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-osgi/chemistry-opencmis-osgi-client/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
chemistry/opencmis/trunk/pom.xml
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=1591725&r1=1591724&r2=1591725&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 May 1 18:34:34 2014
@@ -76,7 +76,7 @@
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version}
</Export-Package>
<Import-Package>
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
+
com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
org.apache.cxf.*;resolution:=optional,
org.apache.http.*;resolution:=optional,
org.apache.axis2.*;resolution:=optional,
@@ -120,6 +120,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-rt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.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/CmisWebServicesSpi.java?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
Thu May 1 18:34:34 2014
@@ -76,10 +76,10 @@ public class CmisWebServicesSpi implemen
jaxwsImpl =
System.getProperty("org.apache.chemistry.opencmis.binding.webservices.jaxws.impl");
}
- if (jaxwsImpl == null || JAXWS_IMPL_RI.equals(jaxwsImpl)) {
- portProvider = new SunRIPortProvider();
- } else if (JAXWS_IMPL_JRE.equals(jaxwsImpl)) {
+ if (jaxwsImpl == null || JAXWS_IMPL_JRE.equals(jaxwsImpl)) {
portProvider = new SunJREPortProvider();
+ } else if (JAXWS_IMPL_RI.equals(jaxwsImpl)) {
+ portProvider = new SunRIPortProvider();
} else if (JAXWS_IMPL_CXF.equals(jaxwsImpl)) {
portProvider = new CXFPortProvider();
} else if (JAXWS_IMPL_WEBSPHERE.equals(jaxwsImpl)) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
Thu May 1 18:34:34 2014
@@ -84,6 +84,7 @@
<attach>true</attach>
<descriptors>
<descriptor>src/main/assembly/client-with-dependencies-assembly.xml</descriptor>
+
<descriptor>src/main/assembly/client-with-ri-dependencies-assembly.xml</descriptor>
<descriptor>src/main/assembly/client-with-cxf-dependencies-assembly.xml</descriptor>
</descriptors>
</configuration>
@@ -115,12 +116,23 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>${woodstox.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-rt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-cxf-dependencies-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-cxf-dependencies-assembly.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-cxf-dependencies-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-cxf-dependencies-assembly.xml
Thu May 1 18:34:34 2014
@@ -35,15 +35,15 @@
<useProjectArtifact></useProjectArtifact>
<unpack>false</unpack>
<scope>runtime</scope>
- <excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- </excludes>
</dependencySet>
<dependencySet>
<useProjectArtifact></useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
<fileSets>
Added:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml?rev=1591725&view=auto
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
(added)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
Thu May 1 18:34:34 2014
@@ -0,0 +1,56 @@
+<?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.
+-->
+
+<!--
+ This assembly is for development only and should not be released!
+-->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>with-ri-dependencies</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact></useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact></useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>org.apache.cxf</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <!-- license, readme, etc. calculated at build time -->
+ <fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-ri-dependencies-assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
Thu May 1 18:34:34 2014
@@ -47,35 +47,13 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
+ <version>${woodstox.version}</version>
</dependency>
<dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>1.9.4</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jvnet</groupId>
- <artifactId>mimepull</artifactId>
- </exclusion>
- </exclusions>
+ <version>${jaxws-rt.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -119,7 +97,7 @@
<destdir />
<sourceDestDir>${project.basedir}/target/generated</sourceDestDir>
<extension>true</extension>
- <target>2.1</target>
+ <target>2.2</target>
</configuration>
</execution>
</executions>
@@ -153,7 +131,7 @@
</Export-Package>
<Import-Package>
org.apache.chemistry.opencmis.commons.*,
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
+
com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
*
</Import-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
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=1591725&r1=1591724&r2=1591725&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 May 1 18:34:34 2014
@@ -56,7 +56,7 @@
<Import-Package>
org.slf4j;resolution:=optional,
org.slf4j.impl;resolution:=optional,
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional,
+
com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional,
com.sun.xml.internal.*;resolution:=optional,
org.apache.cxf.*;resolution:=optional,
org.apache.http.*;resolution:=optional,
@@ -70,7 +70,7 @@
org.apache.chemistry.opencmis.client.bindings.spi.*;version=${project.version},
org.apache.chemistry.opencmis.commons.impl.*;version=${project.version};-noimport:=true,
org.apache.chemistry.opencmis.commons.*;version=${project.version};-noimport:=true,
-
com.sun.xml.ws.*;version="[2.1.7,3.0)";resolution:=optional
+
com.sun.xml.ws.*;version="[2.2,3.0)";resolution:=optional
</_exportcontents>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-Activator>org.apache.chemistry.opencmis.client.osgi.Activator</Bundle-Activator>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
Thu May 1 18:34:34 2014
@@ -49,6 +49,11 @@
<artifactId>chemistry-opencmis-commons-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-rt.version}</version>
+ </dependency>
<!-- server-support is not a *runtime* dependency but it's added for
commodity in the WAR -->
<dependency>
<groupId>${project.groupId}</groupId>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/CmisWebServicesServlet.java
Thu May 1 18:34:34 2014
@@ -21,7 +21,6 @@ package org.apache.chemistry.opencmis.se
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -272,18 +271,6 @@ public class CmisWebServicesServlet exte
}
private void setMemoryThreshold(CmisServiceFactory factory,
StreamingAttachmentFeature ft) {
- try {
- // JAX-WS RI 2.1
- ft.setMemoryThreshold(factory.getMemoryThreshold());
- } catch (NoSuchMethodError e) {
- // JAX-WS RI 2.2
- // see CMIS-626
- try {
- Method m = ft.getClass().getMethod("setMemoryThreshold",
long.class);
- m.invoke(ft, (long) factory.getMemoryThreshold());
- } catch (Exception e2) {
- LOG.warn("Could not set memory threshold for streaming");
- }
- }
+ ft.setMemoryThreshold(factory.getMemoryThreshold());
}
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
Thu May 1 18:34:34 2014
@@ -28,7 +28,7 @@
<parentBasedir>../../</parentBasedir>
<modeshape.version>3.2.0.Final</modeshape.version>
<jackrabbit-core.version>2.6.1</jackrabbit-core.version>
- <maven-failsafe-plugin.version>2.14.1</maven-failsafe-plugin.version>
+ <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
<maven-jetty-plugin.version>6.1.22</maven-jetty-plugin.version>
<jcr.version>2.0</jcr.version>
<overlay.groupId />
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
Thu May 1 18:34:34 2014
@@ -165,6 +165,7 @@
<attach>true</attach>
<descriptors>
<descriptor>src/main/assembly/workbench-assembly.xml</descriptor>
+
<descriptor>src/main/assembly/workbench-ri-assembly.xml</descriptor>
<descriptor>src/main/assembly/workbench-cxf-assembly.xml</descriptor>
<descriptor>src/main/assembly/workbench-axis2-assembly.xml</descriptor>
</descriptors>
@@ -264,6 +265,12 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-rt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
Thu May 1 18:34:34 2014
@@ -72,8 +72,6 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>
@@ -84,6 +82,7 @@
<scope>provided</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>org.apache.cxf:*</exclude>
<exclude>org.apache.axis2:*</exclude>
<exclude>wsdl4j:*</exclude>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml
Thu May 1 18:34:34 2014
@@ -60,8 +60,6 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>
@@ -70,7 +68,7 @@
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
- <useTransitiveFiltering>false</useTransitiveFiltering>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.apache.axis2:*</include>
</includes>
@@ -80,12 +78,11 @@
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
- <useTransitiveFiltering>false</useTransitiveFiltering>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>org.apache.cxf:*</exclude>
- <exclude>javax.servlet:*</exclude>
- <exclude>commons-fileupload:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
Thu May 1 18:34:34 2014
@@ -60,8 +60,6 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>
@@ -70,7 +68,7 @@
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
- <useTransitiveFiltering>false</useTransitiveFiltering>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.apache.cxf:*</include>
</includes>
@@ -80,14 +78,11 @@
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
- <useTransitiveFiltering>false</useTransitiveFiltering>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>org.apache.axis2:*</exclude>
- <exclude>org.apache.ws.commons.axiom:*</exclude>
- <exclude>org.apache.woden:*</exclude>
- <exclude>javax.servlet:*</exclude>
- <exclude>commons-fileupload:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
Thu May 1 18:34:34 2014
@@ -68,8 +68,6 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.jvnet.mimepull:mimepull</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>
@@ -80,6 +78,7 @@
<scope>provided</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>org.apache.cxf:*</exclude>
<exclude>org.apache.axis2:*</exclude>
<exclude>wsdl4j:*</exclude>
Added:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml?rev=1591725&view=auto
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
(added)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
Thu May 1 18:34:34 2014
@@ -0,0 +1,89 @@
+<?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.
+-->
+
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd";>
+ <!-- To build this, run "mvn package assembly:assembly" -->
+ <id>ri</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- license, readme, etc. calculated at build time -->
+ <fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/start/workbench-ri.sh</source>
+ <destName>workbench.sh</destName>
+ <outputDirectory></outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>target/start/workbench-ri.bat</source>
+ <destName>workbench.bat</destName>
+ <outputDirectory></outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact></useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>com.sun.xml.ws:jaxws-rt</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>org.apache.axis2:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat?rev=1591725&view=auto
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
(added)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
Thu May 1 18:34:34 2014
@@ -0,0 +1,33 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+rem @version@
+
+cd %~dp0\lib
+
+rem use variable CUSTOM_JAVA_OPTS to set additional JAVA options
+
+rem uncomment the following lines to configure HTTP proxy
+
+rem set http_proxy=http://<proxy>:<port>
+rem set https_proxy=https://<proxy>:<port>
+rem set no_proxy=localhost,127.0.0.0,.local
+
+
+for /F "delims=/" %%x in ('"java -classpath .;*
org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s"') do set
"JAVA_PROXY_CONF=%%x"
+set JAVA_OPTS=%JAVA_PROXY_CONF%
-Dorg.apache.chemistry.opencmis.binding.webservices.jaxws.impl=sunri
+
+start /B javaw %JAVA_OPTS% %CUSTOM_JAVA_OPTS% -classpath ".;*"
org.apache.chemistry.opencmis.workbench.Workbench
\ No newline at end of file
Propchange:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.bat
------------------------------------------------------------------------------
svn:eol-style = native
Added:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh?rev=1591725&view=auto
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
(added)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
Thu May 1 18:34:34 2014
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# 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.
+
+# @version@
+
+if [ -z "$JAVA_HOME" ]; then
+ j=$(which java 2>/dev/null)
+ if [ -z "$j" ]; then
+ echo "Unable to locate Java!"
+ exit 1
+ else
+ JAVA="$j"
+ fi
+else
+ JAVA="$JAVA_HOME/bin/java"
+fi
+
+
+SCRIPT_DIR=$(dirname "$0")
+cd "$SCRIPT_DIR/lib"
+
+WCP="."
+for i in *.jar; do
+ WCP="$i:${WCP}"
+done
+
+# use variable CUSTOM_JAVA_OPTS to set additional JAVA options
+
+# uncomment the following lines to configure HTTP proxy
+
+# export http_proxy=http://<proxy>:<port>
+# export https_proxy=https://<proxy>:<port>
+# export no_proxy=localhost,127.0.0.0,.local
+
+
+JAVA_PROXY_CONF=$($JAVA -classpath $WCP
org.apache.chemistry.opencmis.workbench.ProxyDetector -j -s)
+JAVA_OPTS="$JAVA_PROXY_CONF
-Dorg.apache.chemistry.opencmis.binding.webservices.jaxws.impl=sunri"
+
+exec $JAVA $JAVA_OPTS $CUSTOM_JAVA_OPTS -classpath $WCP
org.apache.chemistry.opencmis.workbench.Workbench &
\ No newline at end of file
Propchange:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-ri.sh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: chemistry/opencmis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1591725&r1=1591724&r2=1591725&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Thu May 1 18:34:34 2014
@@ -228,13 +228,15 @@
<site.staging.url>${site.staging.protocol}://${site.staging.host}${site.staging.folder}</site.staging.url>
<parentBasedir>${project.basedir}</parentBasedir>
+ <woodstox.version>4.2.0</woodstox.version>
<osgi.version>5.0.0</osgi.version>
<felix.plugin.version>2.3.7</felix.plugin.version>
<junit.version>4.11</junit.version>
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<apacheclient.version>4.2.6</apacheclient.version>
- <cxf.version>2.7.7</cxf.version>
+ <jaxws-rt.version>2.2.8</jaxws-rt.version>
+ <cxf.version>2.7.11</cxf.version>
<axis2.version>1.6.2</axis2.version>
</properties>
@@ -475,31 +477,6 @@
</extensions>
</build>
- <repositories>
- <repository>
- <id>jboss.public</id>
- <name>JBoss repository (for JAX-WS 2.1.7)</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2/</url>
- </pluginRepository>
- <pluginRepository>
- <id>jboss-public</id>
- <name>Jboss Repository for Maven 2</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
