Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 67717 invoked from network); 20 Sep 2007 18:21:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Sep 2007 18:21:46 -0000 Received: (qmail 67636 invoked by uid 500); 20 Sep 2007 18:21:38 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 67603 invoked by uid 500); 20 Sep 2007 18:21:38 -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 67594 invoked by uid 99); 20 Sep 2007 18:21:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2007 11:21:38 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 20 Sep 2007 18:21:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 174021A9832; Thu, 20 Sep 2007 11:21:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577852 - /jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java Date: Thu, 20 Sep 2007 18:21:25 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070920182126.174021A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Sep 20 11:21:25 2007 New Revision: 577852 URL: http://svn.apache.org/viewvc?rev=577852&view=rev Log: 1.3: Merged revision 568259 (JCR-1068) Modified: jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java Modified: jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java?rev=577852&r1=577851&r2=577852&view=diff ============================================================================== --- jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java (original) +++ jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryTest.java Thu Sep 20 11:21:25 2007 @@ -18,6 +18,7 @@ import org.apache.jackrabbit.test.AbstractJCRTest; +import javax.jcr.Item; import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.NamespaceException; @@ -136,11 +137,21 @@ assertEquals("Namespace prefix was not registered.", namespacePrefix, nsp.getPrefix(namespaceUri)); assertEquals("Namespace URI was not registered.", namespaceUri, nsp.getURI(namespacePrefix)); - testRootNode.addNode(namespacePrefix + ":root"); - testRootNode.save(); + Item created; + + try { + created = testRootNode.addNode(namespacePrefix + ":root"); + testRootNode.save(); + } + catch (RepositoryException ex) { + // that didn't work; maybe the repository allows a property here? + testRootNode.getSession().refresh(false); + created = testRootNode.setProperty(namespacePrefix + ":root", "test"); + testRootNode.save(); + } // Need to remove it here, otherwise teardown can't unregister the NS. - testRootNode.getNode(namespacePrefix + ":root").remove(); + testRootNode.getSession().getItem(created.getPath()).remove(); testRootNode.save(); }