Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 19880 invoked from network); 9 Jun 2009 13:56:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jun 2009 13:56:56 -0000 Received: (qmail 10334 invoked by uid 500); 9 Jun 2009 13:57:08 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 10285 invoked by uid 500); 9 Jun 2009 13:57:08 -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 10276 invoked by uid 99); 9 Jun 2009 13:57:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 13:57:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2009 13:57:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DD65E2388892; Tue, 9 Jun 2009 13:56:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r783004 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java Date: Tue, 09 Jun 2009 13:56:45 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090609135645.DD65E2388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Jun 9 13:56:45 2009 New Revision: 783004 URL: http://svn.apache.org/viewvc?rev=783004&view=rev Log: JCR-2104: JSR 283 Full Versioning - clean up.... Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java?rev=783004&r1=783003&r2=783004&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java Tue Jun 9 13:56:45 2009 @@ -236,21 +236,10 @@ } /** - * @see javax.jcr.version.VersionManager#removeActivity(String) - */ - public Node removeActivity(String title) throws UnsupportedRepositoryOperationException, RepositoryException { - // TODO uncomment as soon as jsr 283 is fixed - // vMgr.removeActivity((NodeState) ((NodeImpl) activityNode).getItemState()); - throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); - } - - /** * @see javax.jcr.version.VersionManager#removeActivity(Node) */ - public void removeActivity(Node node) throws RepositoryException { - // TODO - throw new UnsupportedRepositoryOperationException( - "JCR-2104: JSR 283 Versioning. Implementation missing"); + public void removeActivity(Node activityNode) throws UnsupportedRepositoryOperationException, RepositoryException { + vMgr.removeActivity((NodeState) ((NodeImpl) activityNode).getItemState()); } /**