@Version(value="1.0") @Export(optional="provide:=true")
Class | Description |
---|---|
AnnotatingConflictHandler |
This
ThreeWayConflictHandler implementation resolves conflicts to
ThreeWayConflictHandler.Resolution.THEIRS and in addition marks nodes where a
conflict occurred with the mixin rep:MergeConflict : |
ChildOrderConflictHandler |
This conflict handler instance takes care of properly merging conflicts
occurring by concurrent reorder operations.
|
ConflictHook |
This commit hook implementation is responsible for resolving
conflicts.
|
ConflictValidator |
Validator which checks the presence of conflict markers
in the tree in fails the commit if any are found. |
ConflictValidatorProvider |
TODO document
|
DefaultConflictHandler | Deprecated
Use
DefaultThreeWayConflictHandler instead. |
DefaultThreeWayConflictHandler |
This implementation of a
ThreeWayConflictHandler always returns the
same resolution. |
JcrConflictHandler |
Utility class providing conflict handlers used for JCR.
|
JcrLastModifiedConflictHandler |
Conflict Handler that merges concurrent updates to
org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED by picking the
older of the 2 conflicting dates and
org.apache.jackrabbit.JcrConstants.JCR_CREATED by picking the newer
of the 2 conflicting dates. |
MergingNodeStateDiff |
MergingNodeStateDiff...
|
Copyright © 2010 - 2020 Adobe. All Rights Reserved