Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 58772 invoked from network); 23 Mar 2007 09:37:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Mar 2007 09:37:11 -0000 Received: (qmail 41944 invoked by uid 500); 23 Mar 2007 09:37:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 41909 invoked by uid 500); 23 Mar 2007 09:37:19 -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 41889 invoked by uid 99); 23 Mar 2007 09:37:19 -0000 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; Fri, 23 Mar 2007 02:37:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 789BA1A9838; Fri, 23 Mar 2007 02:35:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r521645 - /jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java Date: Fri, 23 Mar 2007 09:35:49 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070323093549.789BA1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri Mar 23 02:35:48 2007 New Revision: 521645 URL: http://svn.apache.org/viewvc?view=rev&rev=521645 Log: fix retrieval of declaring node type from xml format Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java?view=diff&rev=521645&r1=521644&r2=521645 ============================================================================== --- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java (original) +++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QItemDefinitionImpl.java Fri Mar 23 02:35:48 2007 @@ -25,7 +25,6 @@ import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.webdav.jcr.nodetype.NodeTypeConstants; -import org.apache.jackrabbit.webdav.xml.DomUtil; import javax.jcr.version.OnParentVersionAction; import javax.jcr.RepositoryException; @@ -79,16 +78,6 @@ /** * - * @param itemDefElement - * @param nsResolver - * @throws RepositoryException - */ - QItemDefinitionImpl(Element itemDefElement, NamespaceResolver nsResolver) throws RepositoryException { - this(null, itemDefElement, nsResolver); - } - - /** - * * @param declaringNodeType * @param itemDefElement * @param nsResolver @@ -97,9 +86,9 @@ QItemDefinitionImpl(QName declaringNodeType, Element itemDefElement, NamespaceResolver nsResolver) throws RepositoryException { try { - // TODO: webdav server sends jcr names -> nsResolver required. improve this. - if (DomUtil.hasChildElement(itemDefElement, DECLARINGNODETYPE_ATTRIBUTE, null)) { - QName dnt = NameFormat.parse(itemDefElement.getAttribute(DECLARINGNODETYPE_ATTRIBUTE), nsResolver); + String attr = itemDefElement.getAttribute(DECLARINGNODETYPE_ATTRIBUTE); + if (attr != null) { + QName dnt = NameFormat.parse(attr, nsResolver); if (declaringNodeType != null && !declaringNodeType.equals(dnt)) { throw new RepositoryException("Declaring nodetype mismatch: In element = '" + dnt + "', Declaring nodetype = '" + declaringNodeType + "'"); }