You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2016/11/16 12:00:01 UTC
svn commit: r1769963 - in /sling/trunk: bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/ contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/ contrib/scripting/org.apache.sling.scripting.t...

Author: jsedding
Date: Wed Nov 16 12:00:01 2016
New Revision: 1769963

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

- adjust to moved LoginAdminWhitelist
-minor cleanup

Added:
    sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config
      - copied unchanged from r1769962, sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
Removed:
    sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config
Modified:
    sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
    sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt
    sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
    sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
    sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
    sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
    sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
    sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
    sling/trunk/launchpad/integration-tests/pom.xml
    sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
    sling/trunk/launchpad/testing/src/main/provisioning/model.txt

Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrProviderStateFactory.java Wed Nov 16 12:00:01 2016
@@ -104,7 +104,7 @@ public class JcrProviderStateFactory {
                             isLoginAdministrative ? "admin" : "service",
                             bundle.getSymbolicName(),
                             bundle.getBundleId());
-                    throw new LoginException(); // TODO: correct ??
+                    throw new LoginException("Repository unavailable"); // TODO: correct ??
                 }
 
                 try {

Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt Wed Nov 16 12:00:01 2016
@@ -36,5 +36,5 @@
     org.apache.sling.commons.log.file="logs/sling-contextaware-config.log"
     org.apache.sling.commons.log.level="debug"
 
-  org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist
+  org.apache.sling.jcr.base.internal.LoginAdminWhitelist
     whitelist.bundles.additional=["org.apache.sling.junit.core"]

Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java Wed Nov 16 12:00:01 2016
@@ -124,7 +124,7 @@ public abstract class ThymeleafTestSuppo
             factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
                 .put("user.mapping", "org.apache.sling.scripting.thymeleaf=sling-scripting")
                 .asOption(),
-            newConfiguration("org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist")
+            newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist")
                 .put("whitelist.bundles.regexp", "org.apache.sling.*")
                 .asOption()
         );

Modified: sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml Wed Nov 16 12:00:01 2016
@@ -118,8 +118,8 @@
                   <type>config</type>
                 </artifact>
                 <artifact>
-                  <classifier>org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist</classifier>
-                  <file>src/main/resources/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config</file>
+                  <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist</classifier>
+                  <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config</file>
                   <type>config</type>
                 </artifact>
                 <artifact>

Modified: sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml Wed Nov 16 12:00:01 2016
@@ -168,7 +168,7 @@
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.karaf-configs</artifactId>
       <version>${project.version}</version>
-      <classifier>org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist</classifier>
+      <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist</classifier>
       <type>config</type>
       <scope>runtime</scope>
     </dependency>

Modified: sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml Wed Nov 16 12:00:01 2016
@@ -296,9 +296,9 @@
   </feature>
   <!-- Apache Sling JCR -->
   <feature name="sling-jcr" version="${feature.version}">
-    <configfile finalname="/etc/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist</configfile>
+    <configfile finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.4.1-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.4.3-SNAPSHOT</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.4</bundle>
@@ -404,14 +404,14 @@
     <feature version="${feature.version}" prerequisite="true">sling-launchpad-oak</feature>
     <bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-segment/${org.apache.jackrabbit.oak.version}</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.1-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
   </feature>
   <feature name="sling-launchpad-oak-mongo" version="${feature.version}">
     <configfile finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/cfg/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
     <feature version="${feature.version}" prerequisite="true">sling-launchpad-oak</feature>
     <bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.mongodb/mongo-java-driver/2.14.3</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.1-SNAPSHOT</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
   </feature>
   <!-- Apache Sling NoSQL -->
   <feature name="sling-nosql-generic" version="${feature.version}">

Modified: sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Wed Nov 16 12:00:01 2016
@@ -42,7 +42,7 @@
 # start the Oak server instance after all components have been configured
 # and started to avoid restarting that component ( see SLING-4556 )
 [artifacts startLevel=16]
-    org.apache.sling/org.apache.sling.jcr.oak.server/1.1.1-SNAPSHOT
+    org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT
 
 [configurations]
   org.apache.felix.jaas.Configuration.factory-GuestLoginModule

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Wed Nov 16 12:00:01 2016
@@ -104,7 +104,7 @@
 [artifacts startLevel=15]
     org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
     org.apache.sling/org.apache.sling.jcr.api/2.4.0
-    org.apache.sling/org.apache.sling.jcr.base/2.4.1-SNAPSHOT
+    org.apache.sling/org.apache.sling.jcr.base/2.4.3-SNAPSHOT
     org.apache.sling/org.apache.sling.jcr.registration/1.0.2
     org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}

Modified: sling/trunk/launchpad/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/pom.xml (original)
+++ sling/trunk/launchpad/integration-tests/pom.xml Wed Nov 16 12:00:01 2016
@@ -269,7 +269,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.base</artifactId>
-      <version>2.1.0</version>
+      <version>2.4.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Modified: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Wed Nov 16 12:00:01 2016
@@ -31,7 +31,7 @@
     # Set the servlet resolver's cache size to zero for testing
     servletresolver.cacheSize=I"0"
 
-  org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist
+  org.apache.sling.jcr.base.internal.LoginAdminWhitelist
     whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
 
  # Test repository initialization from provisioning model

Modified: sling/trunk/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/model.txt?rev=1769963&r1=1769962&r2=1769963&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/model.txt Wed Nov 16 12:00:01 2016
@@ -32,7 +32,7 @@
     # Set the servlet resolver's cache size to zero for testing
     servletresolver.cacheSize=I"0"
 
-  org.apache.sling.jcr.oak.server.internal.LoginAdminWhitelist
+  org.apache.sling.jcr.base.internal.LoginAdminWhitelist
     whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
 
 [settings]