svn commit: r977291 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/sling-scripting-jsp-taglib.html

[bu...@apache.org]

Author: buildbot
Date: Fri Jan  8 09:27:52 2016
New Revision: 977291

Log:
Staging update by buildbot for sling

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

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan  8 09:27:52 2016
@@ -1 +1 @@
-1723661
+1723666

Modified: websites/staging/sling/trunk/content/documentation/bundles/sling-scripting-jsp-taglib.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/sling-scripting-jsp-taglib.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/sling-scripting-jsp-taglib.html Fri Jan  8 09:27:52 2016
@@ -323,9 +323,22 @@ otherwise, the third parameter is used a
 
 
 <h3 id="defineobjects">defineObjects<a class="headerlink" href="#defineobjects" title="Permanent link">&para;</a></h3>
-<p>Defines regularly used scripting variables</p>
+<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>
+<p><strong>bindings</strong>, provides access to the SlingBindings object for access to non-standard scripting variables.
+See also <a href="https://cwiki.apache.org/confluence/display/SLING/Scripting+variables#Scriptingvariables-JSP">Scripting variables in CMS</a></p>
+</li>
+<li>
+<p>Attributes which allow to bind the according variables to other names than the default ones listed above.</p>
 <ul>
-<li>Attributes<ul>
 <li>requestName</li>
 <li>responseName</li>
 <li>resourceName</li>
@@ -483,7 +496,7 @@ otherwise, the third parameter is used a
 <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. 1628116 by dklco on Mon, 29 Sep 2014 04:51:37 +0000
+        Rev. 1723666 by kwin on Fri, 8 Jan 2016 09:27:38 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project