You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2013/04/18 16:54:55 UTC
svn commit: r1469359 - in /jackrabbit/branches/2.6: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Author: reschke
Date: Thu Apr 18 14:54:54 2013
New Revision: 1469359
URL: http://svn.apache.org/r1469359
Log:
JCR-3574: leverage WebDAV 3 compliance class to use absolute paths in Destination header field (ported to 2.6)
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1469312
Modified: jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1469359&r1=1469358&r2=1469359&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Thu Apr 18 14:54:54 2013
@@ -251,6 +251,9 @@ public class RepositoryServiceImpl imple
private boolean remoteServerProvidesNodeTypes = false;
private boolean remoteServerProvidesNoLocalFlag = false;
+ /* DAV conformance levels */
+ private Set<String> remoteDavComplianceClasses = null;
+
/**
* Same as {@link #RepositoryServiceImpl(String, IdFactory, NameFactory, PathFactory, QValueFactory, int, int)}
* using {@link ItemInfoCacheImpl#DEFAULT_CACHE_SIZE)} as size for the item
@@ -1460,6 +1463,9 @@ public class RepositoryServiceImpl imple
public void move(SessionInfo sessionInfo, NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException {
String uri = getItemUri(srcNodeId, sessionInfo);
String destUri = getItemUri(destParentNodeId, destName, sessionInfo);
+ if (isDavClass3(sessionInfo)) {
+ destUri = obtainAbsolutePathFromUri(destUri);
+ }
MoveMethod method = new MoveMethod(uri, destUri, false);
execute(method, sessionInfo);
// need to clear the cache as the move may have affected nodes with uuid.
@@ -1472,6 +1478,9 @@ public class RepositoryServiceImpl imple
public void copy(SessionInfo sessionInfo, String srcWorkspaceName, NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException {
String uri = uriResolver.getItemUri(srcNodeId, srcWorkspaceName, sessionInfo);
String destUri = getItemUri(destParentNodeId, destName, sessionInfo);
+ if (isDavClass3(sessionInfo)) {
+ destUri = obtainAbsolutePathFromUri(destUri);
+ }
CopyMethod method = new CopyMethod(uri, destUri, false, false);
execute(method, sessionInfo);
}
@@ -2768,6 +2777,58 @@ public class RepositoryServiceImpl imple
return new DefaultDavProperty<List<XmlSerializable>>(localName, val, ItemResourceConstants.NAMESPACE, false);
}
+ private Set<String> getDavComplianceClasses(SessionInfo sessionInfo) throws RepositoryException {
+ if (this.remoteDavComplianceClasses == null) {
+ OptionsMethod method = new OptionsMethod(uriResolver.getWorkspaceUri(sessionInfo.getWorkspaceName()));
+ try {
+ getClient(sessionInfo).executeMethod(method);
+ method.checkSuccess();
+ Header davHeader = method.getResponseHeader("DAV");
+ if (davHeader!= null) {
+ // TODO: think about coded-URLs containing a comma
+ String[] classes = davHeader.getValue().split(",");
+ this.remoteDavComplianceClasses = new HashSet<String>();
+ for (String c : classes) {
+ this.remoteDavComplianceClasses.add(c.trim());
+ }
+ }
+ } catch (IOException e) {
+ throw new RepositoryException(e);
+ } catch (DavException e) {
+ throw ExceptionConverter.generate(e);
+ } finally {
+ method.releaseConnection();
+ }
+ }
+ return this.remoteDavComplianceClasses;
+ }
+
+ private boolean isDavClass3(SessionInfo sessionInfo) {
+ try {
+ return getDavComplianceClasses(sessionInfo).contains("3");
+ }
+ catch (RepositoryException ex) {
+ log.warn("failure to obtain OPTIONS response", ex);
+ return false;
+ }
+ }
+
+ private static String obtainAbsolutePathFromUri(String uri) {
+ try {
+ java.net.URI u = new java.net.URI(uri);
+ StringBuilder sb = new StringBuilder();
+ sb.append(u.getRawPath());
+ if (u.getRawQuery() != null) {
+ sb.append("?" + u.getRawQuery());
+ }
+ return sb.toString();
+ }
+ catch (java.net.URISyntaxException ex) {
+ log.warn("parsing " + uri, ex);
+ return uri;
+ }
+ }
+
/**
* The XML elements and attributes used in serialization
*/
@@ -3127,6 +3188,9 @@ public class RepositoryServiceImpl imple
checkConsumed();
String uri = getItemUri(srcNodeId, sessionInfo);
String destUri = getItemUri(destParentNodeId, destName, sessionInfo);
+ if (isDavClass3(sessionInfo)) {
+ destUri = obtainAbsolutePathFromUri(destUri);
+ }
MoveMethod method = new MoveMethod(uri, destUri, false);
methods.add(method);