Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 78704 invoked from network); 5 May 2009 10:35:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 May 2009 10:35:57 -0000 Received: (qmail 24517 invoked by uid 500); 5 May 2009 10:35:57 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 24434 invoked by uid 500); 5 May 2009 10:35:57 -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 24425 invoked by uid 99); 5 May 2009 10:35:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 10:35:56 +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, 05 May 2009 10:35:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8139123888F4; Tue, 5 May 2009 10:30:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771657 - in /jackrabbit/trunk/jackrabbit-core/src/main: java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties Date: Tue, 05 May 2009 10:30:33 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090505103033.8139123888F4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue May 5 10:30:31 2009 New Revision: 771657 URL: http://svn.apache.org/viewvc?rev=771657&view=rev Log: JCR-2085: test case (TCK) maintenance for JCR 2.0 Move the retention data from /testdata to /testconf to avoid problems in SPI tests. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java?rev=771657&r1=771656&r2=771657&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java Tue May 5 10:30:31 2009 @@ -200,8 +200,10 @@ addQueryTestData(getOrAddNode(data, "query")); addNodeTestData(getOrAddNode(data, "node")); addExportTestData(getOrAddNode(data, "docViewTest")); - addRetentionTestData(getOrAddNode(data, "retentionTest")); - + + Node conf = getOrAddNode(session.getRootNode(), "testconf"); + addRetentionTestData(getOrAddNode(conf, "retentionTest")); + session.save(); } Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties?rev=771657&r1=771656&r2=771657&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/JackrabbitRepositoryStub.properties Tue May 5 10:30:31 2009 @@ -508,4 +508,4 @@ # ============================================================================== # JAVAX.JCR.RETENTION CONFIGURATION # ============================================================================== -javax.jcr.tck.retentionpolicyholder=/testdata/retentionTest +javax.jcr.tck.retentionpolicyholder=/testconf/retentionTest