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 68728F653 for ; Fri, 19 Apr 2013 13:07:59 +0000 (UTC) Received: (qmail 21087 invoked by uid 500); 19 Apr 2013 13:07:59 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 21027 invoked by uid 500); 19 Apr 2013 13:07:58 -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 20993 invoked by uid 99); 19 Apr 2013 13:07:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 13:07:57 +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; Fri, 19 Apr 2013 13:07:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA85823888E7; Fri, 19 Apr 2013 13:07:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1469815 - in /jackrabbit/branches/2.6: ./ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Date: Fri, 19 Apr 2013 13:07:33 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130419130733.EA85823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri Apr 19 13:07:33 2013 New Revision: 1469815 URL: http://svn.apache.org/r1469815 Log: JCR-3575: use absolute paths in WebDAV request bodies (DAV:href elements) (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:r1469799 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=1469815&r1=1469814&r2=1469815&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 Fri Apr 19 13:07:33 2013 @@ -867,7 +867,7 @@ public class RepositoryServiceImpl imple public boolean isGranted(SessionInfo sessionInfo, ItemId itemId, String[] actions) throws RepositoryException { ReportMethod method = null; try { - String uri = getItemUri(itemId, sessionInfo); + String uri = obtainAbsolutePathFromUri(getItemUri(itemId, sessionInfo)); ReportInfo reportInfo = new ReportInfo(JcrRemotingConstants.REPORT_PRIVILEGES, ItemResourceConstants.NAMESPACE); reportInfo.setContentElement(DomUtil.hrefToXml(uri, DomUtil.createDocument())); @@ -1797,7 +1797,11 @@ public class RepositoryServiceImpl imple uInfo = new UpdateInfo(uElem); } else { - uInfo = new UpdateInfo(updateSource, updateType, new DavPropertyNameSet()); + String tmpUpdateSource[] = new String[updateSource.length]; + for (int i = 0; i < updateSource.length; i++) { + tmpUpdateSource[i] = obtainAbsolutePathFromUri(updateSource[i]); + } + uInfo = new UpdateInfo(tmpUpdateSource, updateType, new DavPropertyNameSet()); } UpdateMethod method = new UpdateMethod(uri, uInfo);