You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:12:12 UTC

[sling-org-apache-sling-scripting-sightly-testing-content] 11/17: SLING-4483 - Sightly: data-sly-resource does not properly resolve relative paths

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

rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git

commit 5c9c89def23946b80a6a7e4b2b84921689667bcf
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Mar 9 12:55:20 2015 +0000

    SLING-4483 - Sightly: data-sly-resource does not properly resolve relative paths
    
    * applied patch provided by Vlad Băilescu for ResourceRuntimeExtension (https://github.com/apache/sling/pull/66)
    * added test to check the behaviour of resource inclusion
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1665219 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sightly/scripts/resource/{resource.html => dot.html}    | 13 +------------
 .../SLING-INF/apps/sightly/scripts/resource/resource.html   |  1 +
 2 files changed, 2 insertions(+), 12 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/dot.html
similarity index 62%
copy from src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
copy to src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html
index b0d75ac..a95bbd2 100644
--- a/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/resource/dot.html
@@ -16,15 +16,4 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Sightly 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' @ selectors=['a', 'b']}"></div>
-<div id="removeselectors-remove-b" data-sly-resource="${'/sightly/includedresource.a.b.c' @ removeSelectors=['b']}"></div>
-<div id="addselectors" data-sly-resource="${'/sightly/includedresource' @ addSelectors=['a', 'b', 'c']}"></div>
-</body>
-</html>
\ No newline at end of file
+<div id="dot">It works</div>
\ No newline at end of file
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 b0d75ac..2f98a00 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
@@ -26,5 +26,6 @@
 <div id="selectors-remove-c" data-sly-resource="${'/sightly/includedresource.a.b.c' @ selectors=['a', 'b']}"></div>
 <div id="removeselectors-remove-b" data-sly-resource="${'/sightly/includedresource.a.b.c' @ removeSelectors=['b']}"></div>
 <div id="addselectors" data-sly-resource="${'/sightly/includedresource' @ addSelectors=['a', 'b', 'c']}"></div>
+<div id="dot-include" data-sly-resource="${ '.' @ selectors='dot'}"></div>
 </body>
 </html>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.