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 2020/10/22 16:15:54 UTC
[sling-org-apache-sling-scripting-sightly-testing-content] branch
master updated: SLING-9852 - Move all content for HTL tests into the
/content folder
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
The following commit(s) were added to refs/heads/master by this push:
new 0b4287e SLING-9852 - Move all content for HTL tests into the /content folder
0b4287e is described below
commit 0b4287ee0b3d952365bd473a570ba0d0ff4130f4
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 22 18:15:00 2020 +0200
SLING-9852 - Move all content for HTL tests into the /content folder
---
.../apps/sightly/scripts/resource/resource.html | 16 ++++++++--------
.../SLING-INF/apps/sightly/scripts/use/resource.html | 4 ++--
src/main/resources/SLING-INF/{ => content}/sightly.json | 0
.../resources/SLING-INF/{ => content}/sightlyperf.json | 0
.../resources/SLING-INF/{ => content}/sightlytck.json | 0
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html b/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
index a397e6f..781e133 100644
--- a/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
@@ -22,15 +22,15 @@
<title>HTL data-sly-resource - Sling implementation</title>
</head>
<body>
-<div id="selectors" data-sly-resource="${'/sightly/includedresource' @ selectors=['a', 'b']}"></div>
-<div id="selectors-remove-c" data-sly-resource="${'/sightly/includedresource.a.b.c.html' @ selectors=['a', 'b']}"></div>
-<div id="removeselectors-remove-b" data-sly-resource="${'/sightly/includedresource.a.b.c.html' @ removeSelectors=['b']}"></div>
-<div id="addselectors" data-sly-resource="${'/sightly/includedresource' @ addSelectors=['a', 'b', 'c']}"></div>
+<div id="selectors" data-sly-resource="${'/content/sightly/includedresource' @ selectors=['a', 'b']}"></div>
+<div id="selectors-remove-c" data-sly-resource="${'/content/sightly/includedresource.a.b.c.html' @ selectors=['a', 'b']}"></div>
+<div id="removeselectors-remove-b" data-sly-resource="${'/content/sightly/includedresource.a.b.c.html' @ removeSelectors=['b']}"></div>
+<div id="addselectors" data-sly-resource="${'/content/sightly/includedresource' @ addSelectors=['a', 'b', 'c']}"></div>
<div id="dot-include" data-sly-resource="${ '.' @ selectors='dot'}"></div>
-<div id="extension-selectors" data-sly-resource="${'/sightly/text.a.b.txt'}"></div>
-<div id="extension-replaceselectors" data-sly-resource="${'/sightly/text.a.b.txt' @ selectors=['c']}"></div>
-<sly data-sly-resource="${'/sightly/resource.with.dots.in.path' @ resourceType='sightly/scripts/renderer'}"/>
-<sly data-sly-resource="${'/sightly/nonexistingresource' @ resourceType='sightly/scripts/renderer'}"/>
+<div id="extension-selectors" data-sly-resource="${'/content/sightly/text.a.b.txt'}"></div>
+<div id="extension-replaceselectors" data-sly-resource="${'/content/sightly/text.a.b.txt' @ selectors=['c']}"></div>
+<sly data-sly-resource="${'/content/sightly/resource.with.dots.in.path' @ resourceType='sightly/scripts/renderer'}"/>
+<sly data-sly-resource="${'/content/sightly/nonexistingresource' @ resourceType='sightly/scripts/renderer'}"/>
<sly data-sly-resource="${@ resourceType='sightly/scripts/renderer'}"/>
<div id="wrapper-no-recursion" data-sly-resource="${'.'}"></div>
</body>
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/use/resource.html b/src/main/resources/SLING-INF/apps/sightly/scripts/use/resource.html
index 275df69..1a7af1d 100644
--- a/src/main/resources/SLING-INF/apps/sightly/scripts/use/resource.html
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/use/resource.html
@@ -16,13 +16,13 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<div id="someresource" data-sly-use.someresource="/sightly/use-someresource">
+<div id="someresource" data-sly-use.someresource="/content/sightly/use-someresource">
<div class="name">${someresource.name}</div>
<div class="path">${someresource.path}</div>
<div class="type">${someresource.resourceType}</div>
<div class="data">${someresource.data}</div>
</div>
-<div id="somefolder" data-sly-use.somefolder="/sightly/use-somefolder">
+<div id="somefolder" data-sly-use.somefolder="/content/sightly/use-somefolder">
<div class="name">${somefolder.name}</div>
<div class="path">${somefolder.path}</div>
<div class="resourceType">${somefolder.resourceType}</div>
diff --git a/src/main/resources/SLING-INF/sightly.json b/src/main/resources/SLING-INF/content/sightly.json
similarity index 100%
rename from src/main/resources/SLING-INF/sightly.json
rename to src/main/resources/SLING-INF/content/sightly.json
diff --git a/src/main/resources/SLING-INF/sightlyperf.json b/src/main/resources/SLING-INF/content/sightlyperf.json
similarity index 100%
rename from src/main/resources/SLING-INF/sightlyperf.json
rename to src/main/resources/SLING-INF/content/sightlyperf.json
diff --git a/src/main/resources/SLING-INF/sightlytck.json b/src/main/resources/SLING-INF/content/sightlytck.json
similarity index 100%
rename from src/main/resources/SLING-INF/sightlytck.json
rename to src/main/resources/SLING-INF/content/sightlytck.json