svn commit: r1770393 - in /sling/trunk/bundles/jcr: base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

[jsedding]

Author: jsedding
Date: Fri Nov 18 15:11:16 2016
New Revision: 1770393

URL: http://svn.apache.org/viewvc?rev=1770393&view=rev
Log:
SLING-6285 - Implement LoginAdminWhitelist in JCR Base

- fix access to Config constructor

Modified:
    
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
    
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1770393&r1=1770392&r2=1770393&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
 Fri Nov 18 15:11:16 2016
@@ -348,7 +348,7 @@ public abstract class AbstractSlingRepos
          * @param disableLoginAdministrative Whether to disable the
          *            {@code SlingRepository.loginAdministrative} method or 
not.
          */
-        protected Config(String defaultWorkspace, boolean 
disableLoginAdministrative) {
+        public Config(String defaultWorkspace, boolean 
disableLoginAdministrative) {
             this.defaultWorkspace = defaultWorkspace;
             this.disableLoginAdministrative = disableLoginAdministrative;
         }

Modified: 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java?rev=1770393&r1=1770392&r2=1770393&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 Fri Nov 18 15:11:16 2016
@@ -212,7 +212,7 @@ public class OakSlingRepositoryManager e
         this.threadPool = threadPoolManager.get("oak-observation");
         this.nodeAggregatorRegistration = 
bundleContext.registerService(NodeAggregator.class.getName(), 
getNodeAggregator(), null);
 
-        super.start(bundleContext, defaultWorkspace, 
disableLoginAdministrative);
+        super.start(bundleContext, new 
AbstractSlingRepositoryManager.Config(defaultWorkspace, 
disableLoginAdministrative));
     }
 
     @Deactivate