You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2013/07/10 21:59:49 UTC
svn commit: r1501947 - in /chemistry/opencmis/trunk: ./
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/...
Author: fmui
Date: Wed Jul 10 19:59:48 2013
New Revision: 1501947
URL: http://svn.apache.org/r1501947
Log:
Workbench: updated/added packages based on CXF and Axis2
Client/AuthenticationProvider: added method to provide a SOAP handler chain
Added:
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/resources/META-INF/README-cmis-workbench.txt
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
Removed:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/META-INF/README
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/AuthenticationProvider.java
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-cxf-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-mac-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/info.plist
chemistry/opencmis/trunk/pom.xml
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.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/AbstractAuthenticationProvider.java?rev=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java Wed Jul 10 19:59:48 2013
@@ -23,6 +23,7 @@ import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSocketFactory;
+import javax.xml.ws.handler.HandlerResolver;
import org.apache.chemistry.opencmis.commons.SessionParameter;
import org.w3c.dom.Element;
@@ -58,6 +59,10 @@ public abstract class AbstractAuthentica
return null;
}
+ public HandlerResolver getHandlerResolver() {
+ return null;
+ }
+
public void putResponseHeaders(String url, int statusCode, Map<String, List<String>> headers) {
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.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/AbstractPortProvider.java?rev=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java Wed Jul 10 19:59:48 2013
@@ -41,6 +41,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.http.HTTPException;
@@ -173,7 +174,7 @@ public abstract class AbstractPortProvid
}
}
- static class CmisServiceHolder {
+ class CmisServiceHolder {
private final CmisWebSerivcesService service;
private SoftReference<Service> serviceObject;
private final URL endpointUrl;
@@ -196,7 +197,17 @@ public abstract class AbstractPortProvid
LOG.debug("WSDL URL: " + wsdlUrl.toExternalForm());
}
- return serviceConstructor.newInstance(new Object[] { wsdlUrl, service.getQName() });
+ Service newService = serviceConstructor.newInstance(new Object[] { wsdlUrl, service.getQName() });
+
+ AuthenticationProvider authProvider = CmisBindingsHelper.getAuthenticationProvider(getSession());
+ if (authProvider != null) {
+ HandlerResolver handlerResolver = authProvider.getHandlerResolver();
+ if (handlerResolver != null) {
+ newService.setHandlerResolver(handlerResolver);
+ }
+ }
+
+ return newService;
}
public CmisWebSerivcesService getService() {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/AuthenticationProvider.java?rev=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/AuthenticationProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/AuthenticationProvider.java Wed Jul 10 19:59:48 2013
@@ -24,6 +24,7 @@ import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSocketFactory;
+import javax.xml.ws.handler.HandlerResolver;
import org.w3c.dom.Element;
@@ -57,6 +58,15 @@ public interface AuthenticationProvider
Element getSOAPHeaders(Object portObject);
/**
+ * Returns a {@link HandlerResolver} object that provides a list of SOAP
+ * handlers.
+ *
+ * @return the HandlerResolver or <code>null</code> if no handlers should be
+ * set
+ */
+ HandlerResolver getHandlerResolver();
+
+ /**
* Returns the SSL Socket Factory to be used when creating sockets for HTTPS
* connections.
*
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=1501947&r1=1501946&r2=1501947&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 Wed Jul 10 19:59:48 2013
@@ -113,7 +113,7 @@
<replace dir="${targetdir}/start">
<replacefilter token="@workbench.jar@" value="${workbench.jar}" />
<replacefilter token="@version@" value="Version: ${project.version} / Revision: ${revision} / Build: ${timestamp}" />
- <replacefilter token="@versionnummer@" value="${project.version}" />
+ <replacefilter token="@versionnumber@" value="${project.version}" />
</replace>
<chmod dir="${targetdir}/start" perm="+x" includes="**/*.sh" />
</target>
@@ -167,7 +167,10 @@
</descriptor>
<descriptor>
src/main/assembly/workbench-cxf-assembly.xml
- </descriptor>
+ </descriptor>
+ <descriptor>
+ src/main/assembly/workbench-axis2-assembly.xml
+ </descriptor>
</descriptors>
</configuration>
</execution>
@@ -247,7 +250,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -260,12 +263,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
@@ -278,9 +275,27 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache</groupId>
- <artifactId>apache-jar-resource-bundle</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${axis2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${axis2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
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=1501947&r1=1501946&r2=1501947&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 Wed Jul 10 19:59:48 2013
@@ -54,6 +54,7 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>junit:junit</exclude>
<exclude>org.apache.felix:org.osgi.core</exclude>
</excludes>
@@ -65,11 +66,9 @@
<scope>provided</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>wsdl4j</exclude>
- <exclude>org.apache.cxf</exclude>
- <exclude>org.apache.axis2</exclude>
- <exclude>org.apache:apache-jar-resource-bundle</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>org.apache.axis2:*</exclude>
+ <exclude>wsdl4j:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Added: 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=1501947&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-axis2-assembly.xml Wed Jul 10 19:59:48 2013
@@ -0,0 +1,88 @@
+<?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>axis2</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-axis2.sh</source>
+ <destName>workbench.sh</destName>
+ <outputDirectory></outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>target/start/workbench-axis2.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>com.sun.xml.ws:jaxws-rt</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>org.apache.felix:org.osgi.core</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <includes>
+ <include>org.apache.axis2:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <excludes>
+ <exclude>org.codehaus.woodstox:wstx-asl:*</exclude>
+ <exclude>org.apache.cxf:*</exclude>
+ <exclude>javax.servlet:*</exclude>
+ <exclude>commons-fileupload:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
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=1501947&r1=1501946&r2=1501947&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 Wed Jul 10 19:59:48 2013
@@ -56,20 +56,34 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>junit:junit</exclude>
<exclude>org.apache.felix:org.osgi.core</exclude>
</excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <useProjectArtifact></useProjectArtifact>
+ <useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
- <useTransitiveFiltering>true</useTransitiveFiltering>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <includes>
+ <include>org.apache.cxf:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>provided</scope>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>org.apache.axis2</exclude>
- <exclude>org.apache:apache-jar-resource-bundle</exclude>
+ <exclude>org.codehaus.woodstox:wstx-asl:*</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=1501947&r1=1501946&r2=1501947&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 Wed Jul 10 19:59:48 2013
@@ -64,6 +64,7 @@
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>com.sun.xml.ws:jaxws-rt</exclude>
<exclude>junit:junit</exclude>
<exclude>org.apache.felix:org.osgi.core</exclude>
</excludes>
@@ -75,11 +76,9 @@
<scope>provided</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>com.sun.xml.ws:jaxws-rt</exclude>
- <exclude>wsdl4j</exclude>
- <exclude>org.apache.cxf</exclude>
- <exclude>org.apache.axis2</exclude>
- <exclude>org.apache:apache-jar-resource-bundle</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/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java?rev=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/InfoDialog.java Wed Jul 10 19:59:48 2013
@@ -69,7 +69,7 @@ public class InfoDialog extends JDialog
StringBuilder readme = new StringBuilder();
- readme.append(loadText("/META-INF/README", "CMIS Workbench"));
+ readme.append(loadText("/META-INF/README-cmis-workbench.txt", "CMIS Workbench"));
readme.append("\n---------------------------------------------------------\n");
readme.append("\nCurrent System Properties:\n\n");
Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/META-INF/README-cmis-workbench.txt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/META-INF/README-cmis-workbench.txt?rev=1501947&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/META-INF/README-cmis-workbench.txt (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/META-INF/README-cmis-workbench.txt Wed Jul 10 19:59:48 2013
@@ -0,0 +1,67 @@
+CMIS Workbench
+
+This is a simple Content Management Interoperability Services (CMIS) client based on Swing and
+Apache Chemistry OpenCMIS (http://chemistry.apache.org/java/opencmis.html).
+
+This CMIS client is distributed under the Apache License, version 2.0.
+Please see the NOTICE and LICENSE files for details.
+
+
+Get the latest released CMIS Workbench from here:
+http://chemistry.apache.org/java/download.html
+
+
+
+System properties reference
+---------------------------
+
+Login dialog:
+
+cmis.workbench.url - preset URL
+cmis.workbench.user - preset user name
+cmis.workbench.password - preset password
+cmis.workbench.binding - preset binding (atompub/webservices/browser)
+cmis.workbench.authentication - preset authentication method (none/standard/ntlm)
+cmis.workbench.compression - preset compression (on/off)
+cmis.workbench.clientcompression - preset client compression (on/off)
+cmis.workbench.cookies - preset cookies (on/off)
+
+
+Folder operation context:
+
+cmis.workbench.folder.filter
+cmis.workbench.folder.includeAcls
+cmis.workbench.folder.includeAllowableActions
+cmis.workbench.folder.includePolicies
+cmis.workbench.folder.includeRelationships
+cmis.workbench.folder.renditionFilter
+cmis.workbench.folder.orderBy
+cmis.workbench.folder.maxItemsPerPage
+
+
+Object operation context:
+
+cmis.workbench.object.filter
+cmis.workbench.object.includeAcls
+cmis.workbench.object.includeAllowableActions
+cmis.workbench.object.includePolicies
+cmis.workbench.object.includeRelationships
+cmis.workbench.object.renditionFilter
+
+
+Version operation context:
+
+cmis.workbench.version.filter
+cmis.workbench.version.includeAcls
+cmis.workbench.version.includeAllowableActions
+cmis.workbench.version.includePolicies
+cmis.workbench.version.includeRelationships
+cmis.workbench.version.renditionFilter
+cmis.workbench.version.maxItemsPerPage
+
+Others:
+
+cmis.workbench.acceptSelfSignedCertificates - disable SSL certificate check (true/false)
+
+cmis.workbench.configs - path to a repository configuration library properties file
+cmis.workbench.scripts - path to Groovy scripts library properties file
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/info.plist
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/info.plist?rev=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/info.plist (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/info.plist Wed Jul 10 19:59:48 2013
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleName</key>
- <string>CMIS Workbench @versionnummer@</string>
+ <string>CMIS Workbench @versionnumber@</string>
<key>CFBundleIdentifier</key>
<string>org.apache.chemistry.opencmis.workbench</string>
<key>CFBundleExecutable</key>
@@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>@versionnummer@</string>
+ <string>@versionnumber@</string>
</dict>
</plist>
\ No newline at end of file
Added: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat?rev=1501947&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.bat Wed Jul 10 19:59:48 2013
@@ -0,0 +1,24 @@
+@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
+set "JAVA_OPTS=-Djava.net.useSystemProxies=true -Dorg.apache.chemistry.opencmis.binding.webservices.jaxws.impl=axis2"
+
+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-axis2.sh
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh?rev=1501947&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh Wed Jul 10 19:59:48 2013
@@ -0,0 +1,58 @@
+#!/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
+
+JAVA_OPTS="-Djava.net.useSystemProxies=true -Dorg.apache.chemistry.opencmis.binding.webservices.jaxws.impl=axis2"
+
+if [ -n "$http_proxy" ]; then
+ HTTP_PROXY_HOST=$(echo $http_proxy | sed 's/http:\/\/\(.*\):.*/\1/')
+ HTTP_PROXY_PORT=$(echo $http_proxy | sed 's/http:\/\/.*:\(.*\)/\1/')
+ JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyHost=$HTTP_PROXY_HOST -Dhttp.proxyPort=$HTTP_PROXY_PORT"
+fi
+
+if [ -n "$https_proxy" ]; then
+ HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/http:\/\/\(.*\):.*/\1/')
+ HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/http:\/\/.*:\(.*\)/\1/')
+ JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyHost=$HTTPS_PROXY_HOST -Dhttps.proxyPort=$HTTPS_PROXY_PORT"
+fi
+
+
+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=1501947&r1=1501946&r2=1501947&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Wed Jul 10 19:59:48 2013
@@ -234,7 +234,7 @@
<junit.version>4.11</junit.version>
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
- <cxf.version>2.7.4</cxf.version>
+ <cxf.version>2.7.5</cxf.version>
<axis2.version>1.6.2</axis2.version>
</properties>