Author: buildbot
Date: Tue Feb 2 18:52:36 2016
New Revision: 979300
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 Tue Feb 2 18:52:36 2016
@@ -1 +1 @@
-1728165
+1728169
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
Tue Feb 2 18:52:36 2016
@@ -155,24 +155,29 @@ It is possible to</p>
<tr>
<th>Property Name</th>
<th>Type</th>
+<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>sling:hideProperties</td>
<td>String[]</td>
+<td>Allows to hide the properties with the given names from the underlying
resource. <code>*</code> hides all properties.</td>
</tr>
<tr>
<td>sling:hideChildren</td>
<td>String[]</td>
+<td>Allows to hide the child resources with the given names from the
underlying resource. <code>*</code> hides all child resources.</td>
</tr>
<tr>
<td>sling:hideResource</td>
<td>Boolean</td>
+<td>If <code>true</code> then the resource with the name which contains this
property should not be exposed!</td>
</tr>
<tr>
<td>sling:orderBefore</td>
<td>String</td>
+<td>Contains the name of the preceeding sibling resource. This order is
considered when calling e.g. <code>Resource.listChildren()</code> or
<code>Resource.getChildren()</code> on the merged resource.</td>
</tr>
</tbody>
</table>
@@ -183,12 +188,18 @@ It is possible to</p>
<tr>
<th>Description</th>
<th>Merged Resource Path</th>
+<th>Merging Order</th>
+<th>Read-Only</th>
+<th>Related Ticket</th>
</tr>
</thead>
<tbody>
<tr>
<td>Merging based on the resource resolver's search path</td>
<td><code>/mnt/overlay/<relative resource path></code></td>
+<td>Last resource resolver search path first (Order = Descending search
paths).</td>
+<td><code>true</code></td>
+<td><a
href="https://issues.apache.org/jira/browse/SLING-2986";>SLING-2986</a></td>
</tr>
</tbody>
</table>
@@ -231,12 +242,18 @@ It is possible to</p>
<tr>
<th>Description</th>
<th>Merged Resource Path</th>
+<th>Merging Order</th>
+<th>Read-Only</th>
+<th>Related Ticket</th>
</tr>
</thead>
<tbody>
<tr>
<td>Merging based on the <code>sling:resourceSuperType</code></td>
<td><code>/mnt/override/<absolute resource type></code></td>
+<td>The topmost resource type (having itself no
<code>sling:resourceSuperType</code> defined) is the base. The resources are
overlaid in the order from the most generic one to the most specific one (which
is the one having the most inheritance levels).</td>
+<td><code>true</code></td>
+<td><a
href="https://issues.apache.org/jira/browse/SLING-3657";>SLING-3675</a></td>
</tr>
</tbody>
</table>
@@ -272,7 +289,7 @@ It is possible to</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. 1728165 by kwin on Tue, 2 Feb 2016 18:02:28 +0000
+ Rev. 1728169 by kwin on Tue, 2 Feb 2016 18:52:20 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
