Author: buildbot Date: Mon May 4 14:31:36 2015 New Revision: 950061 Log: Staging update by buildbot for sling
Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/bundles/scripting/scripting-thymeleaf.html websites/staging/sling/trunk/content/downloads.html websites/staging/sling/trunk/content/news.html Propchange: websites/staging/sling/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon May 4 14:31:36 2015 @@ -1 +1 @@ -1676994 +1677606 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 Mon May 4 14:31:36 2015 @@ -138,29 +138,26 @@ <p><img alt="Sling Scripting Thymeleaf Script Engine Factory" src="scripting-thymeleaf-script-engine-factory.png" /></p> <p>The <em>Non-Caching Template Resolver</em> (the only available template resolver for now) is configured to read templates with encoding <code>UTF-8</code>.</p> <p><img alt="Sling Scripting Thymeleaf Non-Caching Template Resolver" src="scripting-thymeleaf-non-caching-template-resolver.png" /></p> -<p>The <em>HTML5 Template Mode Handler</em> is configured to handle all paths which match the pattern <code>*.html</code>.</p> +<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</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> <h2 id="include">include</h2> -<p>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> +<p><code><header data-sling-include="${resource}" resourceType="'example/page/header'" unwrap="true"/></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> <h3 id="supported-options-requestdispatcher-option">supported options (* = <a href="http://sling.apache.org/apidocs/sling7/org/apache/sling/api/request/RequestDispatcherOptions.html">RequestDispatcher option</a>)</h3> <ul> <li><code>addSelectors</code> (<code>String</code>) *: When dispatching, add the value provided by this option to the selectors.</li> <li><code>replaceSelectors</code> (<code>String</code>) *: When dispatching, replace selectors by the value provided by this option.</li> <li><code>replaceSuffix</code> (<code>String</code>) *: When dispatching, replace the suffix by the value provided by this option.</li> <li><code>resourceType</code> (<code>String</code>) *: 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> -<p><code>unwrap</code> (<code>Boolean</code>): removes the host element</p> -<header data-sling-include="${resource}" resourceType="'/apps/example/page/header'" unwrap="true"/> - -</li> +<li><code>unwrap</code> (<code>Boolean</code>): removes the host element</li> </ul> <h1 id="sample">Sample</h1> <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. 1674687 by olli on Sun, 19 Apr 2015 20:31:42 +0000 + Rev. 1677606 by olli on Mon, 4 May 2015 14:31:22 +0000 </div> <div class="trademarkFooter"> Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Modified: websites/staging/sling/trunk/content/downloads.html ============================================================================== --- websites/staging/sling/trunk/content/downloads.html (original) +++ websites/staging/sling/trunk/content/downloads.html Mon May 4 14:31:36 2015 @@ -567,9 +567,9 @@ incubator releases of Apache Sling, have </tr> <tr> <td>Installer Core</td> -<td>3.6.2</td> -<td><a href="[preferred]/sling/org.apache.sling.installer.core-3.6.2.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.2.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.2.jar.md5">md5</a>)</td> -<td><a href="[preferred]/sling/org.apache.sling.installer.core-3.6.2-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.2-source-release.zip.md5">md5</a>)</td> +<td>3.6.4</td> +<td><a href="[preferred]/sling/org.apache.sling.installer.core-3.6.4.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.4.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.4.jar.md5">md5</a>)</td> +<td><a href="[preferred]/sling/org.apache.sling.installer.core-3.6.4-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.4-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.installer.core-3.6.4-source-release.zip.md5">md5</a>)</td> </tr> <tr> <td>Installer File Provider</td> @@ -1142,7 +1142,7 @@ incubator releases of Apache Sling, have <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;"> - Rev. 1676989 by cziegeler on Thu, 30 Apr 2015 13:54:08 +0000 + Rev. 1677313 by cziegeler on Sat, 2 May 2015 12:55:22 +0000 </div> <div class="trademarkFooter"> Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project Modified: websites/staging/sling/trunk/content/news.html ============================================================================== --- websites/staging/sling/trunk/content/news.html (original) +++ websites/staging/sling/trunk/content/news.html Mon May 4 14:31:36 2015 @@ -91,6 +91,7 @@ <h1>News</h1> <ul> +<li>New Release: Apache Sling Installer Core 3.6.4 (May 2nd, 2015)</li> <li>New Releases: Apache Sling Health Check Core 1.2.2 and Apache Sling Launchpad Base 5.0.0-2.6.0 (April 30th, 2015)</li> <li>New Release: Apache Sling Discovery Impl 1.1.2 (April 28th, 2015)</li> <li>New Release: Apache Sling Testing Tools 1.0.10 (April 24th, 2015)</li> @@ -324,7 +325,7 @@ <li>Apache Sling has graduated into a top level project! (June 17, 2009)</li> </ul> <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;"> - Rev. 1676989 by cziegeler on Thu, 30 Apr 2015 13:54:08 +0000 + Rev. 1677313 by cziegeler on Sat, 2 May 2015 12:55:22 +0000 </div> <div class="trademarkFooter"> Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project