Author: buildbot Date: Fri Jun 16 14:54:55 2017 New Revision: 1014131 Log: Staging update by buildbot for sling
Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html Propchange: websites/staging/sling/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Fri Jun 16 14:54:55 2017 @@ -1 +1 @@ -1798833 +1798935 Modified: websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html ============================================================================== --- websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html (original) +++ websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html Fri Jun 16 14:54:55 2017 @@ -179,26 +179,26 @@ It is possible to</p> <tr> <td>sling:orderBefore</td> <td>String</td> -<td>Contains the name of the preceeding sibling resource. This is influencing the order of resources when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource. This is only necessary if the default resource order is not sufficient (see below).</td> +<td>Contains the name of the preceeding sibling resource. This is influencing the order of resources when calling e.g. <code>Resource.listChildren()</code> or <code>Resource.getChildren()</code> on the merged resource. This is only necessary if the default child resource order is not sufficient (see below).</td> </tr> </tbody> </table> <h1 id="child-resource-order">Child Resource Order<a class="headerlink" href="#child-resource-order" title="Permanent link">¶</a></h1> <p>For a merged resource the order of its child resources is the following: -First the ones from the base resource, then the ones from the overlaying resources. The children only defined by the topmost resource come last.</p> -<p>In case the same child is defined in more than one resource, its position is taken from the highest overlaying resource (since version 1.3.2, see also <a href="https://issues.apache.org/jira/browse/SLING-4915">SLING-4915</a>). +First the ones from the underlying resource, then the ones from the overlying resources.</p> +<p>In case the same child is defined in more than one resource, its position is taken from the highest overlaying resource (since version 1.3.2, see also <a href="https://issues.apache.org/jira/browse/SLING-4915">SLING-4915</a>, for some more examples for more complicated merges look at <a href="https://issues.apache.org/jira/browse/SLING-6956">SLING-6956</a>). For example:</p> <div class="codehilite"><pre><span class="n">base</span><span class="o">/</span> <span class="o">+--</span><span class="n">child1</span> - <span class="o">+--</span><span class="n">child2</span> <span class="o">+--</span><span class="n">child3</span> + <span class="o">+--</span><span class="n">child5</span> <span class="n">overlay</span><span class="o">/</span> - <span class="o">+--</span><span class="n">child4</span> <span class="o">+--</span><span class="n">child2</span> <span class="o">+--</span><span class="n">child3</span> + <span class="o">+--</span><span class="n">child4</span> -<span class="n">resulting</span> <span class="n">order</span><span class="p">:</span> <span class="n">child1</span><span class="p">,</span> <span class="n">child4</span><span class="p">,</span> <span class="n">child2</span><span class="p">,</span> <span class="n">child3</span> +<span class="n">resulting</span> <span class="n">order</span><span class="p">:</span> <span class="n">child1</span><span class="p">,</span> <span class="n">child5</span><span class="p">,</span> <span class="n">child2</span><span class="p">,</span> <span class="n">child3</span><span class="p">,</span> <span class="n">child4</span> </pre></div> @@ -311,7 +311,7 @@ For example:</p> <span class="o">|</span> <span class="o">+--</span> <span class="n">property2</span> <span class="p">=</span> "<span class="n">property</span> <span class="n">from</span> <span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">example</span><span class="o">/</span><span class="n">child3</span>" </pre></div> <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;"> - Rev. 1730003 by kwin on Fri, 12 Feb 2016 12:02:45 +0000 + Rev. 1798935 by kwin on Fri, 16 Jun 2017 14:54:27 +0000 </div> <div class="trademarkFooter"> Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project