Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 3C283F153 for ; Tue, 9 Apr 2013 16:58:07 +0000 (UTC) Received: (qmail 61708 invoked by uid 500); 9 Apr 2013 16:58:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 61664 invoked by uid 500); 9 Apr 2013 16:58:07 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 61656 invoked by uid 99); 9 Apr 2013 16:58:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2013 16:58:07 +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; Tue, 09 Apr 2013 16:58:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 893ED23888FD; Tue, 9 Apr 2013 16:57:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466129 - in /jackrabbit/branches/2.6: ./ jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Date: Tue, 09 Apr 2013 16:57:45 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130409165745.893ED23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Tue Apr 9 16:57:45 2013 New Revision: 1466129 URL: http://svn.apache.org/r1466129 Log: JCR-3565: AbstractLocatorFactory.createResourceLocator needs to be called with an absolute URI as prefix (ported to 2.6) Modified: jackrabbit/branches/2.6/ (props changed) jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Propchange: jackrabbit/branches/2.6/ ------------------------------------------------------------------------------ Merged /jackrabbit/trunk:r1466060,1466085 Modified: jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java?rev=1466129&r1=1466128&r2=1466129&view=diff ============================================================================== --- jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java (original) +++ jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Tue Apr 9 16:57:45 2013 @@ -88,6 +88,10 @@ public abstract class AbstractLocatorFac throw new IllegalArgumentException("Request handle must not be null."); } + if (prefix == null || prefix.length() == 0) { + throw new IllegalArgumentException("Prefix must be an absolute URI."); + } + // build prefix string and remove all prefixes from the given href. StringBuffer b = new StringBuffer(""); if (prefix != null && prefix.length() > 0) { Modified: jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java?rev=1466129&r1=1466128&r2=1466129&view=diff ============================================================================== --- jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java (original) +++ jackrabbit/branches/2.6/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Tue Apr 9 16:57:45 2013 @@ -88,6 +88,7 @@ public class WebdavRequestImpl implement private final DavLocatorFactory factory; private final IfHeader ifHeader; private final String hrefPrefix; + private final String uriPrefix; private DavSession session; @@ -115,13 +116,10 @@ public class WebdavRequestImpl implement this.factory = factory; this.ifHeader = new IfHeader(httpRequest); - if (createAbsoluteURI) { - String host = getHeader("Host"); - String scheme = getScheme(); - hrefPrefix = scheme + "://" + host + getContextPath(); - } else { - hrefPrefix = getContextPath(); - } + String host = getHeader("Host"); + String scheme = getScheme(); + this.uriPrefix = scheme + "://" + host + getContextPath(); + this.hrefPrefix = createAbsoluteURI ? this.uriPrefix : getContextPath(); } /** @@ -167,7 +165,7 @@ public class WebdavRequestImpl implement if (path.startsWith(ctx)) { path = path.substring(ctx.length()); } - return factory.createResourceLocator(hrefPrefix, path); + return factory.createResourceLocator(uriPrefix, path); } /** @@ -223,7 +221,7 @@ public class WebdavRequestImpl implement throw new DavException(DavServletResponse.SC_FORBIDDEN); } } - return factory.createResourceLocator(hrefPrefix, ref); + return factory.createResourceLocator(uriPrefix, ref); } /** @@ -233,7 +231,7 @@ public class WebdavRequestImpl implement */ public DavResourceLocator getMemberLocator(String segment) { String path = (this.getRequestLocator().getHref(true) + segment).substring(hrefPrefix.length()); - return factory.createResourceLocator(hrefPrefix, path); + return factory.createResourceLocator(uriPrefix, path); } /**