You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/10/14 18:16:08 UTC

svn commit: r1531964 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java

Author: angela
Date: Mon Oct 14 16:16:07 2013
New Revision: 1531964

URL: http://svn.apache.org/r1531964
Log:
OAK-1095 : versionable path property has wrong type

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java?rev=1531964&r1=1531963&r2=1531964&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java Mon Oct 14 16:16:07 2013
@@ -102,7 +102,7 @@ public class VersionablePathHook impleme
                 }
 
                 String versionablePath = nodeAfter.path;
-                vhBuilder.setProperty(workspaceName, versionablePath);
+                vhBuilder.setProperty(workspaceName, versionablePath, Type.PATH);
             }
             return true;
         }

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1531964&r1=1531963&r2=1531964&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java Mon Oct 14 16:16:07 2013
@@ -350,4 +350,12 @@ public class VersionManagementTest exten
         history = vMgr.getVersionHistory(testNode.getPath());
         history.addVersionLabel(v.getName(), "testLabel", true);
     }
+
+    public void testVersionablePath() throws Exception {
+        Node n = createVersionableNode(superuser.getNode(path));
+
+        VersionHistory vh = n.getVersionHistory();
+        Property versionablePath = vh.getProperty(superuser.getWorkspace().getName());
+        assertEquals(n.getPath(), versionablePath.getString());
+    }
 }
\ No newline at end of file