jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r770620 - in /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ManagerProvider.java NodeImpl.java SessionImpl.java WorkspaceImpl.java version/VersionHistoryImpl.java
Date Fri, 01 May 2009 10:33:56 GMT
Author: jukka
Date: Fri May  1 10:33:55 2009
New Revision: 770620

URL: http://svn.apache.org/viewvc?rev=770620&view=rev
Log:
JCR-1104: JSR 283 support

Rename VersionManager to VersionStateManager in jcr2spi to avoid naming conflict with the
JCR 2.0 VersionManager

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java?rev=770620&r1=770619&r2=770620&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
Fri May  1 10:33:55 2009
@@ -63,7 +63,7 @@
      * @return the <code>VersionManager</code> associated with this
      * <code>ManagerProvider</code>
      */
-    public VersionManager getVersionManager();
+    public VersionManager getVersionStateManager();
 
     public ItemDefinitionProvider getItemDefinitionProvider();
 

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=770620&r1=770619&r2=770620&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
Fri May  1 10:33:55 2009
@@ -776,7 +776,7 @@
         checkHasPendingChanges();
         checkIsLocked();
         if (isCheckedOut()) {
-            NodeEntry newVersion = session.getVersionManager().checkin(getNodeState());
+            NodeEntry newVersion = session.getVersionStateManager().checkin(getNodeState());
             return (Version) getItemManager().getItem(newVersion);
         } else {
             // nothing to do
@@ -792,7 +792,7 @@
         checkIsVersionable();
         checkIsLocked();
         if (!isCheckedOut()) {
-            session.getVersionManager().checkout(getNodeState());
+            session.getVersionStateManager().checkout(getNodeState());
         } else {
             // nothing to do
             log.debug("Node " + safeGetJCRPath() + " is already checked out.");
@@ -850,7 +850,7 @@
         }
 
         NodeState versionState = session.getVersionState(version);
-        session.getVersionManager().resolveMergeConflict(getNodeState(), versionState, done);
+        session.getVersionStateManager().resolveMergeConflict(getNodeState(), versionState,
done);
     }
 
     /**
@@ -891,7 +891,7 @@
         // make sure the workspace exists and is accessible for this session.
         session.checkAccessibleWorkspace(srcWorkspace);
 
-        Iterator failedIds = session.getVersionManager().merge(getNodeState(), srcWorkspace,
bestEffort);
+        Iterator failedIds = session.getVersionStateManager().merge(getNodeState(), srcWorkspace,
bestEffort);
         return new LazyItemIterator(getItemManager(), session.getHierarchyManager(), failedIds);
     }
 
@@ -957,7 +957,7 @@
         if (isNew()) {
             return true;
         }
-        return session.getVersionManager().isCheckedOut(getNodeState());
+        return session.getVersionStateManager().isCheckedOut(getNodeState());
     }
 
     /**
@@ -1070,7 +1070,7 @@
         }
 
         NodeState versionState = session.getVersionState(version);
-        session.getVersionManager().restore(targetNode.getNodeState(), relQPath, versionState,
removeExisting);
+        session.getVersionStateManager().restore(targetNode.getNodeState(), relQPath, versionState,
removeExisting);
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=770620&r1=770619&r2=770620&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
Fri May  1 10:33:55 2009
@@ -630,10 +630,10 @@
     }
 
     /**
-     * @see ManagerProvider#getVersionManager()
+     * @see ManagerProvider#getVersionStateManager()
      */
-    public VersionManager getVersionManager() {
-        return workspace.getVersionManager();
+    public VersionManager getVersionStateManager() {
+        return workspace.getVersionStateManager();
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=770620&r1=770619&r2=770620&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
Fri May  1 10:33:55 2009
@@ -250,7 +250,7 @@
         for (int i = 0; i < versions.length; i++) {
             versionStates[i] = session.getVersionState(versions[i]);
         }
-        getVersionManager().restore(versionStates, removeExisting);
+        getVersionStateManager().restore(versionStates, removeExisting);
     }
 
     /**
@@ -398,9 +398,9 @@
     }
 
     /**
-     * @see ManagerProvider#getVersionManager()
+     * @see ManagerProvider#getVersionStateManager()
      */
-    public VersionManager getVersionManager() {
+    public VersionManager getVersionStateManager() {
         if (versionManager == null) {
             versionManager = createVersionManager(wspManager);
         }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=770620&r1=770619&r2=770620&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
Fri May  1 10:33:55 2009
@@ -163,7 +163,7 @@
         Name qLabel = getQLabel(label);
         NodeState vState = getVersionState(versionName);
         // delegate to version manager that operates on workspace directely
-        session.getVersionManager().addVersionLabel((NodeState) getItemState(), vState, qLabel,
moveLabel);
+        session.getVersionStateManager().addVersionLabel((NodeState) getItemState(), vState,
qLabel, moveLabel);
     }
 
     /**
@@ -179,7 +179,7 @@
         Version version = getVersionByLabel(qLabel);
         NodeState vState = getVersionState(version.getName());
         // delegate to version manager that operates on workspace directely
-        session.getVersionManager().removeVersionLabel((NodeState) getItemState(), vState,
qLabel);
+        session.getVersionStateManager().removeVersionLabel((NodeState) getItemState(), vState,
qLabel);
     }
 
     /**
@@ -281,7 +281,7 @@
         VersionException, RepositoryException {
         checkStatus();
         NodeState vState = getVersionState(versionName);
-        session.getVersionManager().removeVersion((NodeState) getItemState(), vState);
+        session.getVersionStateManager().removeVersion((NodeState) getItemState(), vState);
     }
 
     //---------------------------------------------------------------< Item >---



Mime
View raw message