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 fr...@apache.org on 2016/04/27 14:46:31 UTC
svn commit: r1741247 -
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
Author: frm
Date: Wed Apr 27 12:46:31 2016
New Revision: 1741247
URL: http://svn.apache.org/viewvc?rev=1741247&view=rev
Log:
OAK-4316 - Jcr should accept an instance of the Oak builder but shouldn't initialize it
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1741247&r1=1741246&r2=1741247&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java Wed Apr 27 12:46:31 2016
@@ -105,32 +105,38 @@ public class Jcr {
private Repository repository;
private Clusterable clusterable;
-
- public Jcr(Oak oak) {
+
+ public Jcr(Oak oak, boolean initialize) {
this.oak = oak;
- with(new InitialContent());
+ if (initialize) {
+ with(new InitialContent());
+
+ with(new EditorHook(new VersionEditorProvider()));
- with(new EditorHook(new VersionEditorProvider()));
+ with(new SecurityProviderImpl());
- with(new SecurityProviderImpl());
+ with(new ItemSaveValidatorProvider());
+ with(new NameValidatorProvider());
+ with(new NamespaceEditorProvider());
+ with(new TypeEditorProvider());
+ with(new ConflictValidatorProvider());
- with(new ItemSaveValidatorProvider());
- with(new NameValidatorProvider());
- with(new NamespaceEditorProvider());
- with(new TypeEditorProvider());
- with(new ConflictValidatorProvider());
-
- with(new ReferenceEditorProvider());
- with(new ReferenceIndexProvider());
+ with(new ReferenceEditorProvider());
+ with(new ReferenceIndexProvider());
- with(new PropertyIndexEditorProvider());
- with(new NodeCounterEditorProvider());
+ with(new PropertyIndexEditorProvider());
+ with(new NodeCounterEditorProvider());
- with(new PropertyIndexProvider());
- with(new NodeTypeIndexProvider());
+ with(new PropertyIndexProvider());
+ with(new NodeTypeIndexProvider());
- with(new OrderedPropertyIndexEditorProvider());
+ with(new OrderedPropertyIndexEditorProvider());
+ }
+ }
+
+ public Jcr(Oak oak) {
+ this(oak, true);
}
public Jcr() {