[sling-org-apache-sling-starter] branch master updated: SLING-6130 Restrict access for principal everyone and move configuration to repoinit

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git


The following commit(s) were added to refs/heads/master by this push:
     new a34a746  SLING-6130 Restrict access for principal everyone and move 
configuration to repoinit
a34a746 is described below

commit a34a746b0e3f459b7d9090af55360aa968400c55
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Thu Feb 8 16:18:53 2018 +0100

    SLING-6130 Restrict access for principal everyone and move configuration to 
repoinit
    
    * restrict read access to /content
    * switch to Launchpad Content 2.0.13-SNAPSHOT (SLING-7484)
    * adjust IT
---
 src/main/provisioning/repoinit.txt                               | 2 +-
 src/main/provisioning/sling.txt                                  | 2 +-
 src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java | 2 +-
 src/test/java/org/apache/sling/launchpad/SmokeIT.java            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/provisioning/repoinit.txt 
b/src/main/provisioning/repoinit.txt
index 4597d45..9e1227b 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -27,7 +27,7 @@
     # general
     create path (sling:OrderedFolder) /content
     set ACL for everyone
-        allow   jcr:read       on /
+        allow   jcr:read       on /content
     end
 
     # sling-mapping
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 8999855..165f2d3 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -57,7 +57,7 @@
     org.apache.sling/org.apache.sling.installer.hc/1.0.0
     org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4
     org.apache.sling/org.apache.sling.jcr.resource/3.0.8
-    org.apache.sling/org.apache.sling.launchpad.content/2.0.12
+    org.apache.sling/org.apache.sling.launchpad.content/2.0.13-SNAPSHOT
     org.apache.sling/org.apache.sling.models.api/1.3.6
     org.apache.sling/org.apache.sling.models.impl/1.4.6
     org.apache.sling/org.apache.sling.resourceresolver/1.5.34
diff --git a/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java 
b/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
index fa96fa3..f608e5c 100644
--- a/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
+++ b/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
@@ -38,7 +38,7 @@ public class LaunchpadReadyRule extends ExternalResource {
 
     public LaunchpadReadyRule(int launchpadPort) {
 
-        checks.add(new Check("http://localhost:"; + launchpadPort + 
"/server/default/jcr:root"));
+        checks.add(new Check("http://localhost:"; + launchpadPort + 
"/server/default/jcr:root/content"));
         checks.add(new Check("http://localhost:"; + launchpadPort + 
"/index.html") {
             @Override
             public String runCheck(HttpResponse response) throws Exception {
diff --git a/src/test/java/org/apache/sling/launchpad/SmokeIT.java 
b/src/test/java/org/apache/sling/launchpad/SmokeIT.java
index 7b3113c..ad4d9ee 100644
--- a/src/test/java/org/apache/sling/launchpad/SmokeIT.java
+++ b/src/test/java/org/apache/sling/launchpad/SmokeIT.java
@@ -126,7 +126,7 @@ public class SmokeIT {
     public void ensureRepositoryIsStarted() throws Exception {
         try ( CloseableHttpClient client = newClient() ) {
 
-            HttpGet get = new HttpGet("http://localhost:"; + LAUNCHPAD_PORT + 
"/server/default/jcr:root");
+            HttpGet get = new HttpGet("http://localhost:"; + LAUNCHPAD_PORT + 
"/server/default/jcr:root/content");
 
             try ( CloseableHttpResponse response = client.execute(get) ) {
 
@@ -147,7 +147,7 @@ public class SmokeIT {
 
                 Node nameAttr = 
attrs.getNamedItemNS("http://www.jcp.org/jcr/sv/1.0";, "name");
                 assertThat("no 'name' attribute found", nameAttr, 
notNullValue());
-                assertThat("Invalid name attribute value", 
nameAttr.getNodeValue(), equalTo("jcr:root"));
+                assertThat("Invalid name attribute value", 
nameAttr.getNodeValue(), equalTo("content"));
             }
         }
     }

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.