Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 38425 invoked from network); 21 Jan 2008 10:40:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2008 10:40:37 -0000 Received: (qmail 55318 invoked by uid 500); 21 Jan 2008 10:40:27 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 55287 invoked by uid 500); 21 Jan 2008 10:40:27 -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 55278 invoked by uid 99); 21 Jan 2008 10:40:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 02:40:26 -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; Mon, 21 Jan 2008 10:40:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D62A1A9832; Mon, 21 Jan 2008 02:40:02 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r613834 - /jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/Locked.java Date: Mon, 21 Jan 2008 10:40:02 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080121104002.8D62A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Mon Jan 21 02:40:00 2008 New Revision: 613834 URL: http://svn.apache.org/viewvc?rev=613834&view=rev Log: JCR-1331: Improper deprecation of Locked class - Removed deprecation and the use of name resolver classes Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/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=613834&r1=613833&r2=613834&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 Mon Jan 21 02:40:00 2008 @@ -16,11 +16,6 @@ */ 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; @@ -75,13 +70,12 @@ * 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. @@ -137,17 +131,16 @@ } Session session = lockable.getSession(); - SessionNamespaceResolver resolver = new SessionNamespaceResolver(session); - Lock lock; EventListener listener = null; try { // check whether the lockable can be locked at all - if (!lockable.isNodeType(NameFormat.format(QName.MIX_LOCKABLE, resolver))) { + String mix = session.getNamespacePrefix(MIX); + if (!lockable.isNodeType(mix + ":lockable")) { throw new IllegalArgumentException("Node is not lockable"); } - lock = tryLock(lockable, isDeep); + Lock lock = tryLock(lockable, isDeep); if (lock != null) { return runAndUnlock(lock); } @@ -205,8 +198,6 @@ } } } - } catch (NoPrefixDeclaredException e) { - throw new RepositoryException(e); } finally { if (listener != null) { session.getWorkspace().getObservationManager().removeEventListener(listener);