Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 29BAA962A for ; Tue, 17 Jan 2012 16:12:26 +0000 (UTC) Received: (qmail 63192 invoked by uid 500); 17 Jan 2012 16:12:26 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 63159 invoked by uid 500); 17 Jan 2012 16:12:25 -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 63145 invoked by uid 99); 17 Jan 2012 16:12:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jan 2012 16:12:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 17 Jan 2012 16:12:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D8080238889B; Tue, 17 Jan 2012 16:11:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1232456 - in /jackrabbit/branches/2.4: ./ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/t... Date: Tue, 17 Jan 2012 16:11:52 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120117161153.D8080238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Jan 17 16:11:51 2012 New Revision: 1232456 URL: http://svn.apache.org/viewvc?rev=1232456&view=rev Log: 2.4: Merged revisions 1225525, 1225528, 1226452, 1226472 and 1226515 (JCR-3177) Modified: jackrabbit/branches/2.4/ (props changed) jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/OpenScopedLockTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeCancelMergeTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionCopyTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionHistoryTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionLabelTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/CheckinTest.java jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/RestoreTest.java Propchange: jackrabbit/branches/2.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 16:11:51 2012 @@ -1,3 +1,3 @@ /jackrabbit/branches/JCR-2272:1173165-1176545 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038 -/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1227240 +/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225525,1225528,1226452,1226472,1226515,1227240 Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java Tue Jan 17 16:11:51 2012 @@ -1119,13 +1119,11 @@ public class ExportDocViewTest extends A private static final String xmlnsURI = "http://www.w3.org/2000/xmlns/"; private static final String xmlnsPrefix = "xmlns"; - Element elem; NamedNodeMap attrs; Map nsAttrs; Map nonNsAttrs; AttributeSeparator(Element elem) { - this.elem = elem; nsAttrs = new HashMap(); nonNsAttrs = new HashMap(); attrs = elem.getAttributes(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java Tue Jan 17 16:11:51 2012 @@ -1446,7 +1446,7 @@ public class ShareableNodeTest extends A * @return node array */ private static Node[] toArray(NodeIterator iter) { - ArrayList list = new ArrayList(); + List list = new ArrayList(); while (iter.hasNext()) { list.add(iter.nextNode()); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java Tue Jan 17 16:11:51 2012 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.test.api.lock; import org.apache.jackrabbit.test.NotExecutableException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -28,8 +26,6 @@ import javax.jcr.lock.LockException; /** DeepLockTest... */ public class DeepLockTest extends AbstractLockTest { - private static Logger log = LoggerFactory.getLogger(DeepLockTest.class); - protected boolean isSessionScoped() { return true; } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java Tue Jan 17 16:11:51 2012 @@ -30,14 +30,10 @@ import javax.jcr.lock.LockManager; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** LockManagerTest... */ public class LockManagerTest extends AbstractJCRTest { - private static Logger log = LoggerFactory.getLogger(LockManagerTest.class); - protected LockManager lockMgr; protected Node testNode; protected String testPath; Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/OpenScopedLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/OpenScopedLockTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/OpenScopedLockTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/OpenScopedLockTest.java Tue Jan 17 16:11:51 2012 @@ -16,14 +16,9 @@ */ package org.apache.jackrabbit.test.api.lock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** OpenScopedLockTest... */ public class OpenScopedLockTest extends AbstractLockTest { - private static Logger log = LoggerFactory.getLogger(OpenScopedLockTest.class); - protected boolean isSessionScoped() { return false; } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java Tue Jan 17 16:11:51 2012 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.test.api.lock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.jackrabbit.test.NotExecutableException; import javax.jcr.RepositoryException; @@ -30,8 +28,6 @@ import javax.jcr.lock.LockManager; /** SessionScopedLockTest... */ public class SessionScopedLockTest extends AbstractLockTest { - private static Logger log = LoggerFactory.getLogger(SessionScopedLockTest.class); - protected boolean isSessionScoped() { return true; } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java Tue Jan 17 16:11:51 2012 @@ -219,7 +219,6 @@ public class HoldEffectTest extends Abst } private void assertNoEffect(Property target) throws RepositoryException { - Session s = target.getSession(); target.setValue("test3"); target.remove(); } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java Tue Jan 17 16:11:51 2012 @@ -403,13 +403,11 @@ public class HoldTest extends AbstractRe } public void testHoldIsDeep() throws RepositoryException, NotExecutableException { - String holdName = getHoldName(); Hold h = retentionMgr.addHold(testNodePath, getHoldName(), false); assertEquals("Hold.isDeep() must reflect the specified flag.", false, h.isDeep()); } public void testHoldIsDeep2() throws RepositoryException, NotExecutableException { - String holdName = getHoldName(); Hold h = retentionMgr.addHold(testNodePath, getHoldName(), true); assertEquals("Hold.isDeep() must reflect the specified flag.", true, h.isDeep()); } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java Tue Jan 17 16:11:51 2012 @@ -164,7 +164,6 @@ public class RetentionPolicyEffectTest e } private void assertNoEffect(Property target) throws RepositoryException { - Session s = target.getSession(); target.setValue("test3"); target.remove(); } Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java Tue Jan 17 16:11:51 2012 @@ -47,6 +47,7 @@ public class CheckinTest extends Abstrac * * @throws javax.jcr.RepositoryException */ + @SuppressWarnings("deprecation") public void testIsCheckedOut() throws RepositoryException { versionableNode.checkin(); assertTrue("After calling Node.checkin() on a versionable node N, N.isCheckedOut() must return false", versionableNode.isCheckedOut() == false); @@ -71,6 +72,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinRemovesPredecessorProperty() throws RepositoryException { versionableNode.checkin(); @@ -101,6 +103,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testPredecessorIsCopiedToNewVersion() throws RepositoryException { Value[] nPredecessorsValue = versionableNode.getProperty(jcrPredecessors).getValues(); @@ -134,6 +137,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testMultipleCheckinHasNoEffect() throws RepositoryException { Version v = versionableNode.checkin(); @@ -172,6 +176,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testBaseVersionAfterCheckin() throws RepositoryException { Version v = versionableNode.checkin(); Value baseVersionRef = versionableNode.getProperty(jcrBaseVersion).getValue(); @@ -200,6 +205,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinWithPendingChanges() throws RepositoryException { try { // modify node without calling save() @@ -237,6 +243,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testIsNotCheckedOut() throws RepositoryException { versionableNode.checkin(); boolean isCheckedOut = versionableNode.isCheckedOut(); @@ -263,6 +270,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinCreatesNewVersion() throws RepositoryException { long initialNumberOfVersions = getNumberOfVersions(versionableNode.getVersionHistory()); @@ -293,6 +301,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinNonVersionableNode() throws RepositoryException { try { nonVersionableNode.checkin(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java Tue Jan 17 16:11:51 2012 @@ -52,6 +52,7 @@ public class CheckoutTest extends Abstra * Test if Node.isCheckedOut() returns true, if the versionable node has * been checked out before. */ + @SuppressWarnings("deprecation") public void testIsCheckedOut() throws RepositoryException { versionableNode.checkout(); assertTrue("After calling Node.checkout() a versionable node N, N.isCheckedOut() must return true.", versionableNode.isCheckedOut()); @@ -127,6 +128,7 @@ public class CheckoutTest extends Abstra /** * Test calling Node.checkout() on a non-versionable node. */ + @SuppressWarnings("deprecation") public void testCheckoutNonVersionableNode() throws RepositoryException { try { nonVersionableNode.checkout(); @@ -155,6 +157,7 @@ public class CheckoutTest extends Abstra * Test if Node.checkout() doesn't throw any exception if the versionable * node has been checked out before. */ + @SuppressWarnings("deprecation") public void testCheckoutTwiceDoesNotThrow() throws RepositoryException { versionableNode.checkout(); versionableNode.checkout(); @@ -176,6 +179,7 @@ public class CheckoutTest extends Abstra * Test if Node.checkout() copies the node's jcr:baseVersion to node's * jcr:predecessors property (no save required). */ + @SuppressWarnings("deprecation") public void testCheckoutCopiesBaseValueToPredecessorProperty() throws RepositoryException { Value baseVersionValue = versionableNode.getProperty(jcrBaseVersion).getValue(); versionableNode.checkout(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeCancelMergeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeCancelMergeTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeCancelMergeTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeCancelMergeTest.java Tue Jan 17 16:11:51 2012 @@ -58,6 +58,7 @@ public class MergeCancelMergeTest extend * the jcr:mergeFailed property of N.
without adding it to * jcr:predecessors.
Branches will not be joined.
*/ + @SuppressWarnings("deprecation") public void testMergeNodeCancelMerge() throws RepositoryException { // create 2 independent versions for a node and its corresponding node // so merge fails for this node Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java Tue Jan 17 16:11:51 2012 @@ -67,6 +67,7 @@ public class MergeNodeTest extends Abstr * Node.merge(): InvalidItemStateException if unsaved changes within the * current Session
*/ + @SuppressWarnings("deprecation") public void testMergeNodeWithUnsavedStates() throws RepositoryException { // set a property and do not save workspace nodeToMerge.setProperty(propertyName1, CHANGED_STRING); @@ -97,6 +98,7 @@ public class MergeNodeTest extends Abstr /** * Perform a merge on a node with a unkwnown workspacename */ + @SuppressWarnings("deprecation") public void testMergeUnknownWorkspaceName() throws RepositoryException { try { nodeToMerge.merge(getNonExistingWorkspaceName(superuser), false); @@ -122,6 +124,7 @@ public class MergeNodeTest extends Abstr * indicated workspace
then the merge method returns quietly and no * changes are made.
*/ + @SuppressWarnings("deprecation") public void testMergeNodeNonCorrespondingNode() throws RepositoryException { // create new node - this node has no corresponding node in default workspace Node subNode = nodeToMerge.addNode(nodeName3, versionableNodeType); @@ -156,6 +159,7 @@ public class MergeNodeTest extends Abstr * successor of, predecessor of, nor identical with V', then the merge * result for N is failed
*/ + @SuppressWarnings("deprecation") public void testMergeNodeVersionAmbiguous() throws RepositoryException { // create 2 independent versions for a node and its corresponding node // so merge fails for this node @@ -215,6 +219,7 @@ public class MergeNodeTest extends Abstr * Node.merge(): bestEffort is true > any merge-failure (represented by the * version in the workspace) is reported in the jcrMergeFailed property
*/ + @SuppressWarnings("deprecation") public void testMergeNodeBestEffortTrueCheckMergeFailedProperty() throws RepositoryException { // create 2 independent versions for a node and its corresponding node // so merge fails for this node @@ -298,6 +303,7 @@ public class MergeNodeTest extends Abstr /** * if mergeFailedProperty is present > VersionException
*/ + @SuppressWarnings("deprecation") public void disable_testMergeNodeForceFailure() throws RepositoryException { // create 2 independent versions for a node and its corresponding node // so merge fails for this node @@ -359,6 +365,7 @@ public class MergeNodeTest extends Abstr * Node.merge(): bestEffort is false and any merge fails a MergeException is * thrown.
*/ + @SuppressWarnings("deprecation") public void testMergeNodeBestEffortFalse() throws RepositoryException { /// create successor versions for a node // so merge fails for this node @@ -409,6 +416,7 @@ public class MergeNodeTest extends Abstr * versionable node is encountered whose corresponding node's base version * is on a divergent branch from this node's base version. */ + @SuppressWarnings("deprecation") public void testMergeNodeBestEffortFalseAmbiguousVersions() throws RepositoryException { /// create 2 independent base versions for a node and its corresponding node // so merge fails for this node @@ -471,6 +479,7 @@ public class MergeNodeTest extends Abstr * locked node. * @throws NotExecutableException if repository does not support locking. */ + @SuppressWarnings("deprecation") public void disable_testMergeLocked() throws NotExecutableException, RepositoryException { Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java Tue Jan 17 16:11:51 2012 @@ -58,6 +58,7 @@ public class MergeSubNodeTest extends Ab * update, then the subnode N is removed
retrieve the initialised node * to perform operations we need before for this test
*/ + @SuppressWarnings("deprecation") public void disable_testRemoveNodeFromSourceWorkspaceAndMergeWithUpdate() throws RepositoryException { // status 'update' for parent nodeToMerge.checkin(); @@ -123,6 +124,7 @@ public class MergeSubNodeTest extends Ab * on the workspace1 and then merge the one in workspace2 with the one in * workspace1 precondition is that the node in workspace2 is checked in */ + @SuppressWarnings("deprecation") public void disable_testMergeNodeFromUpdatedSourceWorkspace() throws RepositoryException { Node originalNode = testRootNode.getNode(nodeName1); @@ -179,6 +181,7 @@ public class MergeSubNodeTest extends Ab * workspace1
the node in workspace2 should be updated
precondition * is that the node in workspace2 is checked in */ + @SuppressWarnings("deprecation") public void testMergeNodeFromOlderSourceWorkspace() throws RepositoryException { // touch the version on workspace2 nodeToMerge.checkin(); @@ -223,6 +226,7 @@ public class MergeSubNodeTest extends Ab * Node.merge(): bestEffort is true > (sub)node which could not be merged * are not affected.
*/ + @SuppressWarnings("deprecation") public void disable_testMergeNodeBestEffortTrue() throws RepositoryException { // create 2 new nodes with two independent versions // so merge fails for this node @@ -301,6 +305,7 @@ public class MergeSubNodeTest extends Ab * node,
a merge test is performed comparing N with its corresponding * node in workspace, N'.
*/ + @SuppressWarnings("deprecation") public void disable_testMergeNodeSubNodesMergeTest() throws RepositoryException { //setCheckProperty(nodeToMerge); nodeToMerge.checkout(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionCopyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionCopyTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionCopyTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionCopyTest.java Tue Jan 17 16:11:51 2012 @@ -54,6 +54,7 @@ public class OnParentVersionCopyTest ext * * @throws javax.jcr.RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreNode() throws RepositoryException { // prepare for node test Node childNode = addChildNode(OPVAction); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java Tue Jan 17 16:11:51 2012 @@ -100,6 +100,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreRootVersionFail() throws RepositoryException { try { versionableNode.restore(rootVersion, true); @@ -128,6 +129,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOnCheckedInNode() throws RepositoryException { versionableNode.checkin(); versionableNode.restore(version, true); @@ -178,6 +180,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOnCheckedOutNode() throws RepositoryException { versionableNode.restore(version, true); } @@ -223,6 +226,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreSetsIsCheckedOutToFalse() throws RepositoryException { versionableNode.restore(version, true); assertFalse("Restoring a node sets the jcr:isCheckedOut property to false", versionableNode.isCheckedOut()); @@ -273,6 +277,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreCorrectProperty() throws RepositoryException { versionableNode.restore(version, true); String value = versionableNode.getProperty(propertyName1).getString(); @@ -328,6 +333,7 @@ public class RestoreTest extends Abstrac * * @throws javax.jcr.RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreSetsBaseVersion() throws RepositoryException { versionableNode.restore(version, true); Version baseV = versionableNode.getBaseVersion(); @@ -383,6 +389,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreWithPendingChanges() throws RepositoryException { // modify node without calling save() try { @@ -469,6 +476,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreInvalidVersion() throws RepositoryException { Version vNode2 = versionableNode2.checkin(); try { @@ -502,6 +510,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreInvalidVersion2() throws RepositoryException { String invalidName; do { @@ -555,6 +564,7 @@ public class RestoreTest extends Abstrac * @throws RepositoryException * @see Node#restore(String, boolean) */ + @SuppressWarnings("deprecation") public void testRestoreNonVersionableNode() throws RepositoryException { try { nonVersionableNode.restore("foo", true); @@ -602,6 +612,7 @@ public class RestoreTest extends Abstrac * @throws RepositoryException * @see Node#restore(Version, boolean) */ + @SuppressWarnings("deprecation") public void testRestoreNonVersionableNode3() throws RepositoryException { try { nonVersionableNode.restore(version, true); @@ -631,6 +642,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreWithInvalidVersion() throws RepositoryException { Version invalidVersion = versionableNode2.checkin(); try { @@ -660,6 +672,7 @@ public class RestoreTest extends Abstrac * Tests if restoring the Version of an existing node throws an * ItemExistsException if removeExisting is set to FALSE. */ + @SuppressWarnings("deprecation") public void testRestoreWithUUIDConflict() throws RepositoryException, NotExecutableException { try { Node naa = createVersionableNode(versionableNode, nodeName4, versionableNodeType); @@ -801,6 +814,7 @@ public class RestoreTest extends Abstrac } } + @SuppressWarnings("deprecation") public void testRestoreRemoved() throws RepositoryException { Node parent = versionableNode.getParent(); String oldName = versionableNode.getName(); @@ -916,6 +930,7 @@ public class RestoreTest extends Abstrac * Test the restore of a versionable node using a label. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreLabel() throws RepositoryException { // mark V1 with label test1 versionableNode.getVersionHistory().addVersionLabel(version.getName(), "test", true); @@ -944,6 +959,7 @@ public class RestoreTest extends Abstrac * Test the restore of the OPV=Version child nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreName() throws RepositoryException, NotExecutableException { // V1.0 of versionableNode has no child @@ -1035,6 +1051,7 @@ public class RestoreTest extends Abstrac * Test the child ordering of restored nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOrder() throws RepositoryException, NotExecutableException { // create a test-root that has orderable child nodes @@ -1240,6 +1257,7 @@ public class RestoreTest extends Abstrac * Test the child ordering of restored nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOrder2() throws RepositoryException, NotExecutableException { // create a test-root that has orderable child nodes Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionHistoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionHistoryTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionHistoryTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionHistoryTest.java Tue Jan 17 16:11:51 2012 @@ -187,6 +187,7 @@ public class VersionHistoryTest extends * * @see javax.jcr.version.VersionHistory#getAllVersions() */ + @SuppressWarnings("deprecation") public void testGetAllVersions() throws RepositoryException { int cnt = 5; Map versions = new HashMap(); @@ -278,6 +279,7 @@ public class VersionHistoryTest extends * Test if UnsupportedRepositoryOperationException is thrown when calling * Node.getVersionHistory() on a non-versionable node. */ + @SuppressWarnings("deprecation") public void testGetVersionHistoryOnNonVersionableNode() throws RepositoryException { try { nonVersionableNode.getVersionHistory(); @@ -368,6 +370,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.cancelMerge(Version) throws an * {@link javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testCancelMerge() throws Exception { try { vHistory.cancelMerge(version); @@ -392,6 +395,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.checkin() throws an {@link * javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testCheckin() throws Exception { try { vHistory.checkin(); @@ -416,6 +420,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.checkout() throws an {@link * javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testCheckout() throws Exception { try { vHistory.checkout(); @@ -440,6 +445,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.doneMerge(Version) throws an {@link * javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testDoneMerge() throws Exception { try { vHistory.doneMerge(version); @@ -472,6 +478,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.getBaseVersion() throws an {@link * javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testGetBaseVersion() throws Exception { try { vHistory.getBaseVersion(); @@ -518,6 +525,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.getLock() throws an {@link * javax.jcr.lock.LockException} */ + @SuppressWarnings("deprecation") public void testGetLock() throws Exception { try { vHistory.getLock(); @@ -826,6 +834,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.lock(boolean, boolean) throws a * {@link javax.jcr.lock.LockException} */ + @SuppressWarnings("deprecation") public void testLock() throws Exception { try { vHistory.lock(true, true); @@ -1006,6 +1015,7 @@ public class VersionHistoryTest extends * Tests if VersionHistory.restoreByLabel(String, boolean) * throws an {@link javax.jcr.UnsupportedRepositoryOperationException} */ + @SuppressWarnings("deprecation") public void testRestoreByLabel() throws Exception { try { vHistory.restoreByLabel("abc", true); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionLabelTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionLabelTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionLabelTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionLabelTest.java Tue Jan 17 16:11:51 2012 @@ -133,6 +133,7 @@ public class VersionLabelTest extends Ab * * @see VersionHistory#addVersionLabel(String, String, boolean) */ + @SuppressWarnings("deprecation") public void testAddVersionCheckVersionLabelsNode() throws RepositoryException { vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false); @@ -205,6 +206,7 @@ public class VersionLabelTest extends Ab * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testAddDuplicateVersionLabel() throws RepositoryException { vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false); try { @@ -245,6 +247,7 @@ public class VersionLabelTest extends Ab * @throws RepositoryException * @see VersionHistory#addVersionLabel(String, String, boolean) with boolan flag equals true. */ + @SuppressWarnings("deprecation") public void testMoveLabel() throws RepositoryException { vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false); try { @@ -337,6 +340,7 @@ public class VersionLabelTest extends Ab * @throws RepositoryException * @see javax.jcr.version.VersionHistory#getVersionLabels() */ + @SuppressWarnings("deprecation") public void testGetVersionLabels() throws RepositoryException { Set testLabels = new HashSet(Arrays.asList(vHistory.getVersionLabels())); @@ -399,6 +403,7 @@ public class VersionLabelTest extends Ab * @throws RepositoryException * @see VersionHistory#getVersionLabels(javax.jcr.version.Version) */ + @SuppressWarnings("deprecation") public void testGetVersionLabelsForVersion() throws RepositoryException { Set testLabels = new HashSet(Arrays.asList(vHistory.getVersionLabels(rootVersion))); @@ -462,6 +467,7 @@ public class VersionLabelTest extends Ab * @throws javax.jcr.RepositoryException * @see javax.jcr.Node#restoreByLabel(String, boolean) */ + @SuppressWarnings("deprecation") public void testRestoreByLabelNonVersionableNode() throws RepositoryException { try { nonVersionableNode.restoreByLabel(versionLabel, true); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Tue Jan 17 16:11:51 2012 @@ -161,6 +161,7 @@ public class WorkspaceRestoreTest extend * Test if InvalidItemStateException is thrown if the session affected by * Workspace.restore(Version[], boolean) has pending changes. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreWithPendingChanges() throws RepositoryException { versionableNode.checkout(); try { @@ -203,6 +204,7 @@ public class WorkspaceRestoreTest extend * Test if VersionException is thrown if the specified version array does * not contain a version that has a corresponding node in this workspace. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreHasCorrespondingNode() throws RepositoryException { try { superuser.getWorkspace().restore(new Version[]{wChildVersion}, false); @@ -234,6 +236,7 @@ public class WorkspaceRestoreTest extend * node in the workspace. * */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreWithParent() throws RepositoryException { try { @@ -266,6 +269,7 @@ public class WorkspaceRestoreTest extend /** * Test if the removeExisting-flag removes an existing node in case of uuid conflict. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreWithRemoveExisting() throws NotExecutableException, RepositoryException { // create version for parentNode of childNode superuser.getWorkspace().clone(workspaceName, wVersionableChildNode.getPath(), wVersionableChildNode.getPath(), false); @@ -309,6 +313,7 @@ public class WorkspaceRestoreTest extend * Tests if restoring the Version of an existing node throws an * ItemExistsException if removeExisting is set to FALSE. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreWithUUIDConflict() throws RepositoryException, NotExecutableException { try { // Verify that nodes used for the test are indeed versionable @@ -359,6 +364,7 @@ public class WorkspaceRestoreTest extend /** * Test if workspace-restoring a node works on checked-in node. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreOnCheckedInNode() throws RepositoryException { if (versionableNode.isCheckedOut()) { versionableNode.checkin(); @@ -381,6 +387,7 @@ public class WorkspaceRestoreTest extend /** * Test if workspace-restoring a node works on checked-out node. */ + @SuppressWarnings("deprecation") public void testWorkspaceRestoreOnCheckedOutNode() throws RepositoryException { if (!versionableNode.isCheckedOut()) { versionableNode.checkout(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/CheckinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/CheckinTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/CheckinTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/CheckinTest.java Tue Jan 17 16:11:51 2012 @@ -51,6 +51,7 @@ public class CheckinTest extends Abstrac * * @throws javax.jcr.RepositoryException */ + @SuppressWarnings("deprecation") public void testIsCheckedOut() throws RepositoryException { versionableNode.checkin(); assertTrue("After calling Node.checkin() on a versionable node N, N.isCheckedOut() must return false", versionableNode.isCheckedOut() == false); @@ -74,6 +75,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testMultipleCheckinHasNoEffect() throws RepositoryException { Version v = versionableNode.checkin(); @@ -112,6 +114,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinWithPendingChanges() throws RepositoryException { try { // modify node without calling save() @@ -149,6 +152,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testIsNotCheckedOut() throws RepositoryException { versionableNode.checkin(); boolean isCheckedOut = versionableNode.isCheckedOut(); @@ -175,6 +179,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinCreatesNewVersion() throws RepositoryException { long initialNumberOfVersions = getNumberOfVersions(versionableNode.getVersionHistory()); @@ -205,6 +210,7 @@ public class CheckinTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testCheckinNonVersionableNode() throws RepositoryException { try { nonVersionableNode.checkin(); Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/RestoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/RestoreTest.java?rev=1232456&r1=1232455&r2=1232456&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/RestoreTest.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/RestoreTest.java Tue Jan 17 16:11:51 2012 @@ -105,6 +105,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreRootVersionFail() throws RepositoryException { try { versionableNode.restore(rootVersion, true); @@ -133,6 +134,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOnCheckedInNode() throws RepositoryException { versionableNode.checkin(); versionableNode.restore(version, true); @@ -189,6 +191,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOnCheckedOutNode() throws RepositoryException { versionableNode.restore(version, true); } @@ -240,6 +243,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreSetsIsCheckedOutToFalse() throws RepositoryException { versionableNode.restore(version, true); assertFalse("Restoring a node sets the jcr:isCheckedOut property to false", versionableNode.isCheckedOut()); @@ -296,6 +300,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreCorrectProperty() throws RepositoryException { versionableNode.restore(version, true); String value = versionableNode.getProperty(propertyName1).getString(); @@ -357,6 +362,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreWithPendingChanges() throws RepositoryException { // modify node without calling save() try { @@ -443,6 +449,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreInvalidVersion() throws RepositoryException { Version vNode2 = versionableNode2.checkin(); try { @@ -476,6 +483,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreInvalidVersion2() throws RepositoryException { String invalidName; do { @@ -529,6 +537,7 @@ public class RestoreTest extends Abstrac * @throws RepositoryException * @see Node#restore(String, boolean) */ + @SuppressWarnings("deprecation") public void testRestoreNonVersionableNode() throws RepositoryException { try { nonVersionableNode.restore("foo", true); @@ -576,6 +585,7 @@ public class RestoreTest extends Abstrac * @throws RepositoryException * @see Node#restore(Version, boolean) */ + @SuppressWarnings("deprecation") public void testRestoreNonVersionableNode3() throws RepositoryException { try { nonVersionableNode.restore(version, true); @@ -605,6 +615,7 @@ public class RestoreTest extends Abstrac * * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreWithInvalidVersion() throws RepositoryException { Version invalidVersion = versionableNode2.checkin(); try { @@ -634,6 +645,7 @@ public class RestoreTest extends Abstrac * Tests if restoring the Version of an existing node throws an * ItemExistsException if removeExisting is set to FALSE. */ + @SuppressWarnings("deprecation") public void testRestoreWithUUIDConflict() throws RepositoryException, NotExecutableException { try { Node naa = createVersionableNode(versionableNode, nodeName4, versionableNodeType); @@ -755,6 +767,7 @@ public class RestoreTest extends Abstrac } } + @SuppressWarnings("deprecation") public void testRestoreChild1() throws RepositoryException { versionableNode.addNode("child1"); versionableNode.getSession().save(); @@ -859,6 +872,7 @@ public class RestoreTest extends Abstrac * Test the restore of a versionable node using a label. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreLabel() throws RepositoryException { // mark V1 with label test1 versionableNode.getVersionHistory().addVersionLabel(version.getName(), "test", true); @@ -887,6 +901,7 @@ public class RestoreTest extends Abstrac * Test the restore of the OPV=Version child nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreName() throws RepositoryException, NotExecutableException { // V1.0 of versionableNode has no child @@ -967,6 +982,7 @@ public class RestoreTest extends Abstrac * Test the child ordering of restored nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOrder() throws RepositoryException, NotExecutableException { // create a test-root that has orderable child nodes @@ -1172,6 +1188,7 @@ public class RestoreTest extends Abstrac * Test the child ordering of restored nodes. * @throws RepositoryException */ + @SuppressWarnings("deprecation") public void testRestoreOrder2() throws RepositoryException, NotExecutableException { // create a test-root that has orderable child nodes @@ -1377,6 +1394,7 @@ public class RestoreTest extends Abstrac * Tests if restore on simple versioning creates a new version that is * in the correct linear order. */ + @SuppressWarnings("deprecation") public void testLinearVersions() throws Exception { // first get all linear versions VersionIterator iter = versionableNode.getVersionHistory().getAllLinearVersions();