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 2017/06/14 15:31:52 UTC
svn commit: r1798710 - in /jackrabbit/oak/trunk:
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/
oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug...
Author: angela
Date: Wed Jun 14 15:31:52 2017
New Revision: 1798710
URL: http://svn.apache.org/viewvc?rev=1798710&view=rev
Log:
OAK-6343 : Add replacement for deprecated RootFactory.createSystemRoot
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java Wed Jun 14 15:31:52 2017
@@ -78,7 +78,7 @@ class ExternalIdentityRepositoryInitiali
Root root = RootFactory.createSystemRoot(store,
new EditorHook(new CompositeEditorProvider(new NamespaceEditorProvider(), new TypeEditorProvider())),
- null, null, null, null);
+ null, null, null);
// create index definition for "rep:externalId" and "rep:externalPrincipalNames"
Tree rootTree = root.getTree(PathUtils.ROOT_PATH);
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java Wed Jun 14 15:31:52 2017
@@ -160,7 +160,7 @@ public class CugConfiguration extends Co
Root root = RootFactory.createSystemRoot(store,
new EditorHook(new CompositeEditorProvider(new NamespaceEditorProvider(), new TypeEditorProvider())),
- null, null, null, null);
+ null, null, null);
if (registerCugNodeTypes(root)) {
NodeState target = store.getRoot();
target.compareAgainstBaseState(base, new ApplyDiff(builder));
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java Wed Jun 14 15:31:52 2017
@@ -137,7 +137,7 @@ public class InitialContent implements R
registerBuiltIn(RootFactory.createSystemRoot(
store, new EditorHook(new CompositeEditorProvider(
new NamespaceEditorProvider(),
- new TypeEditorProvider())), null, null, null, null));
+ new TypeEditorProvider())), null, null, null));
NodeState target = store.getRoot();
target.compareAgainstBaseState(base, new ApplyDiff(builder));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java Wed Jun 14 15:31:52 2017
@@ -64,7 +64,22 @@ public final class RootFactory {
(hook == null) ? EmptyHook.INSTANCE : hook,
(workspaceName == null) ? Oak.DEFAULT_WORKSPACE_NAME : workspaceName,
(securityProvider == null) ? new OpenSecurityProvider() : securityProvider,
- (queryEngineSettings == null) ? new QueryEngineSettings() : queryEngineSettings,
+ (queryEngineSettings == null) ? new org.apache.jackrabbit.oak.spi.query.QueryEngineSettings() : queryEngineSettings,
+ (indexProvider == null) ? new CompositeQueryIndexProvider(): indexProvider);
+
+ }
+
+ @Nonnull
+ public static Root createSystemRoot(@Nonnull NodeStore store,
+ @Nullable CommitHook hook,
+ @Nullable String workspaceName,
+ @Nullable SecurityProvider securityProvider,
+ @Nullable QueryIndexProvider indexProvider) {
+ return new SystemRoot(store,
+ (hook == null) ? EmptyHook.INSTANCE : hook,
+ (workspaceName == null) ? Oak.DEFAULT_WORKSPACE_NAME : workspaceName,
+ (securityProvider == null) ? new OpenSecurityProvider() : securityProvider,
+ new org.apache.jackrabbit.oak.spi.query.QueryEngineSettings(),
(indexProvider == null) ? new CompositeQueryIndexProvider(): indexProvider);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java Wed Jun 14 15:31:52 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.1.0")
+@Version("2.2.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.plugins.tree;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java Wed Jun 14 15:31:52 2017
@@ -59,7 +59,7 @@ class PrivilegeInitializer implements Re
NodeState base = squeeze(builder.getNodeState());
NodeStore store = new MemoryNodeStore(base);
try {
- Root systemRoot = RootFactory.createSystemRoot(store, null, null, null, null, null);
+ Root systemRoot = RootFactory.createSystemRoot(store, null, null, null, null);
new PrivilegeDefinitionWriter(systemRoot).writeBuiltInDefinitions();
} catch (RepositoryException e) {
log.error("Failed to register built-in privileges", e);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java Wed Jun 14 15:31:52 2017
@@ -95,7 +95,7 @@ class UserInitializer implements Workspa
MemoryNodeStore store = new MemoryNodeStore(base);
Root root = RootFactory.createSystemRoot(store, EmptyHook.INSTANCE, workspaceName,
- securityProvider, null,
+ securityProvider,
new CompositeQueryIndexProvider(new PropertyIndexProvider(), new NodeTypeIndexProvider()));
UserConfiguration userConfiguration = securityProvider.getConfiguration(UserConfiguration.class);
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java Wed Jun 14 15:31:52 2017
@@ -95,12 +95,12 @@ public class RootFuzzIT {
counter = 0;
store1 = fixture.createNodeStore();
- root1 = RootFactory.createSystemRoot(store1, null, null, null, null, null);
+ root1 = RootFactory.createSystemRoot(store1, null, null, null, null);
root1.getTree("/").addChild("root");
root1.commit();
store2 = fixture.createNodeStore();
- root2 = RootFactory.createSystemRoot(store2, null, null, null, null, null);
+ root2 = RootFactory.createSystemRoot(store2, null, null, null, null);
root2.getTree("/").addChild("root");
root2.commit();
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java Wed Jun 14 15:31:52 2017
@@ -101,7 +101,7 @@ public class LuceneIndexAggregationTest2
Root root = RootFactory.createSystemRoot(store, new EditorHook(
new CompositeEditorProvider(new NamespaceEditorProvider(),
- new TypeEditorProvider())), null, null, null, null);
+ new TypeEditorProvider())), null, null, null);
NodeTypeRegistry.register(root, stream, "testing node types");
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java?rev=1798710&r1=1798709&r2=1798710&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java Wed Jun 14 15:31:52 2017
@@ -196,7 +196,7 @@ public class TestUtil {
Root root = RootFactory.createSystemRoot(
store, new EditorHook(new CompositeEditorProvider(
new NamespaceEditorProvider(),
- new TypeEditorProvider())), null, null, null, null);
+ new TypeEditorProvider())), null, null, null);
NodeTypeRegistry.register(root, IOUtils.toInputStream(nodeTypeDefn), "test node types");
NodeState target = store.getRoot();
target.compareAgainstBaseState(base, new ApplyDiff(builder));