jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1171504 - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ./ operation/ version/
Date Fri, 16 Sep 2011 11:06:32 GMT
Author: mduerig
Date: Fri Sep 16 11:06:31 2011
New Revision: 1171504

URL: http://svn.apache.org/viewvc?rev=1171504&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP) 
refactor: consistent naming 

Added:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java
  (contents, props changed)
      - copied, changed from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java
  (contents, props changed)
      - copied, changed from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java
  (contents, props changed)
      - copied, changed from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
Fri Sep 16 11:06:31 2011
@@ -22,7 +22,7 @@ import org.apache.jackrabbit.jcr2spi.nod
 import org.apache.jackrabbit.jcr2spi.nodetype.ItemDefinitionProvider;
 import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeDefinitionProvider;
 import org.apache.jackrabbit.jcr2spi.security.AccessManager;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.PathFactory;
 import org.apache.jackrabbit.spi.QValueFactory;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
@@ -57,7 +57,7 @@ public interface ManagerProvider {
      *
      * @return 
      */
-    VersionManager getVersionStateManager();
+    VersionStateManager getVersionStateManager();
 
     WorkspaceManager getWorkspaceManager();
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
Fri Sep 16 11:06:31 2011
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.jcr2spi.sta
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
 import org.apache.jackrabbit.jcr2spi.state.PropertyState;
 import org.apache.jackrabbit.jcr2spi.state.SessionItemStateManager;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.jcr2spi.xml.ImportHandler;
 import org.apache.jackrabbit.jcr2spi.xml.Importer;
 import org.apache.jackrabbit.jcr2spi.xml.SessionImporter;
@@ -726,7 +726,7 @@ public class SessionImpl extends Abstrac
     }
 
     @Override
-    public VersionManager getVersionStateManager() {
+    public VersionStateManager getVersionStateManager() {
         return workspace.getVersionStateManager();
     }
 

Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java
(from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java&r1=1171436&r2=1171504&rev=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi;
 import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter;
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.ItemId;
 import org.apache.jackrabbit.spi.NodeId;
 import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
@@ -35,6 +35,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
+import javax.jcr.version.VersionManager;
 import java.util.Iterator;
 
 import static org.apache.jackrabbit.spi.commons.util.Unchecked.cast;
@@ -42,14 +43,14 @@ import static org.apache.jackrabbit.spi.
 /**
  * {@code VersionManagerImpl}...
  */
-public class JcrVersionManager implements javax.jcr.version.VersionManager {
+public class VersionManagerImpl implements VersionManager {
 
     /**
      * logger instance
      */
-    private static final Logger log = LoggerFactory.getLogger(JcrVersionManager.class);
+    private static final Logger log = LoggerFactory.getLogger(VersionManagerImpl.class);
 
-    private final VersionManager vMgr;
+    private final VersionStateManager versionStateMgr;
     private final SessionImpl session;
     private final ItemManager itemManager;
     private final PathResolver resolver;
@@ -60,9 +61,9 @@ public class JcrVersionManager implement
      */
     private NodeId activityId;
 
-    protected JcrVersionManager(SessionImpl session) {
+    protected VersionManagerImpl(SessionImpl session) {
         this.session = session;
-        vMgr = session.getVersionStateManager();
+        versionStateMgr = session.getVersionStateManager();
         itemManager = session.getItemManager();
         resolver = session.getNamePathResolver();
     }
@@ -126,7 +127,7 @@ public class JcrVersionManager implement
         for (int i = 0; i < versions.length; i++) {
             versionStates[i] = session.getVersionState(versions[i]);
         }
-        vMgr.restore(versionStates, removeExisting);
+        versionStateMgr.restore(versionStates, removeExisting);
     }
 
     @Override
@@ -210,7 +211,7 @@ public class JcrVersionManager implement
         session.checkIsAlive();
 
         NodeImpl n = itemManager.getNode(resolver.getQPath(absPath));
-        NodeEntry entry = vMgr.createConfiguration(n.getItemState());
+        NodeEntry entry = versionStateMgr.createConfiguration(n.getItemState());
         return itemManager.getItem(entry);
     }
 
@@ -253,7 +254,7 @@ public class JcrVersionManager implement
     public Node createActivity(String title) throws RepositoryException {
         session.checkIsAlive();
 
-        NodeEntry entry = vMgr.createActivity(title);
+        NodeEntry entry = versionStateMgr.createActivity(title);
         return itemManager.getItem(entry);
     }
 
@@ -264,7 +265,7 @@ public class JcrVersionManager implement
 
         NodeState nState = activity.getItemState();
         ItemId removeId = nState.getId();
-        vMgr.removeActivity(nState);
+        versionStateMgr.removeActivity(nState);
 
         // if the removal succeeded, make sure there is no current activity
         // setting on this session, that points to the removed activity.
@@ -277,7 +278,7 @@ public class JcrVersionManager implement
     public NodeIterator merge(Node activityNode) throws RepositoryException {
         session.checkIsAlive();
         NodeImpl activity = getValidActivity(activityNode, "merge");
-        Iterator<NodeId> failedIds = vMgr.mergeActivity(activity.getItemState());
+        Iterator<NodeId> failedIds = versionStateMgr.mergeActivity(activity.getItemState());
         return LazyItemIterator.nodeIterator(itemManager, session.getHierarchyManager(),
failedIds);
     }
 

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/VersionManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision url

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
Fri Sep 16 11:06:31 2011
@@ -37,8 +37,8 @@ import org.apache.jackrabbit.jcr2spi.sta
 import org.apache.jackrabbit.jcr2spi.state.ItemStateValidator;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
 import org.apache.jackrabbit.jcr2spi.state.UpdateableItemStateManager;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
-import org.apache.jackrabbit.jcr2spi.version.VersionManagerImpl;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManagerImpl;
 import org.apache.jackrabbit.jcr2spi.xml.WorkspaceContentHandler;
 import org.apache.jackrabbit.spi.IdFactory;
 import org.apache.jackrabbit.spi.NameFactory;
@@ -90,10 +90,10 @@ public class WorkspaceImpl implements Wo
     private LockStateManager lockManager;
     private ObservationManager obsManager;
     private QueryManager qManager;
-    private VersionManager versionManager;
+    private VersionStateManager versionStateManager;
 
     private LockManager jcrLockManager;
-    private JcrVersionManager jcrVersionManager;
+    private VersionManagerImpl versionManager;
 
     public WorkspaceImpl(String name, SessionImpl session, RepositoryConfig config, SessionInfo
sessionInfo)
             throws RepositoryException {
@@ -334,13 +334,13 @@ public class WorkspaceImpl implements Wo
     }
 
     @Override
-    public synchronized JcrVersionManager getVersionManager() throws RepositoryException
{
+    public synchronized VersionManagerImpl getVersionManager() throws RepositoryException
{
         session.checkIsAlive();
         session.checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
-        if (jcrVersionManager == null) {
-            jcrVersionManager = new JcrVersionManager(session);
+        if (versionManager == null) {
+            versionManager = new VersionManagerImpl(session);
         }
-        return jcrVersionManager;
+        return versionManager;
     }
 
     //----------------------------------------------------< ManagerProvider >---
@@ -369,11 +369,11 @@ public class WorkspaceImpl implements Wo
     }
 
     @Override
-    public VersionManager getVersionStateManager() {
-        if (versionManager == null) {
-            versionManager = createVersionManager(wspManager);
+    public VersionStateManager getVersionStateManager() {
+        if (versionStateManager == null) {
+            versionStateManager = createVersionStateManager(wspManager);
         }
-        return versionManager;
+        return versionStateManager;
     }
 
     @Override
@@ -488,8 +488,8 @@ public class WorkspaceImpl implements Wo
      * @param wspManager the workspace manager.
      * @return a new {@code VersionManager} instance.
      */
-    protected static VersionManager createVersionManager(WorkspaceManager wspManager) {
-        return new VersionManagerImpl(wspManager);
+    protected static VersionStateManager createVersionStateManager(WorkspaceManager wspManager)
{
+        return new VersionStateManagerImpl(wspManager);
     }
 
     /**

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi.op
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,13 +34,13 @@ public class Checkin extends AbstractOpe
     private static final Logger log = LoggerFactory.getLogger(Checkin.class);
 
     private final NodeState nodeState;
-    private final VersionManager mgr;
+    private final VersionStateManager versionStateMgr;
 
     private NodeId newVersionId;
 
-    private Checkin(NodeState nodeState, VersionManager mgr) {
+    private Checkin(NodeState nodeState, VersionStateManager versionStateMgr) {
         this.nodeState = nodeState;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
         // NOTE: affected-states only needed for transient modifications
     }
 
@@ -64,7 +64,7 @@ public class Checkin extends AbstractOpe
         assertStatus(Status.PENDING);
         status = Status.PERSISTED;
         try {
-            NodeEntry vhe = mgr.getVersionHistoryEntry(nodeState);
+            NodeEntry vhe = versionStateMgr.getVersionHistoryEntry(nodeState);
             if (vhe != null) {
                 vhe.invalidate(true);
             }
@@ -103,10 +103,10 @@ public class Checkin extends AbstractOpe
     /**
      *
      * @param nodeState
-     * @param mgr
+     * @param versionStateMgr
      * @return
      */
-    public static Checkin create(NodeState nodeState, VersionManager mgr) {
-        return new Checkin(nodeState, mgr);
+    public static Checkin create(NodeState nodeState, VersionStateManager versionStateMgr)
{
+        return new Checkin(nodeState, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi.op
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,20 +36,20 @@ public class Checkout extends AbstractOp
     private final NodeState nodeState;
     private final NodeId activityId;
     private final boolean supportsActivity;
-    private final VersionManager mgr;
+    private final VersionStateManager versionStateMgr;
 
-    private Checkout(NodeState nodeState, VersionManager mgr) {
+    private Checkout(NodeState nodeState, VersionStateManager versionStateMgr) {
         this.nodeState = nodeState;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
         supportsActivity = false;
         activityId = null;
         // NOTE: affected-states only needed for transient modifications
     }
 
-    private Checkout(NodeState nodeState, NodeId activityId, VersionManager mgr) {
+    private Checkout(NodeState nodeState, NodeId activityId, VersionStateManager versionStateMgr)
{
         this.nodeState = nodeState;
         this.activityId = activityId;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
         supportsActivity = true;
         // NOTE: affected-states only needed for transient modifications
     }
@@ -70,7 +70,7 @@ public class Checkout extends AbstractOp
         assertStatus(Status.PENDING);
         status = Status.PERSISTED;
         try {
-            NodeEntry vhe = mgr.getVersionHistoryEntry(nodeState);
+            NodeEntry vhe = versionStateMgr.getVersionHistoryEntry(nodeState);
             if (vhe != null) {
                 vhe.invalidate(true);
             }
@@ -119,11 +119,11 @@ public class Checkout extends AbstractOp
 
     //------------------------------------------------------------< Factory >---
     
-    public static Operation create(NodeState nodeState, VersionManager mgr) {
-        return new Checkout(nodeState, mgr);
+    public static Operation create(NodeState nodeState, VersionStateManager versionStateMgr)
{
+        return new Checkout(nodeState, versionStateMgr);
     }
 
-    public static Operation create(NodeState nodeState, NodeId activityId, VersionManager
mgr) {
-        return new Checkout(nodeState, activityId, mgr);
+    public static Operation create(NodeState nodeState, NodeId activityId, VersionStateManager
versionStateMgr) {
+        return new Checkout(nodeState, activityId, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi.op
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,25 +34,25 @@ public class Checkpoint extends Abstract
     private static final Logger log = LoggerFactory.getLogger(Checkpoint.class);
 
     private final NodeState nodeState;
-    private final VersionManager mgr;
+    private final VersionStateManager versionStateMgr;
 
     private final NodeId activityId;
     private final boolean supportsActivity;
 
     private NodeId newVersionId;
 
-    private Checkpoint(NodeState nodeState, VersionManager mgr) {
+    private Checkpoint(NodeState nodeState, VersionStateManager versionStateMgr) {
         this.nodeState = nodeState;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
         // NOTE: affected-states only needed for transient modifications
         supportsActivity = false;
         activityId = null;
     }
 
-    private Checkpoint(NodeState nodeState, NodeId activityId, VersionManager mgr) {
+    private Checkpoint(NodeState nodeState, NodeId activityId, VersionStateManager versionStateMgr)
{
         this.nodeState = nodeState;
         this.activityId = activityId;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
         supportsActivity = true;
         // NOTE: affected-states only needed for transient modifications
     }
@@ -74,7 +74,7 @@ public class Checkpoint extends Abstract
         assertStatus(Status.PENDING);
         status = Status.PERSISTED;
         try {
-            NodeEntry vhe = mgr.getVersionHistoryEntry(nodeState);
+            NodeEntry vhe = versionStateMgr.getVersionHistoryEntry(nodeState);
             if (vhe != null) {
                 vhe.invalidate(true);
             }
@@ -131,11 +131,11 @@ public class Checkpoint extends Abstract
 
     //------------------------------------------------------------< Factory >---
     
-    public static Checkpoint create(NodeState nodeState, VersionManager mgr) {
-        return new Checkpoint(nodeState, mgr);
+    public static Checkpoint create(NodeState nodeState, VersionStateManager versionStateMgr)
{
+        return new Checkpoint(nodeState, versionStateMgr);
     }
 
-    public static Checkpoint create(NodeState nodeState, NodeId activityId, VersionManager
mgr) {
-        return new Checkpoint(nodeState, activityId, mgr);
+    public static Checkpoint create(NodeState nodeState, NodeId activityId, VersionStateManager
versionStateMgr) {
+        return new Checkpoint(nodeState, activityId, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
Fri Sep 16 11:06:31 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.jcr2spi.operation;
 
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 
 import javax.jcr.RepositoryException;
@@ -29,7 +29,7 @@ public class CreateActivity extends Abst
 
     private NodeId newActivityId;
 
-    private CreateActivity(String title, VersionManager mgr) {
+    private CreateActivity(String title, VersionStateManager versionStateMgr) {
         this.title = title;
         // NOTE: affected-states only needed for transient modifications
     }
@@ -74,7 +74,7 @@ public class CreateActivity extends Abst
 
     //------------------------------------------------------------< Factory >---
     
-    public static CreateActivity create(String title, VersionManager mgr) {
-        return new CreateActivity(title, mgr);
+    public static CreateActivity create(String title, VersionStateManager versionStateMgr)
{
+        return new CreateActivity(title, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
Fri Sep 16 11:06:31 2011
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.jcr2spi.operation;
 
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 
 import javax.jcr.RepositoryException;
@@ -29,7 +29,7 @@ public class CreateConfiguration extends
     private final NodeState nodeState;
     private NodeId newConfigurationId;
 
-    private CreateConfiguration(NodeState nodeState, VersionManager mgr) {
+    private CreateConfiguration(NodeState nodeState, VersionStateManager versionStateMgr)
{
         this.nodeState = nodeState;
         // NOTE: affected-states only needed for transient modifications
     }
@@ -77,7 +77,7 @@ public class CreateConfiguration extends
 
     //------------------------------------------------------------< Factory >---
     
-    public static CreateConfiguration create(NodeState nodeState, VersionManager mgr) {
-        return new CreateConfiguration(nodeState, mgr);
+    public static CreateConfiguration create(NodeState nodeState, VersionStateManager versionStateMgr)
{
+        return new CreateConfiguration(nodeState, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi.op
 import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.apache.jackrabbit.spi.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,16 +37,16 @@ public class Merge extends AbstractOpera
     private final String srcWorkspaceName;
     private final boolean bestEffort;
     private final boolean isShallow;
-    private final VersionManager mgr;
+    private final VersionStateManager versionStateMgr;
 
     private Iterator<NodeId> failedIds;
 
-    private Merge(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean
isShallow, VersionManager mgr) {
+    private Merge(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean
isShallow, VersionStateManager versionStateMgr) {
         this.nodeState = nodeState;
         this.srcWorkspaceName = srcWorkspaceName;
         this.bestEffort = bestEffort;
         this.isShallow = isShallow;
-        this.mgr = mgr;
+        this.versionStateMgr = versionStateMgr;
 
         // NOTE: affected-states only needed for transient modifications
     }
@@ -80,7 +80,7 @@ public class Merge extends AbstractOpera
             entry.invalidate(true);
         } else {
             try {
-                NodeEntry vhe = mgr.getVersionHistoryEntry(nodeState);
+                NodeEntry vhe = versionStateMgr.getVersionHistoryEntry(nodeState);
                 if (vhe != null) {
                     vhe.invalidate(true);
                 }
@@ -139,8 +139,8 @@ public class Merge extends AbstractOpera
      * @return
      */
     public static Merge create(NodeState nodeState, String srcWorkspaceName, boolean bestEffort,
boolean isShallow,
-            VersionManager mgr) {
+            VersionStateManager versionStateMgr) {
         
-        return new Merge(nodeState, srcWorkspaceName, bestEffort, isShallow, mgr);
+        return new Merge(nodeState, srcWorkspaceName, bestEffort, isShallow, versionStateMgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java?rev=1171504&r1=1171503&r2=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
Fri Sep 16 11:06:31 2011
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.jcr2spi.op
 import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
 import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
 import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.jcr2spi.version.VersionStateManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,10 +34,10 @@ public class RemoveVersion extends Abstr
 
     private NodeEntry versionableEntry;
 
-    private RemoveVersion(NodeState removeState, NodeState parent, VersionManager mgr) {
+    private RemoveVersion(NodeState removeState, NodeState parent, VersionStateManager versionStateMgr)
{
         super(removeState, parent);
         try {
-            versionableEntry = mgr.getVersionableNodeEntry(removeState);
+            versionableEntry = versionStateMgr.getVersionableNodeEntry(removeState);
         } catch (RepositoryException e) {
             log.warn("Failed to retrieve the hierarchy entry of the versionable node.", e);
         }
@@ -80,7 +80,7 @@ public class RemoveVersion extends Abstr
 
     //------------------------------------------------------------< Factory >---
     
-    public static Operation create(NodeState versionState, NodeState vhState, VersionManager
mgr) {
-        return new RemoveVersion(versionState, vhState, mgr);
+    public static Operation create(NodeState versionState, NodeState vhState, VersionStateManager
versionStateMgr) {
+        return new RemoveVersion(versionState, vhState, versionStateMgr);
     }
 }

Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java
(from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java&r1=1171436&r2=1171504&rev=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java
Fri Sep 16 11:06:31 2011
@@ -38,7 +38,7 @@ import java.util.Iterator;
 /**
  * {@code VersionManager}...
  */
-public interface VersionManager {
+public interface VersionStateManager {
 
     /**
      * @param nodeState

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManager.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision url

Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java
(from r1171436, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java&r1=1171436&r2=1171504&rev=1171504&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java
Fri Sep 16 11:06:31 2011
@@ -48,10 +48,10 @@ import java.util.Iterator;
 /**
  * {@code VersionManagerImpl}...
  */
-public class VersionManagerImpl implements VersionManager {
+public class VersionStateManagerImpl implements VersionStateManager {
     private final WorkspaceManager workspaceManager;
 
-    public VersionManagerImpl(WorkspaceManager workspaceManager) {
+    public VersionStateManagerImpl(WorkspaceManager workspaceManager) {
         this.workspaceManager = workspaceManager;
     }
 

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision url



Mime
View raw message