Examples of AnnotatingConflictHandler

org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler
This {@link ConflictHandler} implementation resolves conflicts to{@link Resolution#THEIRS} and in addition marks nodes where a conflictoccurred with the mixin {@code rep:MergeConflict}:
```
 [rep:MergeConflict] mixin primaryitem rep:ours + rep:ours (nt:unstructured) protected IGNORE 
```
The {@code rep:ours} sub node contains our version of the node prior tothe conflict. @see ConflictValidator
org.apache.jackrabbit.oak.plugins.value.AnnotatingConflictHandler
This {@link ConflictHandler} implementation resolves conflicts to{@link Resolution#THEIRS} and in addition marks nodes where a conflictoccurred with {@code mix:mergeConflict}:
```
 [mix:mergeConflict] mixin primaryitem jcr:ours + jcr:ours (nt:unstructured) 
```
The {@code jcr:ours} sub node contains our version of the node prior tothe conflict. @see ConflictValidator

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler


    @Before
    public void setUp() {
        repository = new Oak(store)
            .with(new OpenSecurityProvider())
            .with(new ChildOrderConflictHandler(new AnnotatingConflictHandler()) {


                /**
                 * Allow deleting changed node.
                 * See {@link TreeTest#removeWithConcurrentOrderBefore()}
                 */

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

    }


    private static CommitHook newCommitHook(final String name,
            final PropertyState state) throws CommitFailedException {
        return new CompositeHook(
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()),
                new CommitHook() {
            @Override
            @Nonnull
            public NodeState processCommit(NodeState before, NodeState after,

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler


    @Before
    public void setUp() {
        repository = new Oak()
            .with(new OpenSecurityProvider())
            .with(new ChildOrderConflictHandler(new AnnotatingConflictHandler()) {


                /**
                 * Allow deleting changed node.
                 * See {@link TreeTest#removeWithConcurrentOrderBefore()}
                 */

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

                    throw CONCURRENT_UPDATE;
                }
            }
        };
        CompositeHook hooks = new CompositeHook(
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()),
                concurrentUpdateCheck);
        store.merge(builder, hooks, CommitInfo.EMPTY);
    }

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

                    throw CONCURRENT_UPDATE;
                }
            }
        };
        CompositeHook hooks = new CompositeHook(
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()),
                concurrentUpdateCheck);
        store.merge(builder, hooks, CommitInfo.EMPTY);
    }

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

                            callback.edit(builder);
                        }
                        return null;
                    }
                }),
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()));
        store.merge(root, hooks, CommitInfo.EMPTY);
    }

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

                    throw CONCURRENT_UPDATE;
                }
            }
        };
        CompositeHook hooks = new CompositeHook(
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()),
                concurrentUpdateCheck);
        store.merge(builder, hooks, CommitInfo.EMPTY);
    }

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler


        //4. Now merge and commit the changes in b1 and include conflict hooks
        //For now exception would be thrown
        ns.merge(b1,
                new CompositeHook(
                        new ConflictHook(new AnnotatingConflictHandler()),
                        new EditorHook(new ConflictValidatorProvider())
                ),
                CommitInfo.EMPTY);
    }

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler


    @Before
    public void setUp() {
        repository = new Oak(store)
            .with(new OpenSecurityProvider())
            .with(new ChildOrderConflictHandler(new AnnotatingConflictHandler()) {


                /**
                 * Allow deleting changed node.
                 * See {@link TreeTest#removeWithConcurrentOrderBefore()}
                 */

View Full Code Here

Examples of org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

                    throw CONCURRENT_UPDATE;
                }
            }
        };
        CompositeHook hooks = new CompositeHook(
                new ConflictHook(new AnnotatingConflictHandler()),
                new EditorHook(new ConflictValidatorProvider()),
                concurrentUpdateCheck);
        store.merge(builder, hooks, CommitInfo.EMPTY);
    }

View Full Code Here

0 1

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.