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 2016/09/02 14:51:08 UTC
svn commit: r1758968 [2/2] - in /sling/trunk/bundles/scripting/sightly: ./
compiler/ compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/
compiler/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/
compiler/src/main/java/...
Modified: sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html (original)
+++ sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html Fri Sep 2 14:51:07 2016
@@ -23,7 +23,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Sightly REPL</title>
+ <title>HTL REPL</title>
<link rel="stylesheet" href="/etc/clientlibs/repl/bootstrap.min.css">
<link rel="stylesheet" href="/etc/clientlibs/repl/bootstrap-theme.min.css">
@@ -33,32 +33,32 @@
<body>
<div id="logo"> </div>
- <h1><small>Read-Eval-Print Loop</small></h1>
-
- <div id="main" class="row">
- <div id="input" class="col-xs-6">
- <div class="editorContainer">
- <p class="lead">template.html</p>
- <div id="template" class="editor" data-src="/apps/repl/components/repl/template.html" data-mode="ace/mode/html" data-writeable></div>
- </div>
-
- <div class="editorContainer">
- <p class="lead">logic.js</p>
- <div id="logic" class="editor" data-src="/apps/repl/components/repl/logic.js" data-mode="ace/mode/javascript" data-writeable></div>
+ <div class="container-fluid">
+ <div id="main" class="row">
+ <div id="input" class="col-xs-6">
+ <div class="editorContainer">
+ <p class="lead">template.html</p>
+ <div id="template" class="editor" data-src="/apps/repl/components/repl/template.html" data-mode="ace/mode/html" data-writeable></div>
+ </div>
+
+ <div class="editorContainer">
+ <p class="lead">logic.js</p>
+ <div id="logic" class="editor" data-src="/apps/repl/components/repl/logic.js" data-mode="ace/mode/javascript" data-writeable></div>
+ </div>
</div>
- </div>
- <div id="output" class="editorContainer col-xs-6">
- <div class="clearfix">
- <p class="lead pull-left">output.html</p>
- <ul class="nav nav-pills navbar-right">
- <li class="active"><a data-toggle="tab" href="#source">Source</a></li>
- <li><a data-toggle="tab" href="#view">View</a></li>
- <li><a data-toggle="tab" href="#java">Java</a></li>
- </ul>
+ <div id="output" class="editorContainer col-xs-6">
+ <div class="clearfix">
+ <p class="lead pull-left">output.html</p>
+ <ul class="nav nav-pills navbar-right">
+ <li class="active"><a data-toggle="tab" href="#source">Source</a></li>
+ <li><a data-toggle="tab" href="#view">View</a></li>
+ <li><a data-toggle="tab" href="#java">Java</a></li>
+ </ul>
+ </div>
+ <div id="source" class="output-view editor" data-src="/htl/repl.template.html" data-mode="ace/mode/html"></div>
+ <iframe id="view" class="output-view hidden" src="/htl/repl.template.html"></iframe>
+ <div id="java" class="output-view editor hidden" data-src="/htl/repl.java.html" data-mode="ace/mode/java"></div>
</div>
- <div id="source" class="output-view editor" data-src="/sightly/repl.template.html" data-mode="ace/mode/html"></div>
- <iframe id="view" class="output-view hidden" src="/sightly/repl.template.html"></iframe>
- <div id="java" class="output-view editor hidden" data-src="/sightly/repl.java.html" data-mode="ace/mode/java"></div>
</div>
</div>
Modified: sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/template.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/template.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/template.html (original)
+++ sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/apps/repl/components/repl/template.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<html>
<head>
- <title>Sightly REPL</title>
+ <title>${properties.jcr:title}</title>
<meta charset="utf-8">
</head>
<body data-sly-use.obj="logic.js">
Added: sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/images/htl.svg
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/images/htl.svg?rev=1758968&view=auto
==============================================================================
--- sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/images/htl.svg (added)
+++ sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/images/htl.svg Fri Sep 2 14:51:07 2016
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 540.18 243.08"><defs><style>.cls-1{fill:#f34d4d;}.cls-2{fill:#d74c4c;}.cls-3{fill:#e34c4c;}.cls-4{fill:#cd4b4b;}.cls-5{fill:#e2814e;}.cls-6{fill:#23df5f;}.cls-7{fill:#ea5924;}.cls-8{fill:#cd4820;}.cls-9{fill:#e3b051;}.cls-10{fill:#2ceb36;}.cls-11{fill:#2ad7de;}.cls-12{fill:#4daccd;}.cls-13{fill:#fec554;}.cls-14{fill:#ea9a2b;}.cls-15{fill:#32c723;}.cls-16{fill:#25babe;}.cls-17{fill:#fecb55;}.cls-18{fill:#53fdab;}.cls-19{fill:#51d8fd;}.cls-20{fill:#4eb5d7;}.cls-21{fill:#50ccf3;}.cls-22{fill:#444;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><polygon class="cls-1" points="157.88 0 210.51 30.39 157.88 60.77 157.88 0"/><polygon class="cls-2" points="210.51 91.15 157.88 60.77 210.51 30.39 210.51 91.15"/><polygon class="cls-3" points="157.88 60.77 105.26 30.39 157.88 0 157.88 60.77"/><polygon class="cls-4" points="157.88 60.77 210.51 91.15 157.88 121.54 157.88 60.77"/><pol
ygon class="cls-5" points="105.26 91.15 52.63 60.77 105.26 30.39 105.26 91.15"/><polygon class="cls-6" points="105.26 91.15 157.88 121.54 105.26 151.92 105.26 91.15"/><polygon class="cls-7" points="105.26 30.39 157.88 60.77 105.26 91.15 105.26 30.39"/><polygon class="cls-8" points="157.88 121.54 105.26 91.15 157.88 60.77 157.88 121.54"/><polygon class="cls-9" points="52.63 121.54 0 91.15 52.63 60.77 52.63 121.54"/><polygon class="cls-10" points="52.63 121.54 105.26 151.92 52.63 182.31 52.63 121.54"/><polygon class="cls-11" points="105.26 151.92 157.88 182.31 105.26 212.69 105.26 151.92"/><polygon class="cls-12" points="157.88 182.31 210.51 212.69 157.88 243.08 157.88 182.31"/><polygon class="cls-13" points="0 91.15 52.63 121.54 0 151.92 0 91.15"/><polygon class="cls-14" points="52.63 60.77 105.26 91.15 52.63 121.54 52.63 60.77"/><polygon class="cls-15" points="105.26 151.92 52.63 121.54 105.26 91.15 105.26 151.92"/><polygon class="cls-16" points="157.88 182.31 105.26 151.92 157.88 1
21.54 157.88 182.31"/><polygon class="cls-17" points="52.63 182.31 0 151.92 52.63 121.54 52.63 182.31"/><polygon class="cls-18" points="105.26 212.69 52.63 182.31 105.26 151.92 105.26 212.69"/><polygon class="cls-19" points="157.88 243.08 105.26 212.69 157.88 182.31 157.88 243.08"/><polygon class="cls-20" points="210.51 212.69 157.88 182.31 210.51 151.92 210.51 212.69"/><polygon class="cls-21" points="157.88 121.54 210.51 151.92 157.88 182.31 157.88 121.54"/><path class="cls-22" d="M265.05,30.52h2.73V47.66h19.58V30.52h2.73V69.61h-2.73V50H267.78V69.61h-2.73Z"/><path class="cls-22" d="M311.8,32.89H298.21V30.52h29.9v2.37H314.52V69.61H311.8Z"/><path class="cls-22" d="M373.55,30.52h2.61V67.24h20.46v2.37H373.55Z"/><path class="cls-22" d="M336.35,30.38h3.5l6.53,18.21,2.31,6.94h.24l2.25-6.94,6.47-18.21h3.5V69.48H358.6V42.13q0-2,.09-4.36t.21-4.42h-.18l-2.25,7L349.7,58.8h-1.9L341,40.35l-2.37-7h-.12q.12,2,.24,4.42t.12,4.36V69.48h-2.49Z"/><path class="cls-22" d="M276.2,104.07H262.62V101.7h29.9v
2.37H278.93V140.8H276.2Z"/><path class="cls-22" d="M302.9,101.7H326v2.37H305.63v14.77h17.2v2.37h-17.2v17.2h21v2.37H302.9Z"/><path class="cls-22" d="M336.35,101.7h3.5l6.53,18.21,2.31,6.94h.24l2.25-6.94,6.47-18.21h3.5V140.8H358.6V113.45q0-2,.09-4.36t.21-4.42h-.18l-2.25,7-6.76,18.45h-1.9L341,111.67l-2.37-7h-.12q.12,2,.24,4.42t.12,4.36V140.8h-2.49Z"/><path class="cls-22" d="M373.55,101.7h10.68a27.42,27.42,0,0,1,5.84.56,11.7,11.7,0,0,1,4.39,1.87,8.4,8.4,0,0,1,2.76,3.38,12.25,12.25,0,0,1,.95,5.1q0,5.76-3.68,8.57T384.23,124h-8V140.8h-2.73Zm10,20q6.05,0,8.93-2.14t2.88-6.94a10,10,0,0,0-.74-4.12,6.37,6.37,0,0,0-2.19-2.64,9.42,9.42,0,0,0-3.68-1.42,28.51,28.51,0,0,0-5.19-.42h-7.24v17.68Z"/><path class="cls-22" d="M411,101.7h2.61v36.72h20.46v2.37H411Z"/><path class="cls-22" d="M463.24,127.39H447.76l-4.63,13.41H440.4l13.76-39.09h2.73l13.76,39.09h-2.91Zm-.77-2.31L460,117.78q-1.19-3.5-2.25-6.71t-2.08-6.82h-.24q-1,3.62-2.08,6.82t-2.25,6.71l-2.49,7.29Z"/><path class="cls-22" d="M489.76,104.07H476.17V
101.7h29.9v2.37H492.49V140.8h-2.73Z"/><path class="cls-22" d="M516.45,101.7h23.13v2.37H519.18v14.77h17.2v2.37h-17.2v17.2h21v2.37H516.45Z"/><path class="cls-22" d="M268.67,172.89h2.61v36.72h20.46V212H268.67Z"/><path class="cls-22" d="M320.87,198.57H305.39L300.76,212H298l13.76-39.09h2.73L328.29,212h-2.91Zm-.77-2.31L317.61,189q-1.19-3.5-2.25-6.71t-2.08-6.82H313q-1,3.62-2.08,6.82T308.71,189l-2.49,7.29Z"/><path class="cls-22" d="M336.41,172.89h2.85l15.25,27.65,4.21,7.71h.12q-.12-2.85-.24-5.67t-.12-5.67v-24h2.61V212h-2.85L343,184.34l-4.21-7.71h-.12q.12,2.85.24,5.58t.12,5.58V212h-2.61Z"/><path class="cls-22" d="M370,192.34a26.93,26.93,0,0,1,1.22-8.36,18.77,18.77,0,0,1,3.44-6.38,14.9,14.9,0,0,1,5.31-4,16.51,16.51,0,0,1,6.88-1.39,13.8,13.8,0,0,1,3.53.42,13.07,13.07,0,0,1,2.85,1.1,12.84,12.84,0,0,1,2.25,1.51,20.5,20.5,0,0,1,1.75,1.66l-1.6,1.78a13.6,13.6,0,0,0-3.56-2.82,10.6,10.6,0,0,0-5.22-1.16,13.33,13.33,0,0,0-5.81,1.25,12.39,12.39,0,0,0-4.42,3.53,16.41,16.41,0,0,0-2.79,5.55,25.61,25.61,0,0
,0-1,7.35,27.35,27.35,0,0,0,.92,7.39,16.18,16.18,0,0,0,2.7,5.6,12.16,12.16,0,0,0,10,4.87,14.93,14.93,0,0,0,4.86-.77,8.89,8.89,0,0,0,3.62-2.19V195.07h-9v-2.31h11.69v15.48a13.34,13.34,0,0,1-4.66,3.2,16.68,16.68,0,0,1-6.67,1.25,15.35,15.35,0,0,1-6.67-1.42,14.57,14.57,0,0,1-5.13-4.06,19.22,19.22,0,0,1-3.32-6.41A28,28,0,0,1,370,192.34Z"/><path class="cls-22" d="M407.42,172.89h2.73V197a21.1,21.1,0,0,0,.8,6.32,11.09,11.09,0,0,0,2.13,4,7.6,7.6,0,0,0,3.12,2.17,10.72,10.72,0,0,0,3.74.65,11.15,11.15,0,0,0,3.83-.65,7.79,7.79,0,0,0,3.17-2.17,10.83,10.83,0,0,0,2.17-4,21.18,21.18,0,0,0,.8-6.32V172.89h2.55v24.44a22.68,22.68,0,0,1-1,7.42,12.54,12.54,0,0,1-2.76,4.72,9.82,9.82,0,0,1-4,2.49,15.47,15.47,0,0,1-9.46,0,9.79,9.79,0,0,1-4-2.49,12.54,12.54,0,0,1-2.76-4.72,22.68,22.68,0,0,1-1-7.42Z"/><path class="cls-22" d="M463.24,198.57H447.76L443.13,212H440.4l13.76-39.09h2.73L470.66,212h-2.91Zm-.77-2.31L460,189q-1.19-3.5-2.25-6.71t-2.08-6.82h-.24q-1,3.62-2.08,6.82T451.08,189l-2.49,7.29Z"/><path class="cls-2
2" d="M476.83,192.34A26.93,26.93,0,0,1,478,184a18.77,18.77,0,0,1,3.44-6.38,14.9,14.9,0,0,1,5.31-4,16.51,16.51,0,0,1,6.88-1.39,13.8,13.8,0,0,1,3.53.42,13.07,13.07,0,0,1,2.85,1.1,12.84,12.84,0,0,1,2.25,1.51,20.5,20.5,0,0,1,1.75,1.66l-1.6,1.78a13.6,13.6,0,0,0-3.56-2.82,10.6,10.6,0,0,0-5.22-1.16,13.33,13.33,0,0,0-5.81,1.25,12.39,12.39,0,0,0-4.42,3.53,16.41,16.41,0,0,0-2.79,5.55,25.61,25.61,0,0,0-1,7.35,27.35,27.35,0,0,0,.92,7.39,16.18,16.18,0,0,0,2.7,5.6,12.16,12.16,0,0,0,10,4.87,14.93,14.93,0,0,0,4.86-.77,8.89,8.89,0,0,0,3.62-2.19V195.07h-9v-2.31h11.69v15.48a13.34,13.34,0,0,1-4.66,3.2,16.68,16.68,0,0,1-6.67,1.25,15.35,15.35,0,0,1-6.67-1.42,14.57,14.57,0,0,1-5.13-4.06A19.22,19.22,0,0,1,478,200.8,28,28,0,0,1,476.83,192.34Z"/><path class="cls-22" d="M516.45,172.89h23.13v2.37H519.18V190h17.2v2.37h-17.2v17.2h21V212H516.45Z"/></g></g></svg>
\ No newline at end of file
Modified: sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css (original)
+++ sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css Fri Sep 2 14:51:07 2016
@@ -16,36 +16,46 @@
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
-body {
- margin: 0 10px;
-}
h1 {
- margin-top: 10px;
+ margin-top: 10px;
}
+
iframe {
- border: none;
- width: 100%;
+ border: none;
+ width: 100%;
}
+
#logo {
- min-height: 100px;
- background: url('./images/sightly.svg') no-repeat 50% 100%;
+ min-height: 100px;
+ background: url('./images/htl.svg') no-repeat 50% 100%;
+}
+
+#input {
+ height: calc(100vh - 100px);
}
+
#input .editor {
- height: 300px;
+ height: calc(50vh - 100px);
}
-#output .editor {
- height: 650px;
-}
-@media (max-width: 768px) {
- #output .lead {
- display: none;
- }
+
+#output .output-view {
+ height: calc(100vh - 150px);
}
+
#output .nav {
- margin-top: -3px;
+ margin-top: -3px;
+}
+
+#template .ace-scrollbar {
+ overflow-y: auto;
}
+
@media (max-width: 768px) {
- #output .nav {
- margin: -8px 0 10px;
- }
+ #output .lead {
+ display: none;
+ }
+
+ #output .nav {
+ margin: -8px 0 10px;
+ }
}
Added: sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/htl/repl.json
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/htl/repl.json?rev=1758968&view=auto
==============================================================================
--- sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/htl/repl.json (added)
+++ sling/trunk/bundles/scripting/sightly/repl/src/main/resources/SLING-INF/htl/repl.json Fri Sep 2 14:51:07 2016
@@ -0,0 +1,5 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+ "sling:resourceType":"repl/components/repl",
+ "jcr:title": "HTL REPL"
+}
Modified: sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/pom.xml?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/pom.xml Fri Sep 2 14:51:07 2016
@@ -36,12 +36,12 @@
<version>1.0.7-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling Scripting Sightly Integration Tests Content</name>
+ <name>Apache Sling Scripting HTL Integration Tests Content</name>
<description>
This bundle contains:
- - Content adapted from the Adobe Sightly TCK meant to test the org.apache.sling.scripting.sightly implementations.
- - Content meant to test performance of the org.apache.sling.scripting.sightly implementation.
+ - Content adapted from the Adobe HTL TCK meant to test the org.apache.sling.scripting.HTL implementations.
+ - Content meant to test performance of the org.apache.sling.scripting.HTL implementation.
</description>
<scm>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/resource/resource.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Sightly data-sly-resource - Sling implementation</title>
+ <title>HTL data-sly-resource - Sling implementation</title>
</head>
<body>
<div id="selectors" data-sly-resource="${'/sightly/includedresource' @ selectors=['a', 'b']}"></div>
@@ -30,4 +30,4 @@
<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>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
<!doctype html>
<html>
<head>
- <title>Sightly JS Use-API dependency resolution</title>
+ <title>HTL JS Use-API dependency resolution</title>
</head>
<body>
<div id="js-rep-res" data-sly-use.js="/apps/sightly/scripts/siblingdeps/script.js">${js.result}</div>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/javaerror.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/javaerror.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/javaerror.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/javaerror.html Fri Sep 2 14:51:07 2016
@@ -19,11 +19,11 @@
<!doctype html>
<html>
<head>
- <title>Sightly Use-API - Sling implementation :: Java Use object errors</title>
+ <title>HTL Use-API - Sling implementation :: Java Use object errors</title>
</head>
<body>
<div data-sly-use.pojo="apps.sightly.scripts.use.ErrorPojo">
${pojo.sayHello}
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/jsuse.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/jsuse.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/jsuse.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/jsuse.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Sightly JavaScript Use-API - Sling implementation</title>
+ <title>HTL JavaScript Use-API - Sling implementation</title>
</head>
<body>
<section data-sly-use.jsuse="jsuse.js">
@@ -29,4 +29,4 @@
<div id="resource-getResourceType">${jsuse.resourceGetResourceType}</div>
</section>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/repopojo.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/repopojo.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/repopojo.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/repopojo.html Fri Sep 2 14:51:07 2016
@@ -18,7 +18,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>Sightly Repository POJO Test</title>
+ <title>HTL Repository POJO Test</title>
</head>
<body>
<div id="repopojo" data-sly-use.repopojo="apps.sightly.scripts.use.RepoPojo">${repopojo.message}</div>
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/use.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/use.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/use.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/use.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Sightly Use-API - Sling implementation</title>
+ <title>HTL Use-API - Sling implementation</title>
</head>
<body data-sly-use.reqmodel="${'org.apache.sling.scripting.sightly.testing.models.RequestModel' @ argument='SUCCESS'}"
data-sly-use.resmodel="org.apache.sling.scripting.sightly.testing.models.ResourceModel"
Modified: sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html Fri Sep 2 14:51:07 2016
@@ -19,7 +19,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Sightly Use-API - Inheritance</title>
+ <title>HTL Use-API - Inheritance</title>
</head>
<body>
<div id="javaobj" data-sly-use.javaobj="S">${javaobj.message}</div>
Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1758968&r1=1758967&r2=1758968&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Fri Sep 2 14:51:07 2016
@@ -31,9 +31,9 @@
<packaging>slingstart</packaging>
<version>1.0.5-SNAPSHOT</version>
- <name>Apache Sling Scripting Sightly Integration Tests</name>
- <description>This project runs the integration tests for validating the Apache Sling Scripting Sightly implementation
- against the Adobe Sightly TCK.
+ <name>Apache Sling Scripting HTL Integration Tests</name>
+ <description>This project runs the integration tests for validating the Apache Sling Scripting HTL implementation
+ against the Adobe HTL TCK.
</description>
<scm>