jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1149639 - in /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk: MicroKernelImpl.java api/MicroKernel.java
Date Fri, 22 Jul 2011 15:46:05 GMT
Author: stefan
Date: Fri Jul 22 15:46:05 2011
New Revision: 1149639

URL: http://svn.apache.org/viewvc?rev=1149639&view=rev
Log:
fixed 'move' op

Modified:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java?rev=1149639&r1=1149638&r2=1149639&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
Fri Jul 22 15:46:05 2011
@@ -304,8 +304,13 @@ public class MicroKernelImpl implements 
                 }
                 case '>': {
                     String relPath = t.readString();
+                    t.read(':');
                     String targetPath = t.readString();
+                    if (! PathUtils.isAbsolute(targetPath)) {
+                        targetPath = PathUtils.concat(path, targetPath);
+                    }
                     cb.moveNode(PathUtils.concat(path, relPath), targetPath);
+                    break;
                 }
                 default:
                     throw new AssertionError("token type: " + t.getTokenType());

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1149639&r1=1149638&r2=1149639&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Fri Jul 22 15:46:05 2011
@@ -92,6 +92,11 @@ import java.io.InputStream;
  */
 public interface MicroKernel {
 
+    /**
+     * Dispose this instance.
+     */
+    void dispose();
+
     //---------------------------------------------------------< REVISION ops >
 
     /**
@@ -304,10 +309,4 @@ public interface MicroKernel {
      * @throws MicroKernelException if an error occurs
      */
     String /* blobId */ write(InputStream in) throws MicroKernelException;
-
-    /**
-     * Dispose this instance.
-     */
-    void dispose();
-
 }



Mime
View raw message