You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by st...@apache.org on 2011/03/25 12:04:36 UTC

svn commit: r1085319 - /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernel.java

Author: stefan
Date: Fri Mar 25 11:04:36 2011
New Revision: 1085319

URL: http://svn.apache.org/viewvc?rev=1085319&view=rev
Log:
drafting MicroKernel api (WIP)

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

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernel.java?rev=1085319&r1=1085318&r2=1085319&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernel.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernel.java Fri Mar 25 11:04:36 2011
@@ -269,10 +269,11 @@ public interface MicroKernel {
      *
      * @param idOrPath identifier or path denoting target node
      * @param jsonDiff changes to be applied in JSON diff format.
+     * @param revisionId revision the changes are based on
      * @return id of newly created revision
      * @throws MicroKernelException if an error occurs
      */
-    String /* revisionId */ commit(String idOrPath, String jsonDiff)
+    String /* revisionId */ commit(String idOrPath, String jsonDiff, String revisionId)
             throws MicroKernelException;