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 md...@apache.org on 2012/08/29 15:22:46 UTC
svn commit: r1378535 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins:
type/NodeTypeConstants.java value/AnnotatingConflictHandler.java
Author: mduerig
Date: Wed Aug 29 13:22:46 2012
New Revision: 1378535
URL: http://svn.apache.org/viewvc?rev=1378535&view=rev
Log:
OAK-66: JCR Node Type Management
move constants to NodeTypeConstants
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeConstants.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeConstants.java?rev=1378535&r1=1378534&r2=1378535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeConstants.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeConstants.java Wed Aug 29 13:22:46 2012
@@ -33,9 +33,13 @@ public interface NodeTypeConstants exten
String JCR_AVAILABLE_QUERY_OPERATORS = "jcr:availableQueryOperators";
/**
- * Name of the mixin type to mark merge conflicts
- * TODO: review where this constant should be located.
+ * Merge conflict handling
*/
String MIX_REP_MERGE_CONFLICT = "rep:MergeConflict";
-
+ String REP_OURS = "rep:ours";
+ String ADD_EXISTING = "addExisting";
+ String CHANGE_DELETED = "changeDeleted";
+ String CHANGE_CHANGED = "changeChanged";
+ String DELETE_CHANGED = "deleteChanged";
+ String DELETE_DELETED = "deleteDeleted";
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java?rev=1378535&r1=1378534&r2=1378535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java Wed Aug 29 13:22:46 2012
@@ -30,7 +30,13 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.ADD_EXISTING;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.CHANGE_CHANGED;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.CHANGE_DELETED;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.DELETE_CHANGED;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.DELETE_DELETED;
import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.MIX_REP_MERGE_CONFLICT;
+import static org.apache.jackrabbit.oak.plugins.type.NodeTypeConstants.REP_OURS;
/**
* This {@link ConflictHandler} implementation resolves conflicts to
@@ -50,15 +56,6 @@ import static org.apache.jackrabbit.oak.
* @see ConflictValidator
*/
public class AnnotatingConflictHandler implements ConflictHandler {
-
- // TODO: move these constants to some common location for repository internal node types
- private static final String REP_OURS = "rep:ours";
- private static final String ADD_EXISTING = "addExisting";
- private static final String CHANGE_DELETED = "changeDeleted";
- private static final String CHANGE_CHANGED = "changeChanged";
- private static final String DELETE_CHANGED = "deleteChanged";
- private static final String DELETE_DELETED = "deleteDeleted";
-
private final CoreValueFactory valueFactory;
public AnnotatingConflictHandler(CoreValueFactory valueFactory) {