Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 35171 invoked from network); 27 Mar 2007 15:52:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Mar 2007 15:52:56 -0000 Received: (qmail 37539 invoked by uid 500); 27 Mar 2007 15:53:03 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 37451 invoked by uid 500); 27 Mar 2007 15:53:03 -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 37442 invoked by uid 99); 27 Mar 2007 15:53:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Mar 2007 08:53:03 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Mar 2007 08:52:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5C1831A9838; Tue, 27 Mar 2007 08:52:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r522962 - in /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr: DefaultItemCollection.java ItemResourceConstants.java Date: Tue, 27 Mar 2007 15:52:34 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070327155235.5C1831A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Mar 27 08:52:31 2007 New Revision: 522962 URL: http://svn.apache.org/viewvc?view=rev&rev=522962 Log: ImportXML: uuidbehavior not transported Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java?view=diff&rev=522962&r1=522961&r2=522962 ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java Tue Mar 27 08:52:31 2007 @@ -380,14 +380,23 @@ n.addNode(memberName); } else { // MKCOL, which is not allowed for existing resources + int uuidBehavior = ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW; + String str = inputContext.getProperty(IMPORT_UUID_BEHAVIOR); + if (str != null) { + try { + uuidBehavior = Integer.parseInt(str); + } catch (NumberFormatException e) { + throw new DavException(DavServletResponse.SC_BAD_REQUEST); + } + } if (getTransactionId() == null) { // if not part of a transaction directely import on workspace // since changes would be explicitely saved in the // complete-call. - getRepositorySession().getWorkspace().importXML(itemPath, in, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); + getRepositorySession().getWorkspace().importXML(itemPath, in, uuidBehavior); } else { // changes will not be persisted unless the tx is completed. - getRepositorySession().importXML(itemPath, in, ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); + getRepositorySession().importXML(itemPath, in, uuidBehavior); } } } else { Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java?view=diff&rev=522962&r1=522961&r2=522962 ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java Tue Mar 27 08:52:31 2007 @@ -57,6 +57,8 @@ */ public static final Namespace NAMESPACE = Namespace.getNamespace("dcr", "http://www.day.com/jcr/webdav/1.0"); + public static final String IMPORT_UUID_BEHAVIOR = "ImportUUIDBehavior"; + // xml element names public static final String XML_PRIMARYNODETYPE = "primarynodetype"; public static final String XML_VALUE = "value";