You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2016/04/19 17:18:36 UTC

svn commit: r986089 - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/bundles/scripting/

Author: buildbot
Date: Tue Apr 19 15:18:36 2016
New Revision: 986089

Log:
Staging update by buildbot for sling

Added:
    websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-jsp.html
Removed:
    websites/staging/sling/trunk/content/documentation/bundles/sling-scripting-jsp-taglib.html
Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles.html
    websites/staging/sling/trunk/content/documentation/bundles/scripting.html
    websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-sightly.html
    websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html
    websites/staging/sling/trunk/content/sitemap.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 19 15:18:36 2016
@@ -1 +1 @@
-1739935
+1739945

Modified: websites/staging/sling/trunk/content/documentation/bundles.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles.html Tue Apr 19 15:18:36 2016
@@ -149,7 +149,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/bundles/apache-sling-commons-thread-pool.html">Commons Thread Pools</a></li>
 <li><a href="/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities</a></li>
 <li><a href="/documentation/bundles/mime-type-support-commons-mime.html">MIME Type Support (commons.mime and commons.contentdetection)</a></li>
-<li><a href="/documentation/bundles/sling-scripting-jsp-taglib.html">Scripting JSP Taglib</a></li>
+<li><a href="">Scripting JSP Taglib</a></li>
 <li><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a></li>
 <li><a href="/documentation/bundles/caching-services.html">Caching Services</a></li>
 <li><a href="/documentation/bundles/models.html">Model Objects</a></li>

Modified: websites/staging/sling/trunk/content/documentation/bundles/scripting.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scripting.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/scripting.html Tue Apr 19 15:18:36 2016
@@ -126,18 +126,19 @@ h2:hover > .headerlink, h3:hover > .head
 <li>Groovy *</li>
 <li>Java *</li>
 <li>Javascript</li>
-<li>JSP</li>
+<li><a href="/documentation/bundles/scripting/scripting-jsp.html">JSP</a></li>
 <li>JST *</li>
 <li>Python *</li>
 <li>Ruby *</li>
 <li>Scala *</li>
+<li><a href="/documentation/bundles/scripting/scripting-sightly.html">Sightly</a></li>
 <li><a href="/documentation/bundles/scripting/scripting-thymeleaf.html">Thymeleaf</a> *</li>
 <li>Velocity *</li>
 <li>XProc *</li>
 </ul>
 <p>* in contrib</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1737673 by olli on Mon, 4 Apr 2016 12:15:23 +0000
+        Rev. 1739945 by radu on Tue, 19 Apr 2016 15:18:10 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Added: websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-jsp.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-jsp.html (added)
+++ websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-jsp.html Tue Apr 19 15:18:36 2016
@@ -0,0 +1,510 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    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 regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <title>Apache Sling - JSP Scripting Engine</title>
+    <link rel="icon" href="/res/favicon.ico">
+    <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="//sling.apache.org/">
+          <img border="0" alt="Apache Sling" src="/res/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="//www.apache.org/">
+          <img border="0" alt="Apache" src="/res/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><strong><a href="/documentation.html">Documentation</a></strong> <br />
+<a href="/documentation/getting-started.html">Getting Started</a> <br />
+<a href="/documentation/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/documentation/development.html">Development</a> <br />
+<a href="/documentation/bundles.html">Bundles</a> <br />
+<a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/documentation/configuration.html">Configuration</a>   </p>
+<p><a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a>   </p>
+<p><strong>API Docs</strong>  <br />
+<a href="/apidocs/sling8/index.html">Sling 8</a> <br />
+<a href="/apidocs/sling7/index.html">Sling 7</a> <br />
+<a href="/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
+<a href="/javadoc-io.html">Archive at javadoc.io</a>   </p>
+<p><strong>Project info</strong> <br />
+<a href="/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://ci.apache.org/builders/sling-trunk">Build Server</a> <br />
+<a href="/project-information/security.html">Security</a>   </p>
+<p><strong>Source</strong> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a> <br />
+<a href="git://git.apache.org/sling.git">Git</a> <br />
+<a href="https://github.com/apache/sling">Github Mirror</a>   </p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
+<p><strong><a href="/sitemap.html">Site Map</a></strong></p>
+<!-- no valid ads for now, we'll  reactivate this when needed
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+-->
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/bundles.html">Bundles</a>&nbsp;&raquo&nbsp;<a href="/documentation/bundles/scripting.html">Sling Scripting</a>
+      </div>
+
+      
+      
+      <h1>JSP Scripting Engine</h1>
+      <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p>The Apache Sling JSP Scripting Engine is implemented by the <a href="https://github.com/apache/sling/tree/trunk/bundles/scripting/jsp"><code>org.apache.sling.scripting.jsp</code></a>
+ bundle, based on the Jasper 2 JSP engine.</p>
+<p>On top of that Apache Sling also provides its own JSP Taglib, implemented by the
+ <a href="https://github.com/apache/sling/tree/trunk/bundles/scripting/jsp-taglib"><code>org.apache.sling.scripting.jsp.taglib</code></a> bundle.</p>
+<p>The Sling Scripting JSP Taglib supports the use of Sling as an application in JSP pages.  The Sling Taglib provides the
+ ability to invoke JSP scripts, include Resources and interact with the Sling Repository, all with JSP tags and
+ <a href="http://docs.oracle.com/javaee/6/tutorial/doc/gjddd.html">Expression Language (EL)</a> functions.</p>
+<h2 id="use">Use<a class="headerlink" href="#use" title="Permanent link">&para;</a></h2>
+<p>Using the Sling Taglib in a JSP page is as simple as including the Taglib include in your JSP, with the correct URI for the
+version of the Sling Taglib installed.</p>
+<div class="codehilite"><pre><span class="cp">&lt;%</span><span class="vi">@taglib</span> <span class="n">prefix</span><span class="o">=</span><span class="s2">&quot;sling&quot;</span> <span class="n">uri</span><span class="o">=</span><span class="s2">&quot;http://sling.apache.org/taglibs/sling&quot;</span> <span class="cp">%&gt;</span><span class="x"></span>
+</pre></div>
+
+
+<p>Generally, the prefix to use is <code>sling</code>.  Often applications include a global JSP file which includes the Sling Taglib
+and sets up all of the application variables and methods.</p>
+<p>The Sling Taglib does not attempt to reproduce the functionality of other Tag Libraries, such as
+<a href="http://www.oracle.com/technetwork/java/index-jsp-135995.html">JSTL</a>; additional Tag Libraries may be required to fully leverage
+the Sling Taglib.</p>
+<h2 id="taglib-versions">Taglib Versions<a class="headerlink" href="#taglib-versions" title="Permanent link">&para;</a></h2>
+<p>There have been a number of releases of the Sling Taglibs, including versions with different URIs.</p>
+<table class="table">
+<thead>
+<tr>
+<th>Taglib Version</th>
+<th>Bundle Version</th>
+<th>URI</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>1.0</td>
+<td>2.0.6</td>
+<td>http://sling.apache.org/taglibs/sling/1.0</td>
+</tr>
+<tr>
+<td>1.1</td>
+<td>2.1.0</td>
+<td>http://sling.apache.org/taglibs/sling/1.1</td>
+</tr>
+<tr>
+<td>1.2</td>
+<td>2.1.8</td>
+<td>http://sling.apache.org/taglibs/sling/1.2</td>
+</tr>
+<tr>
+<td>1.3</td>
+<td>2.2.0</td>
+<td>http://sling.apache.org/taglibs/sling</td>
+</tr>
+</tbody>
+</table>
+<p>All releases from 1.3 onward are expected to use the URI <code>http://sling.apache.org/taglibs/sling</code> to ensure ease of
+upgrading to newer versions of the Taglib.</p>
+<h2 id="expression-language-functions">Expression Language Functions<a class="headerlink" href="#expression-language-functions" title="Permanent link">&para;</a></h2>
+<p>The Sling Taglib includes a number of Expression Language Functions which can be used to access the repository.</p>
+<h3 id="adaptto">adaptTo<a class="headerlink" href="#adaptto" title="Permanent link">&para;</a></h3>
+<p>Adapts an Adaptable to another class.</p>
+<ul>
+<li>Returns: <code>java.lang.Object</code></li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.adapter.Adaptable</code> - The object to adapt</li>
+<li><code>java.lang.String</code> - The name of the class to which to adapt the adaptable</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:set</span> <span class="na">var=</span><span class="s">&quot;myProperties&quot;</span> <span class="na">value=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">adaptTo</span><span class="p">(</span><span class="n">resource</span><span class="p">,</span><span class="s">&#39;org.apache.sling.api.resource.ValueMap&#39;</span><span class="p">)</span><span class="cp">}</span><span class="s">&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="encode">encode<a class="headerlink" href="#encode" title="Permanent link">&para;</a></h3>
+<p>Writes properly Cross Site Scripting (XSS) encoded text to the response using the OWASP ESAPI.   Supports a number of encoding modes.</p>
+<ul>
+<li>Returns: <code>java.util.String</code> - An encoded text</li>
+<li>Accepts:<ul>
+<li><code>java.lang.String</code> - The text to encode</li>
+<li><code>java.lang.String</code> - The encoding mode, one of HTML, HTML_ATTR, XML, XML_ATTR, JS</li>
+</ul>
+</li>
+<li>Since: 1.4</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">encode</span><span class="p">(</span><span class="s">&#39;&lt;script&gt;alert(&quot;Bad Stuff!&quot;);&lt;/script&gt;&#39;</span><span class="p">,</span><span class="s">&#39;HTML&#39;</span><span class="p">)</span><span class="cp">}</span>
+</pre></div>
+
+
+<h3 id="findresources">findResources<a class="headerlink" href="#findresources" title="Permanent link">&para;</a></h3>
+<p>Searches for resources using the given query formulated in the given language.</p>
+<ul>
+<li>Returns: <code>java.util.Iterator</code> - An Iterator of Resource objects matching the query.</li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.resource.ResourceResolver</code> - The Resource Resolver to use for the query.</li>
+<li><code>java.lang.String</code> - The query string to use to find the resources.</li>
+<li><code>java.lang.String</code> - The language in which the query is formulated.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:forEach</span> <span class="na">var=</span><span class="s">&quot;found&quot;</span> <span class="na">items=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">findResources</span><span class="p">(</span><span class="n">resourceResolver</span><span class="p">,</span><span class="s">&#39;/jcr:root//*[jcr:contains(., &#39;</span><span class="n">Sling</span><span class="s">&#39;)] order by @jcr:score&#39;</span><span class="p">,</span><span class="s">&#39;xpath&#39;</span><span class="p">)</span><span class="s">&quot;&gt;</span>
+    <span class="o">&lt;</span><span class="n">li</span><span class="o">&gt;</span><span class="err">$</span><span class="p">{</span><span class="n">found</span><span class="o">.</span><span class="n">path</span><span class="cp">}</span><span class="s">&lt;/li&gt;</span>
+<span class="s">&lt;/c:forEach&gt;</span>
+</pre></div>
+
+
+<h3 id="getrelativeresource">getRelativeResource<a class="headerlink" href="#getrelativeresource" title="Permanent link">&para;</a></h3>
+<p>Gets the resource at the relative path to the provided resource.</p>
+<ul>
+<li>Returns: <code>org.apache.sling.api.resource.Resource</code> - The resource at the relative path.</li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.resource.Resource</code> - The resource relative to which to find the path.</li>
+<li><code>java.lang.String</code> - The relative path at which to find the resource.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:set</span> <span class="na">var=</span><span class="s">&quot;content&quot;</span> <span class="na">value=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">getRelativeResource</span><span class="p">(</span><span class="n">resource</span><span class="p">,</span><span class="s">&#39;jcr:content&#39;</span><span class="p">)</span><span class="cp">}</span><span class="s">&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="getresource">getResource<a class="headerlink" href="#getresource" title="Permanent link">&para;</a></h3>
+<p>Method allow for the retrieval of resources.</p>
+<ul>
+<li>Returns: <code>org.apache.sling.api.resource.Resource</code> - The resource at the path.</li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.resource.ResourceResolver</code> - The current resource resolver.</li>
+<li><code>java.lang.String</code> - The path at which to find the resource.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:set</span> <span class="na">var=</span><span class="s">&quot;content&quot;</span> <span class="na">value=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">getResource</span><span class="p">(</span><span class="n">resourceResolver</span><span class="p">,</span><span class="s">&#39;/content&#39;</span><span class="p">)</span><span class="cp">}</span><span class="s">&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="getvalue">getValue<a class="headerlink" href="#getvalue" title="Permanent link">&para;</a></h3>
+<p>Gets the value of the specified key from the ValueMap and either coerses
+the value into the specified type or uses the specified type as a default
+depending on the parameter passed in.</p>
+<p>If the third parameter is a class, the resulting value will be coersed into the class,
+otherwise, the third parameter is used as the default when retrieving the value from the
+<code>ValueMap</code>.</p>
+<ul>
+<li>Returns: <code>java.lang.Object</code> - The value.</li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.resource.ValueMap</code> - The ValueMap from which to retrieve the value.</li>
+<li><code>java.lang.String</code> - The key for the value to retrieve</li>
+<li><code>java.lang.Object</code> - Either the default value or the class to which to coerce the value.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:set</span> <span class="na">var=</span><span class="s">&quot;content&quot;</span> <span class="na">value=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">getValue</span><span class="p">(</span><span class="n">properties</span><span class="p">,</span><span class="s">&#39;jcr:title&#39;</span><span class="p">,</span><span class="n">resource</span><span class="o">.</span><span class="n">name</span><span class="p">)</span><span class="cp">}</span><span class="s">&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="listchildren">listChildren<a class="headerlink" href="#listchildren" title="Permanent link">&para;</a></h3>
+<p>Method for allowing the invocation of the Sling Resource listChildren method.</p>
+<ul>
+<li>Returns: <code>java.util.Iterator</code> - The children of the resource.</li>
+<li>Accepts:<ul>
+<li><code>org.apache.sling.api.resource.Resource</code> - The resource of which to list the children.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;c:forEach</span> <span class="na">var=</span><span class="s">&quot;child&quot;</span> <span class="na">items=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">sling</span><span class="p">:</span><span class="n">listChildren</span><span class="p">(</span><span class="n">resource</span><span class="p">)</span><span class="s">&quot;&gt;</span>
+    <span class="o">&lt;</span><span class="n">li</span><span class="o">&gt;</span><span class="err">$</span><span class="p">{</span><span class="n">child</span><span class="o">.</span><span class="n">path</span><span class="cp">}</span><span class="s">&lt;/li&gt;</span>
+<span class="s">&lt;/c:forEach&gt;</span>
+</pre></div>
+
+
+<h2 id="tags">Tags<a class="headerlink" href="#tags" title="Permanent link">&para;</a></h2>
+<p>The Sling Taglib includes a number of Tags which can be used to access the repository, handle the inclusion of scripts and manage requests.</p>
+<h3 id="adaptto_1">adaptTo<a class="headerlink" href="#adaptto_1" title="Permanent link">&para;</a></h3>
+<p>Adapts adaptables to objects of other types.</p>
+<ul>
+<li>Attributes<ul>
+<li>adaptable - The adaptable object to adapt.</li>
+<li>adaptTo - The class name to which to adapt the adaptable.</li>
+<li>var - The name of the variable to which to save the adapted object.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;sling:adaptTo</span> <span class="na">adaptable=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">resource</span><span class="cp">}</span><span class="s">&quot;</span> <span class="na">adaptTo=</span><span class="s">&quot;org.apache.sling.api.resource.ValueMap&quot;</span> <span class="na">var=</span><span class="s">&quot;myProps&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="call">call<a class="headerlink" href="#call" title="Permanent link">&para;</a></h3>
+<p>Execute a script.</p>
+<ul>
+<li>Attributes<ul>
+<li>flush - Whether to flush the output before including the target.</li>
+<li>script - The script to include.</li>
+<li>ignoreComponentHierarchy - Controls if the component hierarchy should be ignored for script resolution. If true, only the search paths are respected.</li>
+</ul>
+</li>
+<li>Since: 1.2</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">call</span> <span class="n">script</span><span class="p">=</span>&quot;<span class="n">myscript</span><span class="p">.</span><span class="n">jsp</span>&quot; <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="defineobjects">defineObjects<a class="headerlink" href="#defineobjects" title="Permanent link">&para;</a></h3>
+<p>Defines regularly used scripting variables. By default the following scripting variables are defined through this tag:</p>
+<ul>
+<li><strong>slingRequest</strong>, SlingHttpServletRequest object, providing access to the HTTP request header information - extends the standard HttpServletRequest - and provides access to Sling-specific things like resource, path info, selector, etc.</li>
+<li><strong>slingResponse</strong>, SlingHttpServletResponse object, providing access for the HTTP response that is created by the server. This is currently the same as the HttpServletResponse from which it extends.</li>
+<li><strong>resourceResolver</strong>, Current ResourceResolver. Same as slingRequest.getResourceResolver().</li>
+<li><strong>sling</strong>, SlingScriptHelper, containing convenience methods for scripts, mainly sling.include('/some/other/resource') for including the responses of other resources inside this response (eg. embedding header html snippets) and sling.getService(foo.bar.Service.class) to retrieve OSGi services available in Sling (Class notation depending on scripting language).</li>
+<li><strong>resource</strong>, current Resource to handle, depending on the URL of the request. Same as slingRequest.getResource().</li>
+<li><strong>log</strong>, provides an SLF4J Logger for logging to the Sling log system from within scripts, eg. log.info("Executing my script").</li>
+<li><strong>currentNode</strong>, the underlying JCR node (if there is one) of the current resource.</li>
+<li><strong>bindings</strong>, provides access to the SlingBindings object for access to non-standard scripting variables.</li>
+</ul>
+<p>See also <a href="https://cwiki.apache.org/confluence/display/SLING/Scripting+variables#Scriptingvariables-JSP">Scripting variables in CMS</a></p>
+<ul>
+<li>Attributes which allow to bind the according variables to other names than the default ones listed above.<ul>
+<li>requestName</li>
+<li>responseName</li>
+<li>resourceName</li>
+<li>nodeName</li>
+<li>logName</li>
+<li>resourceResolverName</li>
+<li>slingName</li>
+</ul>
+</li>
+<li>Since: 1.0</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">defineObjects</span> <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="encode_1">encode<a class="headerlink" href="#encode_1" title="Permanent link">&para;</a></h3>
+<p>Writes properly Cross Site Scripting (XSS) encoded text to the response using the OWASP ESAPI.   Supports a number of encoding modes.</p>
+<ul>
+<li>Attributes:<ul>
+<li>value - The text to encode</li>
+<li>default - a default text to use if the value is null or empty</li>
+<li>mode - The encoding mode, one of HTML, HTML_ATTR, XML, XML_ATTR, JS</li>
+</ul>
+</li>
+<li>Since: 1.4</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;sling:encode</span> <span class="na">value=</span><span class="s">&quot;&lt;script&gt;alert(&#39;Bad Stuff!&#39;);&lt;/script&gt;&quot;</span> <span class="na">mode=</span><span class="s">&quot;HTML&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="eval">eval<a class="headerlink" href="#eval" title="Permanent link">&para;</a></h3>
+<p>Evaluates a script invocation and includes the result in the current page.</p>
+<ul>
+<li>Attributes<ul>
+<li>flush - Whether to flush the output before including the target.</li>
+<li>script - The path to the script object to include in the current request processing. By default, the current resource is used for script resolving. This behaviour can be changed by specifying either resource, resourceType or ignoreResourceTypeHierarchy.</li>
+<li>resource - The resource object to include in the current request processing. This attribute is optional. If it is specified, resourceType should not be used. If both are used, resource takes precedence.</li>
+<li>resourceType - The resource type of a resource to include. This attribute is optional. If it is specified, resource should not be used. If both are used, resource takes precedence.</li>
+<li>ignoreResourceTypeHierarchy - Prevents using the resource type hierarchy for searching a script.</li>
+</ul>
+</li>
+<li>Since: 1.1</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">eval</span> <span class="n">script</span><span class="p">=</span>&quot;<span class="n">myscript</span><span class="p">.</span><span class="n">jsp</span>&quot; <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="findresources_1">findResources<a class="headerlink" href="#findresources_1" title="Permanent link">&para;</a></h3>
+<p>Tag for searching for resources using the given query formulated in the given language.</p>
+<ul>
+<li>Attributes<ul>
+<li>query - The query string to find the resources.</li>
+<li>language - The query language to use.</li>
+<li>var - The name of the variable to which to save the resources.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">findResources</span> <span class="n">query</span><span class="p">=</span>&quot;<span class="o">/</span><span class="n">jcr</span><span class="p">:</span><span class="n">root</span><span class="o">//*</span><span class="p">[</span><span class="n">jcr</span><span class="p">:</span><span class="n">contains</span><span class="p">(.,</span> <span class="s">&#39;Sling&#39;</span><span class="p">)]</span> <span class="n">order</span> <span class="n">by</span> <span class="p">@</span><span class="n">jcr</span><span class="p">:</span><span class="n">score</span>&quot; <span class="n">language</span><span class="p">=</span>&quot;<span class="n">xpath</span>&quot; <span class="n">var</span><span class="p">=</span>&quot;<span class="n">resources</span>&quot; <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="forward">forward<a class="headerlink" href="#forward" title="Permanent link">&para;</a></h3>
+<p>Forwards a request to a resource rendering the current page</p>
+<ul>
+<li>Attributes<ul>
+<li>resource - The resource object to forward the request to. Either resource or path must be specified. If both are specified, the resource takes precedences.</li>
+<li>path - The path to the resource object to forward the request to. If this path is relative it is appended to the path of the current resource whose script is forwarding the given resource. Either resource or path must be specified. If both are specified, the resource takes precedences.</li>
+<li>resourceType - The resource type of a resource to forward. If the resource to be forwarded is specified with the path attribute, which cannot be resolved to a resource, the tag may create a synthetic resource object out of the path and this resource type. If the resource type is set the path must be the exact path to a resource object. That is, adding parameters, selectors and extensions to the path is not supported if the resource type is set.</li>
+<li>replaceSelectors - When dispatching, replace selectors by the value provided by this option.</li>
+<li>addSelectors - When dispatching, add the value provided by this option to the selectors.</li>
+<li>replaceSuffix - When dispatching, replace the suffix by the value provided by this option.</li>
+</ul>
+</li>
+<li>Since: 1.0</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">forward</span> <span class="n">path</span><span class="p">=</span>&quot;<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">aresource</span>&quot; <span class="n">resourceType</span><span class="p">=</span>&quot;<span class="n">myapp</span><span class="o">/</span><span class="n">components</span><span class="o">/</span><span class="n">display</span>&quot; <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="getproperty">getProperty<a class="headerlink" href="#getproperty" title="Permanent link">&para;</a></h3>
+<p>Retrieves the value from the ValueMap, allowing for a default value or coercing the return value.</p>
+<ul>
+<li>Attributes<ul>
+<li>properties - The ValueMap from which to retrieve the value.</li>
+<li>key - The key to retrieve the value from from the ValueMap.</li>
+<li>defaultValue - The default value to return if no value exists for the key. If specified, this takes precedence over returnClass.</li>
+<li>returnClass - The class into which to coerce the returned value.</li>
+<li>var - The name of the variable to which to save the value.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;sling:getProperties</span> <span class="na">properties=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">properties</span><span class="cp">}</span><span class="s">&quot;</span> <span class="na">key=</span><span class="s">&quot;jcr:title&quot;</span> <span class="na">defaultValue=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">resource</span><span class="o">.</span><span class="n">name</span><span class="cp">}</span><span class="s">&quot;</span> <span class="na">var=</span><span class="s">&quot;title&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="getresource_1">getResource<a class="headerlink" href="#getresource_1" title="Permanent link">&para;</a></h3>
+<p>Retrieves resources based on either an absolute path or a relative path and a base resource.</p>
+<ul>
+<li>Attributes<ul>
+<li>base - The base resource under which to retrieve the child resource, will only be considered if a relative path is specified.</li>
+<li>path - The path of the resource to retrieve, if relative, the base resource must be specified.</li>
+<li>defaultValue - The default value to return if no value exists for the key. If specified, this takes precedence over returnClass.</li>
+<li>returnClass - The class into which to coerce the returned value.</li>
+<li>var - The name of the variable to which to save the resource.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;sling:getResource</span> <span class="na">base=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">resource</span><span class="cp">}</span><span class="s">&quot;</span> <span class="na">path=</span><span class="s">&quot;jcr:content&quot;</span> <span class="na">var=</span><span class="s">&quot;content&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+
+
+<h3 id="include">include<a class="headerlink" href="#include" title="Permanent link">&para;</a></h3>
+<p>Includes a resource rendering into the current page.</p>
+<ul>
+<li>Attributes<ul>
+<li>flush - Whether to flush the output before including the target.</li>
+<li>resource - The resource object to include in the current request processing. Either resource or path must be specified. If both are specified, the resource takes precedences.</li>
+<li>path - The path to the resource object to include in the current request processing. If this path is relative it is appended to the path of the current resource whose script is including the given resource. Either resource or path must be specified. If both are specified, the resource takes precedences.</li>
+<li>resourceType - The resource type of a resource to include. If the resource to be included is specified with the path attribute, which cannot be resolved to a resource, the tag may create a synthetic resource object out of the path and this resource type. If the resource type is set the path must be the exact path to a resource object. That is, adding parameters, selectors and extensions to the path is not supported if the resource type is set.</li>
+<li>replaceSelectors - When dispatching, replace selectors by the value provided by this option.</li>
+<li>addSelectors - When dispatching, add the value provided by this option to the selectors.</li>
+<li>replaceSuffix - When dispatching, replace the suffix by the value provided by this option.</li>
+<li>scope - If var is specified, what scope to store the variable in. (Since 1.3)</li>
+<li>var - ariable name to store the resulting markup into (Since 1.3)</li>
+</ul>
+</li>
+<li>Since: 1.0</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">sling</span><span class="p">:</span><span class="n">include</span> <span class="n">path</span><span class="p">=</span>&quot;<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">aresource</span>&quot; <span class="n">resourceType</span><span class="p">=</span>&quot;<span class="n">myapp</span><span class="o">/</span><span class="n">components</span><span class="o">/</span><span class="n">display</span>&quot; <span class="o">/&gt;</span>
+</pre></div>
+
+
+<h3 id="listchildren_1">listChildren<a class="headerlink" href="#listchildren_1" title="Permanent link">&para;</a></h3>
+<p>Lists the children of a Sling Resource.</p>
+<ul>
+<li>Attributes<ul>
+<li>resource - The resource for which to retrieve the children.</li>
+<li>var - The name of the variable to which to save the child resources.</li>
+</ul>
+</li>
+<li>Since: 1.3</li>
+</ul>
+<p><em>Example Usage</em></p>
+<div class="codehilite"><pre><span class="nt">&lt;sling:listChildren</span> <span class="na">resource=</span><span class="s">&quot;</span><span class="cp">${</span><span class="n">resource</span><span class="cp">}</span><span class="s">&quot;</span> <span class="na">var=</span><span class="s">&quot;children&quot;</span> <span class="nt">/&gt;</span>
+</pre></div>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1739945 by radu on Tue, 19 Apr 2016 15:18:10 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Modified: websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-sightly.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-sightly.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-sightly.html Tue Apr 19 15:18:36 2016
@@ -19,7 +19,7 @@
 -->
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <title>Apache Sling - Sightly Scripting Engine</title>
+    <title>Apache Sling - </title>
     <link rel="icon" href="/res/favicon.ico">
     <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
     <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
@@ -102,7 +102,7 @@ h2:hover > .headerlink, h3:hover > .head
 
       
       
-      <h1>Sightly Scripting Engine</h1>
+      <h1></h1>
       <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -638,7 +638,7 @@ Assuming the following content structure
     </tr>
 </table>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1739935 by radu on Tue, 19 Apr 2016 14:25:27 +0000
+        Rev. 1739945 by radu on Tue, 19 Apr 2016 15:18:10 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html Tue Apr 19 15:18:36 2016
@@ -165,7 +165,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>At least one template mode handler (e.g. <em>HTML5 Template Mode Handler</em>) needs to be configured with a pattern to process templates by Sling Scripting Thymeleaf:</p>
 <p><img alt="Sling Scripting Thymeleaf HTML5 Template Mode Handler" src="scripting-thymeleaf-html5-template-mode-handler.png" /></p>
 <h1 id="sling-dialect">Sling Dialect<a class="headerlink" href="#sling-dialect" title="Permanent link">&para;</a></h1>
-<p>Sling Scripting Thymeleaf comes with its own dialect using the <code>sling</code> prefix/namespace currently supporting the <em>include</em> feature known from <a href="/documentation/bundles/sling-scripting-jsp-taglib.html">Sling Scripting JSP Taglib</a>.</p>
+<p>Sling Scripting Thymeleaf comes with its own dialect using the <code>sling</code> prefix/namespace currently supporting the <em>include</em> feature known from <a href="/documentation/bundles/scripting/scripting-jsp.html">Sling Scripting JSP Taglib</a>.</p>
 <h2 id="include">include<a class="headerlink" href="#include" title="Permanent link">&para;</a></h2>
 <p><code>&lt;header data-sling-include="${resource}" resourceType="'example/page/header'" unwrap="true"/&gt;</code></p>
 <p><code>include</code> - The resource object (<a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/resource/Resource.html"><code>Resource</code></a>) or the path (<code>String</code>) to the resource object to include in the current request processing. If this path is relative it is appended to the path of the current resource whose script is including the given resource.</p>
@@ -181,7 +181,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/samples/fling/">Sling Fling Sample</a> is a sample using Sling Scripting Thymeleaf with <a href="/documentation/bundles/models.html">Sling Models</a> and <a href="/documentation/bundles/sling-query.html">Sling Query</a>.</p>
 <p><img alt="Sling Fling Sample" src="sling-fling-sample.png" /></p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1677606 by olli on Mon, 4 May 2015 14:31:22 +0000
+        Rev. 1739945 by radu on Tue, 19 Apr 2016 15:18:10 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/sitemap.html
==============================================================================
--- websites/staging/sling/trunk/content/sitemap.html (original)
+++ websites/staging/sling/trunk/content/sitemap.html Tue Apr 19 15:18:36 2016
@@ -150,6 +150,8 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/bundles/resource-merger.html">Resource Merger (org.apache.sling.resourcemerger)</a></li>
 <li><a href="/documentation/bundles/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
 <li><a href="/documentation/bundles/scripting.html">Sling Scripting</a><ul>
+<li><a href="/documentation/bundles/scripting/scripting-jsp.html">JSP Scripting Engine</a></li>
+<li><a href="/documentation/bundles/scripting/scripting-sightly.html">scripting-sightly.mdtext</a></li>
 <li><a href="/documentation/bundles/scripting/scripting-thymeleaf.html">Sling Scripting Thymeleaf</a></li>
 </ul>
 </li>
@@ -157,7 +159,6 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="/documentation/bundles/sling-health-check-tool.html">Sling Health Check Tools</a></li>
 <li><a href="/documentation/bundles/sling-pipes.html">Sling Pipes</a></li>
 <li><a href="/documentation/bundles/sling-query.html">Sling Query</a></li>
-<li><a href="/documentation/bundles/sling-scripting-jsp-taglib.html">Sling Scripting JSP Taglib</a></li>
 <li><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a></li>
 <li><a href="/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
 <li><a href="/documentation/bundles/validation.html">Sling Validation</a></li>