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 2015/03/30 14:51:54 UTC
svn commit: r1670084 - in /jackrabbit/oak/trunk: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/
oak-doc/src/site/markdown/
Author: angela
Date: Mon Mar 30 12:51:54 2015
New Revision: 1670084
URL: http://svn.apache.org/r1670084
Log:
OAK-2698 : Deprecate oak-mk-api (adjust documentation)
Modified:
jackrabbit/oak/trunk/README.md
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictAnnotatingRebaseDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java
jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md
Modified: jackrabbit/oak/trunk/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/README.md?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/README.md (original)
+++ jackrabbit/oak/trunk/README.md Mon Mar 30 12:51:54 2015
@@ -50,8 +50,8 @@ The build consists of the following main
- oak-parent - parent POM
- oak-doc - Oak documentation
- oak-commons - shared utility code
- - oak-mk-api - MicroKernel API
- - oak-mk - default MicroKernel implementation
+ - oak-mk-api - MicroKernel API (_deprecated_)
+ - oak-mk - MicroKernel implementation
- [oak-core][1] - Oak repository API and implementation
- oak-jcr - JCR binding for the Oak repository
- oak-sling - integration with Apache Sling
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java Mon Mar 30 12:51:54 2015
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.spi.sta
* {@link org.apache.jackrabbit.oak.spi.commit.ConflictHandler}
* for resolving the conflicts.
*
- * @see org.apache.jackrabbit.mk.api.MicroKernel#rebase(String, String)
+ * @see org.apache.jackrabbit.oak.spi.state.NodeStore#rebase(org.apache.jackrabbit.oak.spi.state.NodeBuilder)
*/
public class ConflictHook implements CommitHook {
private final ConflictHandler conflictHandler;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java Mon Mar 30 12:51:54 2015
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.Pro
/**
* {@code AbstractRebaseDiff} serves as base for rebase implementations.
* It implements a {@link NodeStateDiff}, which performs the conflict
- * handling as defined in {@link org.apache.jackrabbit.mk.api.MicroKernel#rebase(String, String)}
+ * handling as defined in {@link org.apache.jackrabbit.oak.spi.state.NodeStore#rebase(NodeBuilder)}
* on the Oak SPI state level.
* <p>
* Intended use of this class is to re-base a branched version of the node state
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictAnnotatingRebaseDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictAnnotatingRebaseDiff.java?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictAnnotatingRebaseDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictAnnotatingRebaseDiff.java Mon Mar 30 12:51:54 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.state;
-import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.api.PropertyState;
import static org.apache.jackrabbit.oak.spi.state.ConflictType.DELETE_CHANGED_PROPERTY;
@@ -31,7 +30,7 @@ import static org.apache.jackrabbit.oak.
/**
* This implementation of {@code AbstractRebaseDiff} implements a {@link NodeStateDiff},
- * which performs the conflict handling as defined in {@link MicroKernel#rebase(String, String)}
+ * which performs the conflict handling as defined in {@link NodeStore#rebase(NodeBuilder)}
* on the Oak SPI state level by annotating conflicting items with conflict
* markers.
*/
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java Mon Mar 30 12:51:54 2015
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.spi.st
/**
* Enum to define various types of conflicts.
*
- * @see org.apache.jackrabbit.mk.api.MicroKernel#rebase(String, String)
+ * @see org.apache.jackrabbit.oak.spi.state.NodeStore#rebase(NodeBuilder)
*/
public enum ConflictType {
Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md?rev=1670084&r1=1670083&r2=1670084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md Mon Mar 30 12:51:54 2015
@@ -62,8 +62,8 @@ The build consists of the following main
- oak-parent - parent POM
- oak-doc - Oak documentation
- oak-commons - shared utility code
- - oak-mk-api - MicroKernel API
- - oak-mk - default MicroKernel implementation
+ - oak-mk-api - MicroKernel API (_deprecated_)
+ - oak-mk - MicroKernel implementation
- [oak-core][1] - Oak repository API and implementation
- oak-jcr - JCR binding for the Oak repository
- oak-sling - integration with Apache Sling