svn commit: r1792991 - in /jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins: document/DocumentNodeState.java version/ReadWriteVersionManager.java

[tomekr]

Author: tomekr
Date: Fri Apr 28 07:14:51 2017
New Revision: 1792991

URL: http://svn.apache.org/viewvc?rev=1792991&view=rev
Log:
OAK-6132: Backport oak-upgrade to 1.0 and 1.2

-expose some oak-core methods for the oak-upgrade

Modified:
    
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
    
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1792991&r1=1792990&r2=1792991&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 Fri Apr 28 07:14:51 2017
@@ -445,7 +445,7 @@ public class DocumentNodeState extends A
         this.lastRevision = lastRevision;
     }
 
-    Revision getLastRevision() {
+    public Revision getLastRevision() {
         return lastRevision;
     }
 

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java?rev=1792991&r1=1792990&r2=1792991&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
 Fri Apr 28 07:14:51 2017
@@ -73,14 +73,14 @@ import static org.apache.jackrabbit.oak.
 /**
  * TODO document
  */
-class ReadWriteVersionManager extends ReadOnlyVersionManager {
+public class ReadWriteVersionManager extends ReadOnlyVersionManager {
 
     private final NodeBuilder versionStorageNode;
     private final NodeBuilder workspaceRoot;
     private ReadOnlyNodeTypeManager ntMgr;
 
-    ReadWriteVersionManager(NodeBuilder versionStorageNode,
-                            NodeBuilder workspaceRoot) {
+    public ReadWriteVersionManager(NodeBuilder versionStorageNode,
+                                   NodeBuilder workspaceRoot) {
         this.versionStorageNode = checkNotNull(versionStorageNode);
         this.workspaceRoot = checkNotNull(workspaceRoot);
     }
@@ -118,7 +118,7 @@ class ReadWriteVersionManager extends Re
      *                                  {@code jcr:uuid} property.
      */
     @Nonnull
-    NodeBuilder getOrCreateVersionHistory(@Nonnull NodeBuilder versionable, 
@Nonnull Map<String, Object> infoMap)
+    public NodeBuilder getOrCreateVersionHistory(@Nonnull NodeBuilder 
versionable, @Nonnull Map<String, Object> infoMap)
             throws CommitFailedException {
         checkNotNull(versionable);
         String vUUID = uuidFromNode(versionable);
@@ -249,7 +249,7 @@ class ReadWriteVersionManager extends Re
                             " does not have a Version with UUID: " + 
versionUUID);
         }
         VersionableState versionableState = VersionableState.forRestore(
-                version, history, versionable, this, ntMgr);
+                version, history, versionable, this, getNodeTypeManager());
         versionableState.restore(selector);
     }
 
@@ -414,7 +414,7 @@ class ReadWriteVersionManager extends Re
 
         // jcr:frozenNode of created version
         VersionableState versionableState = VersionableState.fromVersion(
-                version, vHistory, versionable, this, ntMgr);
+                version, vHistory, versionable, this, getNodeTypeManager());
         if (!isRootVersion) {
             versionableState.create();
         }