jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r927109 - in /jackrabbit/trunk/jackrabbit-jcr-rmi: ./ src/main/java/org/apache/jackrabbit/rmi/client/ src/main/java/org/apache/jackrabbit/rmi/remote/ src/main/java/org/apache/jackrabbit/rmi/server/
Date Wed, 24 Mar 2010 16:20:06 GMT
Author: jukka
Date: Wed Mar 24 16:20:05 2010
New Revision: 927109

URL: http://svn.apache.org/viewvc?rev=927109&view=rev
Log:
JCRRMI-26: JSR-283 support

Implement parts of VersionManager over RMI

Added:
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java   (with props)
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java   (with props)
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Wed Mar 24 16:20:05 2010
@@ -114,81 +114,16 @@
                 <property>
                   <name>known.issues</name>
                   <value>
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreRootVersionFail
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreRootVersionFailJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNode
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_1
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNode
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalse
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectProperty
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChanges
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreInvalidVersion
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreInvalidVersionJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreInvalidVersion2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreInvalidVersion2Jcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNonVersionableNode
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNonVersionableNodeJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNonVersionableNode2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNonVersionableNode3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNonVersionableNode3Jcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithInvalidVersion
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithInvalidVersionJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflict
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreLabel
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreLabelJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreName
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNameJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_4
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersions
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_2
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_3
-org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_4
-org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testRequiredDescriptors
-org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testGetDescriptorValues
+org.apache.jackrabbit.test.api.LifecycleTest#testFollowLifecycleTransition
+org.apache.jackrabbit.test.api.LifecycleTest#testGetAllowedLifecycleTransitions
 org.apache.jackrabbit.test.api.NameTest#testExpandedNameValue
 org.apache.jackrabbit.test.api.NameTest#testExpandedNameValueProperty
 org.apache.jackrabbit.test.api.NodeRemoveMixinTest#testNotAssigned
+org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testGetDescriptorValues
+org.apache.jackrabbit.test.api.RepositoryDescriptorTest#testRequiredDescriptors
 org.apache.jackrabbit.test.api.ValueFactoryTest#testValueFormatException
-org.apache.jackrabbit.test.api.LifecycleTest#testGetAllowedLifecycleTransitions
-org.apache.jackrabbit.test.api.LifecycleTest#testFollowLifecycleTransition
+org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParent
+org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParentJcr2
 
 org.apache.jackrabbit.test.api.AddNodeTest#testAbstractNodeType
 org.apache.jackrabbit.test.api.GetWeakReferencesTest#testMultiValues
@@ -563,177 +498,55 @@ org.apache.jackrabbit.test.api.version.A
 org.apache.jackrabbit.test.api.version.ActivitiesTest#testActivitiesRelationWithCheckpoint
 org.apache.jackrabbit.test.api.version.ActivitiesTest#testCreateRemoveActivity
 org.apache.jackrabbit.test.api.version.ActivitiesTest#testSetGetActivity
-org.apache.jackrabbit.test.api.version.CheckinTest#testBaseVersionAfterCheckin
-org.apache.jackrabbit.test.api.version.CheckinTest#testBaseVersionAfterCheckinJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinCreatesNewVersion
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinCreatesNewVersionJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinNonVersionableNode
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinRemovesPredecessorProperty
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinRemovesPredecessorPropertyJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinWithPendingChanges
-org.apache.jackrabbit.test.api.version.CheckinTest#testCheckinWithPendingChangesJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.CheckinTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testIsNotCheckedOut
-org.apache.jackrabbit.test.api.version.CheckinTest#testIsNotCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testMultipleCheckinHasNoEffect
-org.apache.jackrabbit.test.api.version.CheckinTest#testMultipleCheckinHasNoEffectJcr2
-org.apache.jackrabbit.test.api.version.CheckinTest#testPredecessorIsCopiedToNewVersion
-org.apache.jackrabbit.test.api.version.CheckinTest#testPredecessorIsCopiedToNewVersionJcr2
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutCopiesBaseValueToPredecessorProperty
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutCopiesBaseValueToPredecessorPropertyJcr2
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutNonVersionableNode
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutTwiceDoesNotThrow
-org.apache.jackrabbit.test.api.version.CheckoutTest#testCheckoutTwiceDoesNotThrowJcr2
-org.apache.jackrabbit.test.api.version.CheckoutTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.CheckoutTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.CheckoutTest#testIsCheckedOutNonVersionableNode
-org.apache.jackrabbit.test.api.version.CheckoutTest#testIsCheckedOutNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCheckinConfig
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCheckinConfigFailsWithUnversionedChild
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testConfigurationsPath
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfiguration
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfigurationNotVersionableFails
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfigurationTwiceFails
 org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfigWithBaseline
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfigWithExistentConfigFromBaselineFails
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testCreateConfigWithNonExistentParentFails
 org.apache.jackrabbit.test.api.version.ConfigurationsTest#testRestoreBaseline
-org.apache.jackrabbit.test.api.version.ConfigurationsTest#testRestoreConfig
 org.apache.jackrabbit.test.api.version.CopyTest#testCopy
 org.apache.jackrabbit.test.api.version.GetPredecessorsTest#testGetLinearPredecessorSuccessor
 org.apache.jackrabbit.test.api.version.GetVersionableUUIDTest#testGetVersionableIdentifier
 org.apache.jackrabbit.test.api.version.MergeActivityTest#testMergeActivity
-org.apache.jackrabbit.test.api.version.MergeCancelMergeTest#testMergeNodeCancelMerge
 org.apache.jackrabbit.test.api.version.MergeCancelMergeTest#testMergeNodeCancelMergeJcr2
-org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest#testFailIfCorrespondingNodeIsSuccessor
-org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest#testFailIfCorrespondingNodeIsSuccessorJcr2
-org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest#testLeaveIfCorrespondingNodeIsPredeccessor
-org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest#testLeaveIfCorrespondingNodeIsPredeccessorJcr2
-org.apache.jackrabbit.test.api.version.MergeDoneMergeTest#testMergeNodeDoneMerge
 org.apache.jackrabbit.test.api.version.MergeDoneMergeTest#testMergeNodeDoneMergeJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest#testNodeIterator
-org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest#testNodeIteratorJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortFalse
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortFalseAmbiguousVersions
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortFalseAmbiguousVersionsJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortFalseJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortTrueCheckMergeFailedProperty
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeBestEffortTrueCheckMergeFailedPropertyJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeNonCorrespondingNode
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeNonCorrespondingNodeJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeVersionAmbiguous
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeVersionAmbiguousJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeWithUnsavedStates
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeNodeWithUnsavedStatesJcr2
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeUnknownWorkspaceName
-org.apache.jackrabbit.test.api.version.MergeNodeTest#testMergeUnknownWorkspaceNameJcr2
-org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest#testMergeNodeNonVersionableSubNodeLeaveJcr2
-org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest#testMergeNodeNonVersionableSubNodeNonVersionableAncestorJcr2
-org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest#testMergeNodeNonVersionableSubNodeUpdateJcr2
-org.apache.jackrabbit.test.api.version.MergeShallowTest#testMergeRecursive
-org.apache.jackrabbit.test.api.version.MergeShallowTest#testMergeShallow
-org.apache.jackrabbit.test.api.version.MergeSubNodeTest#testMergeNodeFromOlderSourceWorkspace
-org.apache.jackrabbit.test.api.version.MergeSubNodeTest#testMergeNodeFromOlderSourceWorkspaceJcr2
-org.apache.jackrabbit.test.api.version.OnParentVersionAbortTest#testRestoreNodeJcr2
-org.apache.jackrabbit.test.api.version.OnParentVersionAbortTest#testRestorePropJcr2
 org.apache.jackrabbit.test.api.version.OnParentVersionComputeTest#testRestorePropJcr2
 org.apache.jackrabbit.test.api.version.OnParentVersionCopyTest#testRestoreNodeJcr2
 org.apache.jackrabbit.test.api.version.OnParentVersionIgnoreTest#testRestoreNodeJcr2
 org.apache.jackrabbit.test.api.version.OnParentVersionIgnoreTest#testRestorePropJcr2
 org.apache.jackrabbit.test.api.version.OnParentVersionInitializeTest#testRestorePropJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreChild1
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreChild1Jcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreChild1Jcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreChild1Jcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreChild1Jcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreCorrectProperty
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreCorrectPropertyJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreCorrectPropertyJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreCorrectPropertyJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreCorrectPropertyJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreInvalidVersion
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreInvalidVersion2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreInvalidVersion2Jcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreInvalidVersionJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabel
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabelJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNameJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNonVersionableNode
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNonVersionableNode2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNonVersionableNode3
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNonVersionableNode3Jcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreNonVersionableNodeJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedInNode
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedInNodeJcr2_1
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedInNodeJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedInNodeJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedInNodeJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedOutNode
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedOutNodeJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedOutNodeJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedOutNodeJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOnCheckedOutNodeJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2Jcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2Jcr2_2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2Jcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2Jcr2_4
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrderJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrderJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrderJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrderJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreRemoved
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreRemovedJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreRootVersionFail
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreRootVersionFailJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsBaseVersion
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsBaseVersionJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsBaseVersionJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsBaseVersionJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsBaseVersionJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsIsCheckedOutToFalse
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr3
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithInvalidVersion
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithInvalidVersionJcr2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithPendingChanges
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithPendingChangesJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithPendingChangesJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithPendingChangesJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithPendingChangesJcr2_4
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflict
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflictJcr2
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflictJcr2_2
-org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflictJcr2_3
 org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflictJcr2_4
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinCreatesNewVersion
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinCreatesNewVersionJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinNonVersionableNode
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinWithPendingChanges
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testCheckinWithPendingChangesJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testIsNotCheckedOut
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testIsNotCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testMultipleCheckinHasNoEffect
-org.apache.jackrabbit.test.api.version.simple.CheckinTest#testMultipleCheckinHasNoEffectJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testCheckoutNonVersionableNode
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testCheckoutNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testCheckoutTwiceDoesNotThrow
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testCheckoutTwiceDoesNotThrowJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testIsCheckedOutNonVersionableNode
-org.apache.jackrabbit.test.api.version.simple.CheckoutTest#testIsCheckedOutNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.simple.CopyTest#testCopy
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenChildNodeNodeType
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenChildNodeType
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenChildNodeUUUID
@@ -742,181 +555,52 @@ org.apache.jackrabbit.test.api.version.s
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenNodeType
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenNodeUUUID
 org.apache.jackrabbit.test.api.version.simple.FrozenNodeTest#testFrozenUUUID
-org.apache.jackrabbit.test.api.version.VersionGraphTest#testInitialBaseVersionPointsToRootVersionJcr2
-org.apache.jackrabbit.test.api.version.VersionGraphTest#testInitialNodePredecessorsJcr2
-org.apache.jackrabbit.test.api.version.VersionGraphTest#testRootVersionHasNoPredecessorJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testAccept
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testAddMixin
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testAddNode
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testAutocreatedRootVersion
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCanAddMixin
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCancelMerge
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCancelMergeJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCheckin
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCheckinJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCheckout
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testCheckoutJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testDoneMerge
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testDoneMergeJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersions
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_3
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testLinearVersionsJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreChild1Jcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreCorrectPropertyJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreInvalidVersionJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreNameJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_1
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedInNodeJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOnCheckedOutNodeJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_3
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrder2Jcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreOrderJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreRootVersionFailJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreSetsIsCheckedOutToFalseJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithInvalidVersionJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithPendingChangesJcr2_4
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2_2
+org.apache.jackrabbit.test.api.version.simple.RestoreTest#testRestoreWithUUIDConflictJcr2_4
 org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetAllFrozenNodes
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetAllVersions
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetAllVersionsJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetAncestor
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetBaseVersion
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetBaseVersionJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetCorrespondingNodePath
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetDepth
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetIdentifier
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetIndex
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetLock
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetLockJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetMixinNodeTypes
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetName
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetNode
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetNodes
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetParent
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetPath
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetPrimaryItem
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetPrimaryNodeType
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetProperties
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetProperty
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetReferences
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetSession
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetUUID
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetVersion
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetVersionHistory
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetVersionHistoryJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetVersionHistoryOnNonVersionableNode
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetVersionHistoryOnNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHasNode
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHasNodes
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHasProperties
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHasProperty
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHoldsLock
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testHoldsLockJcr2
 org.apache.jackrabbit.test.api.version.VersionHistoryTest#testInitiallyGetAllLinearVersionsContainsTheRootAndTheBaseVersion
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testInitiallyGetAllVersionsContainsTheRootVersion
 org.apache.jackrabbit.test.api.version.VersionHistoryTest#testInitialNumberOfLinearVersions
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testInitialNumberOfVersions
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsLocked
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsLockedJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsModified
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsNew
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsNode
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsNodeType
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testIsSame
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testLock
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testLockJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testMerge
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testOrderBefore
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRefresh
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRemove
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRemoveMixin
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRestore
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRestoreByLabel
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRestoreByLabelJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testRestoreJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testSetProperty
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testUnlock
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testUnlockJcr2
-org.apache.jackrabbit.test.api.version.VersionHistoryTest#testUpdate
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddDuplicateVersionLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddDuplicateVersionLabelJcr2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddMultipleVersionLabels
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddVersionCheckVersionLabelsNode
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddVersionCheckVersionLabelsNodeJcr2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddVersionLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testAddVersionLabel2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionByLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionLabels
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionLabelsForInvalidVersion
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionLabelsForVersion
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionLabelsForVersionJcr2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testGetVersionLabelsJcr2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testHasVersionLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testHasVersionLabelForVersion
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testMoveLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testMoveLabelJcr2
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testRemoveLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testRemoveNonExistingLabel
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testRestoreByLabelNonVersionableNode
-org.apache.jackrabbit.test.api.version.VersionLabelTest#testRestoreByLabelNonVersionableNodeJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testAccept
-org.apache.jackrabbit.test.api.version.VersionTest#testAddMixin
-org.apache.jackrabbit.test.api.version.VersionTest#testAddNode
-org.apache.jackrabbit.test.api.version.VersionTest#testCanAddMixin
-org.apache.jackrabbit.test.api.version.VersionTest#testCancelMerge
-org.apache.jackrabbit.test.api.version.VersionTest#testCancelMergeJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testCheckin
-org.apache.jackrabbit.test.api.version.VersionTest#testCheckinJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testCheckout
-org.apache.jackrabbit.test.api.version.VersionTest#testCheckoutJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testDoneMerge
-org.apache.jackrabbit.test.api.version.VersionTest#testDoneMergeJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testFrozenUUID
-org.apache.jackrabbit.test.api.version.VersionTest#testGetAncestor
-org.apache.jackrabbit.test.api.version.VersionTest#testGetBaseVersion
-org.apache.jackrabbit.test.api.version.VersionTest#testGetBaseVersionJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testGetCorrespondingNodePath
-org.apache.jackrabbit.test.api.version.VersionTest#testGetDepth
-org.apache.jackrabbit.test.api.version.VersionTest#testGetIndex
-org.apache.jackrabbit.test.api.version.VersionTest#testGetLock
-org.apache.jackrabbit.test.api.version.VersionTest#testGetLockJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testGetMixinNodeTypes
-org.apache.jackrabbit.test.api.version.VersionTest#testGetName
-org.apache.jackrabbit.test.api.version.VersionTest#testGetNode
-org.apache.jackrabbit.test.api.version.VersionTest#testGetNodes
-org.apache.jackrabbit.test.api.version.VersionTest#testGetParent
-org.apache.jackrabbit.test.api.version.VersionTest#testGetPath
-org.apache.jackrabbit.test.api.version.VersionTest#testGetPrimaryItem
-org.apache.jackrabbit.test.api.version.VersionTest#testGetPrimaryNodeType
-org.apache.jackrabbit.test.api.version.VersionTest#testGetProperties
-org.apache.jackrabbit.test.api.version.VersionTest#testGetProperty
-org.apache.jackrabbit.test.api.version.VersionTest#testGetSession
-org.apache.jackrabbit.test.api.version.VersionTest#testGetUUID
-org.apache.jackrabbit.test.api.version.VersionTest#testGetVersionHistory
-org.apache.jackrabbit.test.api.version.VersionTest#testGetVersionHistoryJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testHasNode
-org.apache.jackrabbit.test.api.version.VersionTest#testHasNodes
-org.apache.jackrabbit.test.api.version.VersionTest#testHasProperties
-org.apache.jackrabbit.test.api.version.VersionTest#testHasProperty
-org.apache.jackrabbit.test.api.version.VersionTest#testHoldsLock
-org.apache.jackrabbit.test.api.version.VersionTest#testHoldsLockJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testIsCheckedOut
-org.apache.jackrabbit.test.api.version.VersionTest#testIsCheckedOutJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testIsLocked
-org.apache.jackrabbit.test.api.version.VersionTest#testIsLockedJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testIsModified
-org.apache.jackrabbit.test.api.version.VersionTest#testIsNew
-org.apache.jackrabbit.test.api.version.VersionTest#testIsNode
-org.apache.jackrabbit.test.api.version.VersionTest#testIsNodeType
-org.apache.jackrabbit.test.api.version.VersionTest#testIsSame
-org.apache.jackrabbit.test.api.version.VersionTest#testIsSameJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testLock
-org.apache.jackrabbit.test.api.version.VersionTest#testLockJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testMerge
-org.apache.jackrabbit.test.api.version.VersionTest#testOrderBefore
-org.apache.jackrabbit.test.api.version.VersionTest#testRefresh
-org.apache.jackrabbit.test.api.version.VersionTest#testRemove
-org.apache.jackrabbit.test.api.version.VersionTest#testRemoveMixin
-org.apache.jackrabbit.test.api.version.VersionTest#testRestore
-org.apache.jackrabbit.test.api.version.VersionTest#testRestoreByLabel
-org.apache.jackrabbit.test.api.version.VersionTest#testRestoreByLabelJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testRestoreJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testSetProperty
-org.apache.jackrabbit.test.api.version.VersionTest#testUnlock
-org.apache.jackrabbit.test.api.version.VersionTest#testUnlockJcr2
-org.apache.jackrabbit.test.api.version.VersionTest#testUpdate
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreHasCorrespondingNode
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreHasCorrespondingNodeJcr2
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreOnCheckedInNode
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreOnCheckedInNodeJcr2
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreOnCheckedOutNode
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreOnCheckedOutNodeJcr2
-org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParent
-org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithParentJcr2
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithPendingChanges
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithPendingChangesJcr2
 org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest#testWorkspaceRestoreWithRemoveExisting

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java Wed Mar 24 16:20:05 2010
@@ -42,6 +42,7 @@ import javax.jcr.query.RowIterator;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import javax.jcr.version.VersionManager;
 
 import org.apache.jackrabbit.rmi.client.iterator.ClientNodeIterator;
 import org.apache.jackrabbit.rmi.client.iterator.ClientNodeTypeIterator;
@@ -69,6 +70,7 @@ import org.apache.jackrabbit.rmi.remote.
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
 import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 import org.apache.jackrabbit.rmi.remote.RemoteXASession;
 
@@ -327,4 +329,9 @@ public class ClientAdapterFactory implem
         return new ClientLockManager(session, remote, this);
     }
 
+    public VersionManager getVersionManager(
+            Session session, RemoteVersionManager remote) {
+        return new ClientVersionManager(session, remote, this);
+    }
+
 }

Added: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java?rev=927109&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java (added)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java Wed Mar 24 16:20:05 2010
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionHistory;
+import javax.jcr.version.VersionManager;
+
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
+
+public class ClientVersionManager extends ClientObject
+        implements VersionManager {
+
+    /** The current session. */
+    private Session session;
+
+    private RemoteVersionManager remote;
+
+    public ClientVersionManager(
+            Session session, RemoteVersionManager remote,
+            LocalAdapterFactory factory) {
+        super(factory);
+        this.session = session;
+        this.remote = remote;
+    }
+
+    public void cancelMerge(String absPath, Version version)
+            throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public Version checkin(String absPath) throws RepositoryException {
+        try {
+            return getFactory().getVersion(session, remote.checkin(absPath));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public void checkout(String absPath) throws RepositoryException {
+        try {
+            remote.checkout(absPath);
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public Version checkpoint(String absPath) throws RepositoryException {
+        try {
+            return getFactory().getVersion(session, remote.checkpoint(absPath));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public Node createActivity(String title)
+            throws RepositoryException {
+        try {
+            return getFactory().getNode(session, remote.createActivity(title));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public Node createConfiguration(String absPath)
+            throws RepositoryException {
+        try {
+            return getFactory().getNode(
+                    session, remote.createConfiguration(absPath));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public void doneMerge(String absPath, Version version)
+            throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public Node getActivity() throws RepositoryException {
+        try {
+            return getFactory().getNode(session, remote.getActivity());
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public Version getBaseVersion(String absPath) throws RepositoryException {
+        try {
+            return getFactory().getVersion(
+                    session, remote.getBaseVersion(absPath));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public VersionHistory getVersionHistory(String absPath)
+            throws RepositoryException {
+        try {
+            return getFactory().getVersionHistory(
+                    session, remote.getVersionHistory(absPath));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public boolean isCheckedOut(String absPath) throws RepositoryException {
+        try {
+            return remote.isCheckedOut(absPath);
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public NodeIterator merge(Node activityNode) throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public NodeIterator merge(
+            String absPath, String srcWorkspace, boolean bestEffort)
+            throws RepositoryException {
+        try {
+            return getFactory().getNodeIterator(
+                    session, remote.merge(absPath, srcWorkspace, bestEffort));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public NodeIterator merge(
+            String absPath, String srcWorkspace, boolean bestEffort,
+            boolean isShallow) throws RepositoryException {
+        try {
+            return getFactory().getNodeIterator(session, remote.merge(
+                    absPath, srcWorkspace, bestEffort, isShallow));
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public void removeActivity(Node activityNode) throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public void restore(Version[] versions, boolean removeExisting)
+            throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public void restore(Version version, boolean removeExisting)
+            throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public void restore(
+            String absPath, String versionName, boolean removeExisting)
+            throws RepositoryException {
+        try {
+            remote.restore(absPath, versionName, removeExisting);
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public void restore(String absPath, Version version, boolean removeExisting)
+            throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+    public void restoreByLabel(
+            String absPath, String versionLabel, boolean removeExisting)
+            throws RepositoryException {
+        try {
+            remote.restoreByLabel(absPath, versionLabel, removeExisting);
+        } catch (RemoteException e) {
+            throw new RemoteRepositoryException(e);
+        }
+    }
+
+    public Node setActivity(Node activity) throws RepositoryException {
+        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java Wed Mar 24 16:20:05 2010
@@ -68,6 +68,8 @@ public class ClientWorkspace extends Cli
 
     private LockManager lockManager;
 
+    private VersionManager versionManager;
+
     /**
      * Creates a client adapter for the given remote workspace.
      *
@@ -279,7 +281,16 @@ public class ClientWorkspace extends Cli
     }
 
     public VersionManager getVersionManager() throws RepositoryException {
-        throw new UnsupportedRepositoryOperationException("TODO: JCRRMI-26");
+        if (versionManager == null) {
+            try {
+                versionManager = getFactory().getVersionManager(
+                        session, remote.getVersionManager());
+            } catch (RemoteException ex) {
+                throw new RemoteRepositoryException(ex);
+            }
+        }
+
+        return versionManager;
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java Wed Mar 24 16:20:05 2010
@@ -42,6 +42,7 @@ import javax.jcr.query.RowIterator;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import javax.jcr.version.VersionManager;
 
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
@@ -64,6 +65,7 @@ import org.apache.jackrabbit.rmi.remote.
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
 import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 
 /**
@@ -321,4 +323,7 @@ public interface LocalAdapterFactory {
 
     LockManager getLockManager(Session session, RemoteLockManager lockManager);
 
+    VersionManager getVersionManager(
+            Session session, RemoteVersionManager versionManager);
+
 }

Added: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java?rev=927109&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java (added)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java Wed Mar 24 16:20:05 2010
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+public interface RemoteVersionManager extends Remote {
+
+//    void cancelMerge(String absPath, Version version)
+//        throws RepositoryException, RemoteException;
+
+    RemoteVersion checkin(String absPath)
+        throws RepositoryException, RemoteException;
+
+    void checkout(String absPath) throws RepositoryException, RemoteException;
+
+    RemoteVersion checkpoint(String absPath)
+        throws RepositoryException, RemoteException;
+
+    RemoteNode createActivity(String title)
+        throws RepositoryException, RemoteException;
+
+    RemoteNode createConfiguration(String absPath)
+        throws RepositoryException, RemoteException;
+
+//    void doneMerge(String absPath, Version version)
+//        throws RepositoryException, RemoteException;
+
+    RemoteNode getActivity() throws RepositoryException, RemoteException;
+
+    RemoteVersion getBaseVersion(String absPath)
+        throws RepositoryException, RemoteException;
+
+    RemoteVersionHistory getVersionHistory(String absPath)
+        throws RepositoryException, RemoteException;
+
+    boolean isCheckedOut(String absPath)
+        throws RepositoryException, RemoteException;
+
+//    NodeIterator merge(Node activityNode)
+//        throws RepositoryException, RemoteException;
+
+    RemoteIterator merge(
+        String absPath, String srcWorkspace, boolean bestEffort)
+        throws RepositoryException, RemoteException;
+
+    RemoteIterator merge(
+        String absPath, String srcWorkspace, boolean bestEffort,
+        boolean isShallow)
+        throws RepositoryException, RemoteException;
+
+//    void removeActivity(Node activityNode)
+//        throws RepositoryException, RemoteException;
+
+//    void restore(Version[] versions, boolean removeExisting)
+//        throws RepositoryException, RemoteException;
+
+//    void restore(Version version, boolean removeExisting)
+//        throws RepositoryException, RemoteException;
+
+    void restore(
+        String absPath, String versionName, boolean removeExisting)
+        throws RepositoryException, RemoteException;
+
+//    void restore(String absPath, Version version, boolean removeExisting)
+//        throws RepositoryException, RemoteException;
+
+    void restoreByLabel(
+        String absPath, String versionLabel, boolean removeExisting)
+        throws RepositoryException, RemoteException;
+
+//    Node setActivity(Node activity) throws RepositoryException, RemoteException;
+
+}

Propchange: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java Wed Mar 24 16:20:05 2010
@@ -192,4 +192,7 @@ public interface RemoteWorkspace extends
     RemoteLockManager getLockManager()
         throws RepositoryException, RemoteException;
 
+    RemoteVersionManager getVersionManager()
+        throws RepositoryException, RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java Wed Mar 24 16:20:05 2010
@@ -45,6 +45,7 @@ import javax.jcr.query.RowIterator;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import javax.jcr.version.VersionManager;
 
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
@@ -68,6 +69,7 @@ import org.apache.jackrabbit.rmi.remote.
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
 import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 
 /**
@@ -366,4 +368,7 @@ public interface RemoteAdapterFactory {
     RemoteLockManager getRemoteLockManager(LockManager lockManager)
         throws RemoteException;
 
+    RemoteVersionManager getRemoteVersionManager(VersionManager versionManager)
+        throws RemoteException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java Wed Mar 24 16:20:05 2010
@@ -49,6 +49,7 @@ import javax.jcr.query.RowIterator;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import javax.jcr.version.VersionManager;
 import javax.transaction.xa.XAResource;
 
 import org.apache.jackrabbit.rmi.remote.ArrayIterator;
@@ -75,6 +76,7 @@ import org.apache.jackrabbit.rmi.remote.
 import org.apache.jackrabbit.rmi.remote.RemoteSession;
 import org.apache.jackrabbit.rmi.remote.RemoteVersion;
 import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 import org.apache.jackrabbit.rmi.server.iterator.ServerNodeIterator;
 import org.apache.jackrabbit.rmi.server.iterator.ServerNodeTypeIterator;
@@ -439,4 +441,9 @@ public class ServerAdapterFactory implem
         return new ServerLockManager(lockManager, this);
     }
 
+    public RemoteVersionManager getRemoteVersionManager(
+            VersionManager versionManager) throws RemoteException {
+        return new ServerVersionManager(versionManager, this);
+    }
+
 }

Added: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java?rev=927109&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java (added)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java Wed Mar 24 16:20:05 2010
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.version.VersionManager;
+
+import org.apache.jackrabbit.rmi.remote.RemoteIterator;
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
+import org.apache.jackrabbit.rmi.remote.RemoteVersion;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
+
+public class ServerVersionManager extends ServerObject
+        implements RemoteVersionManager {
+
+    private final VersionManager manager;
+
+    public ServerVersionManager(
+            VersionManager manager, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.manager = manager;
+    }
+
+    public RemoteVersion checkin(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersion(manager.checkin(absPath));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public void checkout(String absPath) throws RepositoryException {
+        try {
+            manager.checkout(absPath);
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteVersion checkpoint(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersion(manager.checkpoint(absPath));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteNode createActivity(String title)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNode(manager.createActivity(title));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteNode createConfiguration(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNode(
+                    manager.createConfiguration(absPath));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteNode getActivity()
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNode(manager.getActivity());
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteVersion getBaseVersion(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersion(
+                    manager.getBaseVersion(absPath));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteVersionHistory getVersionHistory(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersionHistory(
+                    manager.getVersionHistory(absPath));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public boolean isCheckedOut(String absPath)
+            throws RepositoryException {
+        try {
+            return manager.isCheckedOut(absPath);
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteIterator merge(
+            String absPath, String srcWorkspace, boolean bestEffort)
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNodeIterator(
+                    manager.merge(absPath, srcWorkspace, bestEffort));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public RemoteIterator merge(
+            String absPath, String srcWorkspace, boolean bestEffort,
+            boolean isShallow) throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteNodeIterator(
+                    manager.merge(absPath, srcWorkspace, bestEffort, isShallow));
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public void restore(
+            String absPath, String versionName, boolean removeExisting)
+            throws RepositoryException {
+        try {
+            manager.restore(absPath, versionName, removeExisting);
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+    public void restoreByLabel(
+            String absPath, String versionLabel, boolean removeExisting)
+            throws RepositoryException {
+        try {
+            manager.restoreByLabel(absPath, versionLabel, removeExisting);
+        } catch (RepositoryException e) {
+            throw getRepositoryException(e);
+        }
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java?rev=927109&r1=927108&r2=927109&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java Wed Mar 24 16:20:05 2010
@@ -27,12 +27,14 @@ import javax.jcr.lock.LockManager;
 import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.QueryManager;
+import javax.jcr.version.VersionManager;
 
 import org.apache.jackrabbit.rmi.remote.RemoteLockManager;
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
 import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionManager;
 import org.apache.jackrabbit.rmi.remote.RemoteWorkspace;
 
 /**
@@ -60,6 +62,8 @@ public class ServerWorkspace extends Ser
 
     private RemoteLockManager remoteLockManager;
 
+    private RemoteVersionManager remoteVersionManager;
+
     /**
      * Creates a remote adapter for the given local workspace.
      *
@@ -219,4 +223,18 @@ public class ServerWorkspace extends Ser
         }
     }
 
+    public RemoteVersionManager getVersionManager()
+            throws RepositoryException, RemoteException {
+        try {
+            if (remoteVersionManager == null) {
+                VersionManager versionManager = workspace.getVersionManager();
+                remoteVersionManager =
+                    getFactory().getRemoteVersionManager(versionManager);
+            }
+            return remoteVersionManager;
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
 }



Mime
View raw message