Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.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/VersioningService.java?rev=1690403&r1=1690402&r2=1690403&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/VersioningService.java Sat Jul 11 20:40:12 2015 @@ -49,13 +49,10 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.jaxb.VersioningServicePort; import org.apache.chemistry.opencmis.commons.server.CmisService; -import com.sun.xml.ws.developer.StreamingAttachment; - /** * CMIS Versioning Service. */ @MTOM -@StreamingAttachment(parseEagerly = false, memoryThreshold = 4 * 1024 * 1204) @WebService(endpointInterface = "org.apache.chemistry.opencmis.commons.impl.jaxb.VersioningServicePort") public class VersioningService extends AbstractService implements VersioningServicePort { @Resource @@ -106,7 +103,7 @@ public class VersioningService extends A checkinComment, policies, convert(addAces, null), convert(removeAces, null), extData); closeStream(contentStream); - + if (stopAfterService(service)) { return; }
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=1690403&r1=1690402&r2=1690403&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 Sat Jul 11 20:40:12 2015 @@ -173,7 +173,7 @@ <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-jre-assembly.xml</descriptor> <descriptor>src/main/assembly/workbench-axis2-assembly.xml</descriptor> </descriptors> </configuration> @@ -311,19 +311,16 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${cxf.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> <version>${cxf.version}</version> - <scope>provided</scope> </dependency> <!-- Axis2 --> <dependency> 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=1690403&r1=1690402&r2=1690403&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 Sat Jul 11 20:40:12 2015 @@ -29,7 +29,7 @@ <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - + <fileSets> <!-- license, readme, etc. calculated at build time --> <fileSet> @@ -77,15 +77,15 @@ </dependencySet> <dependencySet> <outputDirectory>/lib</outputDirectory> - <useProjectArtifact></useProjectArtifact> + <useProjectArtifact>false</useProjectArtifact> <unpack>false</unpack> <scope>provided</scope> <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>org.jvnet.mimepull:mimepull</exclude> <exclude>org.apache.axis2:*</exclude> - <exclude>wsdl4j:*</exclude> </excludes> </dependencySet> </dependencySets> 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=1690403&r1=1690402&r2=1690403&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 Sat Jul 11 20:40:12 2015 @@ -61,6 +61,7 @@ <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> <exclude>junit:junit</exclude> + <exclude>org.apache.cxf:*</exclude> </excludes> </dependencySet> <dependencySet> @@ -85,7 +86,7 @@ <excludes> <exclude>org.codehaus.woodstox:wstx-asl:*</exclude> <exclude>com.sun.xml.ws:jaxws-rt</exclude> - <exclude>org.apache.cxf:*</exclude> + <exclude>org.jvnet.mimepull:mimepull</exclude> </excludes> </dependencySet> </dependencySets> Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-jre-assembly.xml URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-jre-assembly.xml?rev=1690403&view=auto ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-jre-assembly.xml (added) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-jre-assembly.xml Sat Jul 11 20:40:12 2015 @@ -0,0 +1,80 @@ +<?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>jre</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-jre.sh</source> + <destName>workbench.sh</destName> + <outputDirectory></outputDirectory> + <lineEnding>unix</lineEnding> + <fileMode>0755</fileMode> + </file> + <file> + <source>target/start/workbench-jre.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> + <exclude>org.apache.cxf:*</exclude> + </excludes> + </dependencySet> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <useProjectArtifact></useProjectArtifact> + <unpack>false</unpack> + <scope>provided</scope> + <useTransitiveFiltering>true</useTransitiveFiltering> + <excludes> + <exclude>com.sun.xml.ws:jaxws-rt</exclude> + <exclude>org.jvnet.mimepull:mimepull</exclude> + <exclude>org.apache.axis2:*</exclude> + <exclude>wsdl4j:*</exclude> + </excludes> + </dependencySet> + </dependencySets> +</assembly> 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=1690403&r1=1690402&r2=1690403&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 Sat Jul 11 20:40:12 2015 @@ -78,10 +78,9 @@ <scope>provided</scope> <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>org.apache.axis2:*</exclude> - <exclude>wsdl4j:*</exclude> </excludes> </dependencySet> </dependencySets> Modified: 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=1690403&r1=1690402&r2=1690403&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-ri-assembly.xml Sat Jul 11 20:40:12 2015 @@ -61,6 +61,7 @@ <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> <exclude>junit:junit</exclude> + <exclude>org.apache.cxf:*</exclude> </excludes> </dependencySet> <dependencySet> @@ -82,7 +83,6 @@ <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> <exclude>org.codehaus.woodstox:wstx-asl:*</exclude> - <exclude>org.apache.cxf:*</exclude> <exclude>org.apache.axis2:*</exclude> </excludes> </dependencySet> Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.bat URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.bat?rev=1690403&view=auto ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.bat (added) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.bat Sat Jul 11 20:40:12 2015 @@ -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=sunjre + +start /B javaw %JAVA_OPTS% %CUSTOM_JAVA_OPTS% -classpath ".;*" org.apache.chemistry.opencmis.workbench.Workbench \ No newline at end of file Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.sh URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.sh?rev=1690403&view=auto ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.sh (added) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-jre.sh Sat Jul 11 20:40:12 2015 @@ -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=sunjre" + +exec $JAVA $JAVA_OPTS $CUSTOM_JAVA_OPTS -classpath $WCP org.apache.chemistry.opencmis.workbench.Workbench & \ No newline at end of file Modified: chemistry/opencmis/trunk/pom.xml URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1690403&r1=1690402&r2=1690403&view=diff ============================================================================== --- chemistry/opencmis/trunk/pom.xml (original) +++ chemistry/opencmis/trunk/pom.xml Sat Jul 11 20:40:12 2015 @@ -234,9 +234,10 @@ <log4j.version>1.2.17</log4j.version> <apacheclient.version>4.2.6</apacheclient.version> <jaxws-rt.version>2.1.7</jaxws-rt.version> - <cxf.version>2.7.11</cxf.version> + <cxf.version>3.0.5</cxf.version> <axis2.version>1.6.2</axis2.version> <mimepull.version>1.9.4</mimepull.version> + <spring.version>4.1.7.RELEASE</spring.version> </properties> <build>
