You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2011/06/16 20:30:27 UTC

svn commit: r1136588 - /jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java

Author: thomasm
Date: Thu Jun 16 18:30:27 2011
New Revision: 1136588

URL: http://svn.apache.org/viewvc?rev=1136588&view=rev
Log:
Support {../..} in path elements (so that JCR paths don't have to be escaped).

Modified:
    jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java

Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1136588&r1=1136587&r2=1136588&view=diff
==============================================================================
--- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original)
+++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Thu Jun 16 18:30:27 2011
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.spi2microk
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.api.MicroKernelException;
 import org.apache.jackrabbit.mk.json.JsonBuilder;
-import org.apache.jackrabbit.mk.util.PathUtil;
+import org.apache.jackrabbit.mk.util.PathUtils;
 import org.apache.jackrabbit.spi.Batch;
 import org.apache.jackrabbit.spi.ChildInfo;
 import org.apache.jackrabbit.spi.ItemId;
@@ -494,13 +494,13 @@ public class RepositoryServiceImpl exten
 
         private String target(NodeId nodeId) throws RepositoryException {
             return '\"' + JsonBuilder.escape(
-                PathUtil.relativize("/", Paths.pathToString(sessionInfo.getWorkspaceName(), nodeId.getPath()))) + '\"';
+                PathUtils.relativize("/", Paths.pathToString(sessionInfo.getWorkspaceName(), nodeId.getPath()))) + '\"';
         }
 
         private String target(NodeId parentId, Name itemName) throws RepositoryException {
             String path = Paths.pathToString(sessionInfo.getWorkspaceName(), parentId.getPath());
             String name = Paths.nameToString(itemName);
-            return '\"' + JsonBuilder.escape(PathUtil.concat(PathUtil.relativize("/", path), name)) + '\"';
+            return '\"' + JsonBuilder.escape(PathUtils.concat(PathUtils.relativize("/", path), name)) + '\"';
         }
 
         private void setProperty(NodeId parentId, Name propertyName, String jsonValue) throws RepositoryException {