jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1238257 - in /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk: api/MicroKernel.java mem/MemoryKernelImpl.java
Date Tue, 31 Jan 2012 08:39:29 GMT
Author: thomasm
Date: Tue Jan 31 08:39:28 2012
New Revision: 1238257

URL: http://svn.apache.org/viewvc?rev=1238257&view=rev
Log:
Document revision id in the commit call.

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

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=1238257&r1=1238256&r2=1238257&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
Tue Jan 31 08:39:28 2012
@@ -271,14 +271,19 @@ public interface MicroKernel {
 
     /**
      * Applies the specified changes on the specified target node.
-     * <p/>
+     * <p>
      * If <code>path.length() == 0</code> the paths specified in the
      * <code>jsonDiff</code> are expected to be absolute.
+     * <p>
+     * The implementation tries to merge changes if the revision id of the
+     * commit is set accordingly. As an example, deleting a node is allowed if
+     * the node existed in the given revision, even if it was deleted in the
+     * meantime.
      *
-     * @param path       path denoting target node
-     * @param jsonDiff   changes to be applied in JSON diff format.
+     * @param path path denoting target node
+     * @param jsonDiff changes to be applied in JSON diff format.
      * @param revisionId revision the changes are based on
-     * @param message    commit message
+     * @param message commit message
      * @return id of newly created revision
      * @throws MicroKernelException if an error occurs
      */

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java?rev=1238257&r1=1238256&r2=1238257&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java
Tue Jan 31 08:39:28 2012
@@ -173,8 +173,6 @@ public class MemoryKernelImpl extends Wr
 
     public synchronized String commitStream(String rootPath, JsopReader jsonDiff, String
revisionId, String message) {
         // TODO do we really need 'path'? store the path is in the diff instead
-        // TODO what is the exact meaning of 'revisionId'? is it allowed to commit
-        // using an old revision, if yes when is it allowed, or how is it different from
using head?
         // TODO increment headRevId less often? commit in the background?
         // would be possible if we don't (always) return the head revision
         // TODO metadata in storage (version)



Mime
View raw message