Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 43469 invoked from network); 5 Oct 2006 07:14:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Oct 2006 07:14:50 -0000 Received: (qmail 19287 invoked by uid 500); 5 Oct 2006 07:14:49 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 19261 invoked by uid 500); 5 Oct 2006 07:14:49 -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 19252 invoked by uid 99); 5 Oct 2006 07:14:49 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Oct 2006 00:14:49 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:53724] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 9F/20-20288-AD0B4254 for ; Thu, 05 Oct 2006 00:14:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7DE301A981A; Thu, 5 Oct 2006 00:14:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r453121 - /jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Date: Thu, 05 Oct 2006 07:14:10 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061005071410.7DE301A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Thu Oct 5 00:14:09 2006 New Revision: 453121 URL: http://svn.apache.org/viewvc?view=rev&rev=453121 Log: - update type not when creating from xml - building update-elmenent for workspace-update not consistent with parsing. Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java?view=diff&rev=453121&r1=453120&r2=453121 ============================================================================== --- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java (original) +++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Thu Oct 5 00:14:09 2006 @@ -107,12 +107,14 @@ hrefList.add(DomUtil.getText(hrefs.nextElement())); } source = (String[])hrefList.toArray(new String[hrefList.size()]); + type = UPDATE_BY_VERSION; done = true; } // alternatively 'DAV:label-name' elements may be present. if (!done && DomUtil.hasChildElement(updateElement, XML_LABEL_NAME, NAMESPACE)) { source = new String[] {DomUtil.getChildText(updateElement, XML_LABEL_NAME, NAMESPACE)}; + type = UPDATE_BY_LABEL; done = true; } @@ -121,6 +123,7 @@ Element wspElem = DomUtil.getChildElement(updateElement, XML_WORKSPACE, NAMESPACE); if (wspElem != null) { source = new String[] {DomUtil.getChildTextTrim(wspElem, DavConstants.XML_HREF, DavConstants.NAMESPACE)}; + type = UPDATE_BY_WORKSPACE; } else { log.warn("DAV:update element must contain either DAV:version, DAV:label-name or DAV:workspace child element."); throw new DavException(DavServletResponse.SC_BAD_REQUEST); @@ -228,7 +231,8 @@ DomUtil.addChildElement(elem, XML_LABEL_NAME, NAMESPACE, updateSource[0]); break; case UPDATE_BY_WORKSPACE: - DomUtil.addChildElement(elem, XML_WORKSPACE, NAMESPACE, updateSource[0]); + Element wspEl = DomUtil.addChildElement(elem, XML_WORKSPACE, NAMESPACE, updateSource[0]); + wspEl.appendChild(DomUtil.hrefToXml(updateSource[0], factory)); break; // no default. default: