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-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new f74e9d9 made scripts output more consistent
f74e9d9 is described below
commit f74e9d9fbb59f03919af67c31e7db25b855654f9
Author: Radu Cotescu <[email protected]>
AuthorDate: Wed Aug 22 16:49:34 2018 +0200
made scripts output more consistent
---
.../src/main/resources/SLING-INF/apps/assr/scripts/hello/h.html | 2 +-
.../src/main/resources/SLING-INF/apps/assr/scripts/hello/hello.html | 2 +-
.../src/main/resources/SLING-INF/apps/assr/scripts/hello/w.html | 2 +-
.../1.0.0/h.html | 4 ++--
scripting-resolver/scripting-benchmark.sh | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/h.html
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/h.html
index 2828056..cf193e9 100644
---
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/h.html
+++
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/h.html
@@ -16,4 +16,4 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<span data-sly-text="${'Hello'}"></span>
+<span data-sly-text="${'Hello2'}"></span>
diff --git
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/hello.html
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/hello.html
index 48bd769..7840f51 100644
---
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/hello.html
+++
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/hello.html
@@ -16,5 +16,5 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<h2>We're testing some serious scripting here</h2>
+<h2>We're testing some serious scripting here in Version 2</h2>
<span data-sly-resource="${ @ selectors='h'}"></span> <span
data-sly-resource="${ @ selectors='w'}"></span>
diff --git
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/w.html
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/w.html
index 1019aca..3c6b564 100644
---
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/w.html
+++
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-classic/src/main/resources/SLING-INF/apps/assr/scripts/hello/w.html
@@ -16,4 +16,4 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<span data-sly-text="${'World'}"></span>
+<span data-sly-text="${'World2'}"></span>
diff --git
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
index 45e1f49..2828056 100644
---
a/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
+++
b/scripting-resolver/examples/org-apache-sling-scripting-examplebundle-precompiled/src/main/scripts/javax.script/org.apache.sling.scripting.examplebundle.precompiled.hello/1.0.0/h.html
@@ -1,4 +1,4 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ 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
@@ -15,5 +15,5 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<span data-sly-text="${'Hello'}"></span>
diff --git a/scripting-resolver/scripting-benchmark.sh
b/scripting-resolver/scripting-benchmark.sh
index fdb7e71..3b7a3e7 100755
--- a/scripting-resolver/scripting-benchmark.sh
+++ b/scripting-resolver/scripting-benchmark.sh
@@ -17,9 +17,9 @@
# under the License.
URLS=$(cat <<EOF
http://localhost:8080/content/srr/examples/hello.html
-http://localhost:8080/content/srr/examples/hello-v1.html
+http://localhost:8080/content/srr/examples/hello-v2.html
http://localhost:8080/content/srr/examples/precompiled-hello.html
-http://localhost:8080/content/srr/examples/precompiled-hello-v1.html
+http://localhost:8080/content/srr/examples/precompiled-hello-v2.html
http://localhost:8080/content/srr/examples/classic-hello.html
EOF
)
