Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8C92C1087E for ; Thu, 1 May 2014 18:35:06 +0000 (UTC) Received: (qmail 61840 invoked by uid 500); 1 May 2014 18:35:05 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 61795 invoked by uid 500); 1 May 2014 18:35:05 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 61787 invoked by uid 99); 1 May 2014 18:35:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 18:35:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 18:35:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7A3802388868; Thu, 1 May 2014 18:34:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591725 - in /chemistry/opencmis/trunk: ./ chemistry-opencmis-client/chemistry-opencmis-client-bindings/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservic... Date: Thu, 01 May 2014 18:34:34 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140501183435.7A3802388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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} - 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 @@ provided + com.sun.xml.ws + jaxws-rt + ${jaxws-rt.version} + provided + + org.apache.cxf cxf-rt-frontend-jaxws ${cxf.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 @@ true src/main/assembly/client-with-dependencies-assembly.xml + src/main/assembly/client-with-ri-dependencies-assembly.xml src/main/assembly/client-with-cxf-dependencies-assembly.xml @@ -115,12 +116,23 @@ ${project.version} + org.codehaus.woodstox + woodstox-core-asl + ${woodstox.version} + + org.osgi org.osgi.core ${osgi.version} provided + com.sun.xml.ws + jaxws-rt + ${jaxws-rt.version} + provided + + org.apache.cxf cxf-rt-frontend-jaxws ${cxf.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 @@ false runtime - - com.sun.xml.ws:jaxws-rt - false provided true + + com.sun.xml.ws:jaxws-rt + 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 @@ + + + + + + + with-ri-dependencies + + zip + + false + + + + false + runtime + + + + false + provided + true + + org.apache.cxf + + + + + + + ${project.build.directory}/maven-shared-archive-resources/META-INF + / + + + \ 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 @@ org.codehaus.woodstox woodstox-core-asl - 4.2.0 + ${woodstox.version} - org.jvnet.mimepull - mimepull - 1.9.4 - - com.sun.xml.ws jaxws-rt - 2.1.7 - - - stax - stax-api - - - org.codehaus.woodstox - wstx-asl - - - junit - junit - - - org.jvnet - mimepull - - + ${jaxws-rt.version} + provided @@ -119,7 +97,7 @@ ${project.basedir}/target/generated true - 2.1 + 2.2 @@ -153,7 +131,7 @@ 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, * ${project.url} 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 @@ 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 ${project.url} org.apache.chemistry.opencmis.client.osgi.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 @@ chemistry-opencmis-commons-impl ${project.version} + + com.sun.xml.ws + jaxws-rt + ${jaxws-rt.version} + ${project.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 @@ ../../ 3.2.0.Final 2.6.1 - 2.14.1 + 2.17 6.1.22 2.0 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 @@ true src/main/assembly/workbench-assembly.xml + src/main/assembly/workbench-ri-assembly.xml src/main/assembly/workbench-cxf-assembly.xml src/main/assembly/workbench-axis2-assembly.xml @@ -264,6 +265,12 @@ 2.2 + com.sun.xml.ws + jaxws-rt + ${jaxws-rt.version} + provided + + org.apache.cxf cxf-rt-frontend-jaxws ${cxf.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 @@ runtime true - com.sun.xml.ws:jaxws-rt - org.jvnet.mimepull:mimepull junit:junit @@ -84,6 +82,7 @@ provided true + com.sun.xml.ws:jaxws-rt org.apache.cxf:* org.apache.axis2:* wsdl4j:* 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 @@ runtime true - com.sun.xml.ws:jaxws-rt - org.jvnet.mimepull:mimepull junit:junit @@ -70,7 +68,7 @@ false false provided - false + true org.apache.axis2:* @@ -80,12 +78,11 @@ false false provided - false + true org.codehaus.woodstox:wstx-asl:* + com.sun.xml.ws:jaxws-rt org.apache.cxf:* - javax.servlet:* - commons-fileupload:* 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 @@ runtime true - com.sun.xml.ws:jaxws-rt - org.jvnet.mimepull:mimepull junit:junit @@ -70,7 +68,7 @@ false false provided - false + true org.apache.cxf:* @@ -80,14 +78,11 @@ false false provided - false + true org.codehaus.woodstox:wstx-asl:* + com.sun.xml.ws:jaxws-rt org.apache.axis2:* - org.apache.ws.commons.axiom:* - org.apache.woden:* - javax.servlet:* - commons-fileupload:* 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 @@ runtime true - com.sun.xml.ws:jaxws-rt - org.jvnet.mimepull:mimepull junit:junit @@ -80,6 +78,7 @@ provided true + com.sun.xml.ws:jaxws-rt org.apache.cxf:* org.apache.axis2:* wsdl4j:* 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 @@ + + + + + + + ri + + zip + + false + + + + + ${project.build.directory}/maven-shared-archive-resources/META-INF + / + + + + + target/start/workbench-ri.sh + workbench.sh + + unix + 0755 + + + target/start/workbench-ri.bat + workbench.bat + + dos + + + + + /lib + + false + runtime + true + + junit:junit + + + + /lib + false + false + provided + true + + com.sun.xml.ws:jaxws-rt + + + + /lib + false + false + provided + true + + org.codehaus.woodstox:wstx-asl:* + org.apache.cxf:* + org.apache.axis2:* + + + + 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://: +rem set https_proxy=https://: +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://: +# export https_proxy=https://: +# 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.protocol}://${site.staging.host}${site.staging.folder} ${project.basedir} + 4.2.0 5.0.0 2.3.7 4.11 1.7.5 1.2.17 4.2.6 - 2.7.7 + 2.2.8 + 2.7.11 1.6.2 @@ -475,31 +477,6 @@ - - - jboss.public - JBoss repository (for JAX-WS 2.1.7) - http://repository.jboss.org/nexus/content/groups/public/ - - - maven2-repository.dev.java.net - Java.net Repository for Maven 2 - http://download.java.net/maven/2/ - - - - - - maven2-repository.dev.java.net - http://download.java.net/maven/2/ - - - jboss-public - Jboss Repository for Maven 2 - http://repository.jboss.org/nexus/content/groups/public/ - - - org.slf4j