Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 40538 invoked from network); 22 Jan 2008 09:53:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Jan 2008 09:53:47 -0000 Received: (qmail 26298 invoked by uid 500); 22 Jan 2008 09:53:37 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 26261 invoked by uid 500); 22 Jan 2008 09:53:37 -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 26252 invoked by uid 99); 22 Jan 2008 09:53:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2008 01:53:37 -0800 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; Tue, 22 Jan 2008 09:53:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 18ABE1A9832; Tue, 22 Jan 2008 01:53:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r614158 - in /jackrabbit/trunk: jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java Date: Tue, 22 Jan 2008 09:53:11 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080122095312.18ABE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Jan 22 01:53:09 2008 New Revision: 614158 URL: http://svn.apache.org/viewvc?rev=614158&view=rev Log: JCR-1331: Improper deprecation of Locked class - Reverted revisions 613834 and 613841 as requested by Angela Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java?rev=614158&r1=614157&r2=614158&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java Tue Jan 22 01:53:09 2008 @@ -16,6 +16,11 @@ */ package org.apache.jackrabbit.util; +import org.apache.jackrabbit.name.NameFormat; +import org.apache.jackrabbit.name.NoPrefixDeclaredException; +import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.name.SessionNamespaceResolver; + import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -70,12 +75,13 @@ * long nextValue = ((Long) ret).longValue(); * } * + * + * @deprecated Use the Locked class from + * the org.apache.jackrabbit.spi.commons.lock package of + * the jackrabbit-spi-commons component. */ public abstract class Locked { - /** The mixin namespace */ - private static final String MIX = "http://www.jcp.org/jcr/mix/1.0"; - /** * Object returned when timeout is reached without being able to call * {@link #run} while holding the lock. @@ -131,16 +137,17 @@ } Session session = lockable.getSession(); + SessionNamespaceResolver resolver = new SessionNamespaceResolver(session); + Lock lock; EventListener listener = null; try { // check whether the lockable can be locked at all - String mix = session.getNamespacePrefix(MIX); - if (!lockable.isNodeType(mix + ":lockable")) { + if (!lockable.isNodeType(NameFormat.format(QName.MIX_LOCKABLE, resolver))) { throw new IllegalArgumentException("Node is not lockable"); } - Lock lock = tryLock(lockable, isDeep); + lock = tryLock(lockable, isDeep); if (lock != null) { return runAndUnlock(lock); } @@ -198,6 +205,8 @@ } } } + } catch (NoPrefixDeclaredException e) { + throw new RepositoryException(e); } finally { if (listener != null) { session.getWorkspace().getObservationManager().removeEventListener(listener); Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java?rev=614158&r1=614157&r2=614158&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/Locked.java Tue Jan 22 01:53:09 2008 @@ -76,8 +76,6 @@ * long nextValue = ((Long) ret).longValue(); * } * - * - * @deprecated use the Locked class in the jackrabbit-jcr-commons component */ public abstract class Locked {