You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2022/08/03 14:39:34 UTC
[sling-org-apache-sling-scripting-bundle-tracker-it] branch issue/SLING-11508 created (now db60a4a)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch issue/SLING-11508
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
at db60a4a SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
This branch includes the following new commits:
new db60a4a SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch issue/SLING-11508
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
commit db60a4a36dd95caf69156ae355128693987a2071
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jun 14 18:17:01 2022 +0200
SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
* added a test for script resolution
---
.../content/examplebundle-precompiled-extend1.xml | 18 ++++++++++++++
.../scripts/apps/level-2/components/page/extends | 1 +
.../scripts/apps/level-3/components/page/extends | 1 +
.../apps/level-3/components/page/head.html} | 26 ++++----------------
.../apps/level-3/components/page/head/dummy.html} | 24 +++----------------
.../apps/level-3/components/page/page.html} | 28 ++++++----------------
.../content/examplebundle-precompiled.xml | 10 ++++++++
.../libs/level-1/components/page/head.html} | 22 +++--------------
.../level-1/components/page/head.resources.html} | 26 ++++----------------
.../libs/level-1/components/page/page.html} | 28 ++++++----------------
it/pom.xml | 6 ++---
.../it/ExampleBundlePrecompiledExtend1IT.java | 7 ++++++
it/src/test/provisioning/it-model.txt | 2 --
it/src/test/provisioning/repoinit.txt | 7 ++++++
it/src/test/provisioning/sling.txt | 16 +++++++++----
15 files changed, 89 insertions(+), 133 deletions(-)
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
index 5dd1980..b4eb79b 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
@@ -35,3 +35,21 @@
<type>String</type>
</property>
</node>
+<node>
+ <name>sling-11508-level-2</name>
+ <primaryNodeType>nt:unstructured</primaryNodeType>
+ <property>
+ <name>sling:resourceType</name>
+ <value>level-2/components/page</value>
+ <type>String</type>
+ </property>
+</node>
+<node>
+ <name>sling-11508-level-3</name>
+ <primaryNodeType>nt:unstructured</primaryNodeType>
+ <property>
+ <name>sling:resourceType</name>
+ <value>level-3/components/page</value>
+ <type>String</type>
+ </property>
+</node>
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-2/components/page/extends b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-2/components/page/extends
new file mode 100644
index 0000000..030e35a
--- /dev/null
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-2/components/page/extends
@@ -0,0 +1 @@
+level-1/components/page
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/extends b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/extends
new file mode 100644
index 0000000..b932eb3
--- /dev/null
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/extends
@@ -0,0 +1 @@
+level-2/components/page
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head.html
similarity index 57%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head.html
index 5dd1980..9ad3370 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head.html
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -16,22 +15,7 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<template data-sly-template.template data-sly-use.headResources="head.resources.html">
+ <sly data-sly-call="${headResources.template}"></sly>
+</template>
\ No newline at end of file
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head/dummy.html
similarity index 57%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head/dummy.html
index 5dd1980..af63652 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/head/dummy.html
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -16,22 +15,5 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+ dummy.html
\ No newline at end of file
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/page.html
similarity index 57%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/page.html
index 5dd1980..8e98303 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/scripts/apps/level-3/components/page/page.html
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -16,22 +15,9 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<!doctype html>
+<html data-sly-use.head="head.html">
+ <head data-sly-call="${head.template}"></head>
+ <body>It works!</body>
+</html>
\ No newline at end of file
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/resources/SLING-INF/content/examplebundle-precompiled.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/resources/SLING-INF/content/examplebundle-precompiled.xml
index 373872f..0a6e54c 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/resources/SLING-INF/content/examplebundle-precompiled.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/resources/SLING-INF/content/examplebundle-precompiled.xml
@@ -53,3 +53,13 @@
<type>String</type>
</property>
</node>
+
+<node>
+ <name>sling-11508-level-1</name>
+ <primaryNodeType>nt:unstructured</primaryNodeType>
+ <property>
+ <name>sling:resourceType</name>
+ <value>level-1/components/page</value>
+ <type>String</type>
+ </property>
+</node>
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.html
similarity index 62%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.html
index 5dd1980..b898350 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -17,21 +16,6 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+<template data-sly-template.template data-sly-use.headResources="head.resources.html">
+ <sly data-sly-call="${headResources.template}"></sly>
+</template>
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.resources.html
similarity index 57%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.resources.html
index 5dd1980..f9dcd33 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/head.resources.html
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -16,22 +15,7 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<template data-sly-template.template>
+ <title>Main Head Resources</title>
+</template>
\ No newline at end of file
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/page.html
similarity index 57%
copy from examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
copy to examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/page.html
index 5dd1980..8e98303 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/src/main/resources/SLING-INF/content/examplebundle-precompiled-extend1.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/libs/level-1/components/page/page.html
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
@@ -16,22 +15,9 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<node>
- <name>hello</name>
- <primaryNodeType>nt:unstructured</primaryNodeType>
- <property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello</value>
- <type>String</type>
- </property>
-</node>
-<node>
-<name>hello-v0_9</name>
-<primaryNodeType>nt:unstructured</primaryNodeType>
-<property>
- <name>sling:resourceType</name>
- <value>org.apache.sling.scripting.examplebundle.precompiled.extend1.hello/0.9.0</value>
- <type>String</type>
-</property>
-</node>
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<!doctype html>
+<html data-sly-use.head="head.html">
+ <head data-sly-call="${head.template}"></head>
+ <body>It works!</body>
+</html>
\ No newline at end of file
diff --git a/it/pom.xml b/it/pom.xml
index c869f9f..4cfa48e 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.9.3-SNAPSHOT</version>
+ <version>2.9.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -206,7 +206,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
- <version>1.4.14-1.4.0</version>
+ <version>1.4.19-1.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -230,7 +230,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledExtend1IT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledExtend1IT.java
index a0f7030..52bb0cd 100644
--- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledExtend1IT.java
+++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundlePrecompiledExtend1IT.java
@@ -77,4 +77,11 @@ public class ExampleBundlePrecompiledExtend1IT extends AbstractEndpointTestBase
assertEquals("World", w.html());
assertEquals(expectedRT, w.attr(DATA_RT_ATTRIBUTE));
}
+
+ @Test
+ public void testSling11508Level3() throws Exception {
+ Document document = getDocument(ROOT + "/sling-11508-level-3.html");
+ Elements body = document.select("body");
+ assertEquals("It works!", body.html());
+ }
}
diff --git a/it/src/test/provisioning/it-model.txt b/it/src/test/provisioning/it-model.txt
index b5b8288..cfa07c5 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -48,5 +48,3 @@
org.apache.sling.engine.impl.SlingMainServlet
sling.trace.allow=B"true"
- org.apache.sling.servlets.resolver.SlingServletResolver
- servletresolver.mountProviders=B"false"
diff --git a/it/src/test/provisioning/repoinit.txt b/it/src/test/provisioning/repoinit.txt
index b268d80..294a796 100644
--- a/it/src/test/provisioning/repoinit.txt
+++ b/it/src/test/provisioning/repoinit.txt
@@ -30,6 +30,13 @@
allow jcr:read on /content
end
+# SLING-9735 - Define service user and ACLs for jcr.contentloader >>>
+#<<< SLING-9809 - Define service user and ACLs for jcr.usermanager
+create service user sling-jcr-usermanager
+set ACL for sling-jcr-usermanager
+ allow jcr:read,jcr:readAccessControl,jcr:modifyAccessControl,rep:write,rep:userManagement on /home
+end
+
# sling-mapping
create service user sling-mapping
diff --git a/it/src/test/provisioning/sling.txt b/it/src/test/provisioning/sling.txt
index 5ebbbb0..63e8b76 100644
--- a/it/src/test/provisioning/sling.txt
+++ b/it/src/test/provisioning/sling.txt
@@ -46,7 +46,7 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.4
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
- org.apache.sling/org.apache.sling.api/2.24.0
+ org.apache.sling/org.apache.sling.api/2.26.0-SNAPSHOT
org.apache.sling/org.apache.sling.auth.core/1.4.6
[artifacts startLevel=10]
@@ -70,7 +70,7 @@
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
org.apache.sling/org.apache.sling.jcr.webdav/2.3.8
org.apache.sling/org.apache.sling.jcr.davex/1.3.10
- org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.16
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.22
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.4
org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
io.dropwizard.metrics/metrics-core/3.2.6
@@ -98,7 +98,7 @@
org.apache.sling/org.apache.sling.commons.mime/2.2.2
org.apache.sling/org.apache.sling.commons.scheduler/2.7.6
org.apache.sling/org.apache.sling.commons.threads/3.2.20
- org.apache.sling/org.apache.sling.engine/2.8.0
+ org.apache.sling/org.apache.sling.engine/2.9.0
org.apache.sling/org.apache.sling.fsresource/2.1.16
org.apache.sling/org.apache.sling.i18n/2.5.14
org.apache.sling/org.apache.sling.installer.console/1.1.0
@@ -110,7 +110,7 @@
org.apache.sling/org.apache.sling.jcr.resource/3.1.0
org.apache.sling/org.apache.sling.models.api/1.3.8
org.apache.sling/org.apache.sling.models.impl/1.4.12
- org.apache.sling/org.apache.sling.resourceresolver/1.8.0
+ org.apache.sling/org.apache.sling.resourceresolver/1.10.0-SNAPSHOT
org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
org.apache.sling/org.apache.sling.servlets.get/2.1.40
@@ -217,8 +217,16 @@
"org.apache.sling.jcr.resource:validation\=sling-readall"
]
+ org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr-usermanager
+ user.mapping=[
+ "org.apache.sling.jcr.jackrabbit.usermanager\=sling-jcr-usermanager"
+ ]
+
+
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer-factories
user.mapping=[
"org.apache.sling.installer.factory.packages\=sling-package-install"
]
+ org.apache.sling.servlets.resolver.SlingServletResolver
+ servletresolver.mountPathProviders=B"true"