svn commit: r1535136 [2/2] - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/api/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/ oak-core/src/main/java/org/apac...

[jukka]

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1535136&r1=1535135&r2=1535136&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
 Wed Oct 23 19:51:00 2013
@@ -121,7 +121,7 @@ public class VersionManagerImpl implemen
                             version.getIdentifier());
                     versionManagerDelegate.restore(
                             parent, PathUtils.getName(oakPath), vd);
-                    sessionDelegate.getRoot().commit();
+                    sessionDelegate.commit();
                     success = true;
                 } catch (CommitFailedException e) {
                     throw e.asRepositoryException();
@@ -203,7 +203,7 @@ public class VersionManagerImpl implemen
                             version.getIdentifier());
                     versionManagerDelegate.restore(
                             n.getParent(), n.getName(), vd);
-                    sessionDelegate.getRoot().commit();
+                    sessionDelegate.commit();
                     success = true;
                 } catch (CommitFailedException e) {
                     throw new RepositoryException(e);

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java?rev=1535136&r1=1535135&r2=1535136&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
 Wed Oct 23 19:51:00 2013
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.jcr.ve
 import javax.annotation.Nonnull;
 
 import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
 
@@ -39,6 +38,10 @@ public class VersionStorage {
         this.root = versionStorageRoot;
     }
 
+    Root getRoot() {
+        return root;
+    }
+
     /**
      * The version storage tree. I.e. the tree at path
      * <code>/jcr:system/jcr:versionStorage</code>, though the returned
@@ -52,15 +55,6 @@ public class VersionStorage {
     }
 
     /**
-     * Commits changes made to the version storage tree.
-     *
-     * @throws CommitFailedException if the commit fails.
-     */
-    void commit() throws CommitFailedException {
-        root.commit();
-    }
-
-    /**
      * Reverts all changes made to the version storage tree.
      */
     void refresh() {
@@ -76,4 +70,5 @@ public class VersionStorage {
         // TODO: this assumes the version store is in the same workspace.
         return checkNotNull(workspaceRoot).getTree(VERSION_STORAGE_PATH);
     }
+
 }

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1535136&r1=1535135&r2=1535136&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
 Wed Oct 23 19:51:00 2013
@@ -75,7 +75,7 @@ import org.apache.jackrabbit.core.nodety
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.name.Namespaces;
 import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationEditorProvider;
-import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.EditorHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -177,8 +177,9 @@ public class RepositoryUpgrade {
             copyVersionStore(builder, idxToPrefix);
             copyWorkspaces(builder, idxToPrefix);
 
-            target.merge(builder, new EditorHook(new 
RegistrationEditorProvider()),
-                    CommitInfo.EMPTY); // TODO: default hooks?
+            // TODO: default hooks?
+            CommitHook hook = new EditorHook(new RegistrationEditorProvider());
+            target.merge(builder, hook, null);
         } catch (Exception e) {
             throw new RepositoryException("Failed to copy content", e);
         }