Author: buildbot
Date: Tue Feb 2 18:02:44 2016
New Revision: 979298
Log:
Staging update by buildbot for sling
Added:
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles.html
websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 2 18:02:44 2016
@@ -1 +1 @@
-1728144
+1728165
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 Feb 2
18:02:44 2016
@@ -127,6 +127,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><a
href="/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Accessing
Filesystem Resources (org.apache.sling.fsresource)</a></li>
<li><a
href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle
Resources (extensions.bundleresource)</a></li>
<li><a href="/documentation/bundles/nosql-resource-providers.html">NoSQL
Resource Providers (org.apache.sling.nosql)</a></li>
+<li><a href="/documentation/bundles/resource-merger.html">Resource Merger
(org.apache.sling.resourcemerger)</a></li>
</ul>
<h2 id="users-groups-access-permissions-acls-on-resources">Users, Groups,
Access, Permissions, ACLs on Resources<a class="headerlink"
href="#users-groups-access-permissions-acls-on-resources" title="Permanent
link">¶</a></h2>
<ul>
@@ -181,7 +182,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><a href="/documentation/bundles/log-tracers.html">Log Tracer</a></li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1724552 by bdelacretaz on Thu, 14 Jan 2016 08:26:12 +0000
+ Rev. 1728165 by kwin on Tue, 2 Feb 2016 18:02:28 +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/resource-merger.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
(added)
+++
websites/staging/sling/trunk/content/documentation/bundles/resource-merger.html
Tue Feb 2 18:02:44 2016
@@ -0,0 +1,284 @@
+<!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 - Resource Merger
(org.apache.sling.resourcemerger)</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 & 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> » <a
href="/documentation.html">Documentation</a> » <a
href="/documentation/bundles.html">Bundles</a>
+ </div>
+
+
+
+ <h1>Resource Merger (org.apache.sling.resourcemerger)</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>
+<div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#merge-properties">Merge Properties</a></li>
+<li><a href="#resource-pickers">Resource Pickers</a><ul>
+<li><a href="#merging-resource-picker-overlay-approach">Merging Resource
Picker (Overlay approach)</a><ul>
+<li><a href="#example">Example</a></li>
+</ul>
+</li>
+<li><a href="#overriding-resource-picker-override-approach">Overriding
Resource Picker (Override approach)</a><ul>
+<li><a href="#example_1">Example</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="introduction">Introduction<a class="headerlink" href="#introduction"
title="Permanent link">¶</a></h1>
+<p><strong>This documentation only applies to versions >= 1.2 (due to major
changes done in <a
href="https://issues.apache.org/jira/browse/SLING-3423";>SLING-3423</a>)</strong></p>
+<p>The Resource Merger bundle provides two resource provider factories</p>
+<ul>
+<li><code>MergingResourceProvider</code> (only for reading)</li>
+<li><code>CRUDMergingResourceProvider</code> (for reading and writing)</li>
+</ul>
+<p>Those providers give access to virtual resources which provide a merged
view on multiple other resources.</p>
+<p>Each <code>MergedResourcePicker</code> service implementation in the system
provides one unique mount point/root path (usually starting with
<code>/mnt</code>) exposing a view on merged resources from at least two
different locations. </p>
+<p>The exact merging mechanism depends on the resource picker implementation
(see below). The order of the merging is important as the overlying resource
may overwrite properties/child resources from the underlying resource (but not
vice-versa).
+It is possible to</p>
+<ul>
+<li>remove existing resource/properties from the underlying resources,</li>
+<li>modify existing properties/child resources of the underlying resources
and</li>
+<li>add new properties/child resources</li>
+</ul>
+<p>You may use any of the merge properties described below to influence the
merging behaviour. All those special properties are not exposed below the mount
point. </p>
+<p>The <code>CRUDMergingResourceProvider</code> not only gives read-access to
the merged resources but even allows to write. This provider always writes
inside the topmost resource path (being returned as last item by the resource
picker). Currently both resource pickers shipped with the Sling Resource Merger
bundle do not allow to write.</p>
+<h1 id="merge-properties">Merge Properties<a class="headerlink"
href="#merge-properties" title="Permanent link">¶</a></h1>
+<table class="table">
+<thead>
+<tr>
+<th>Property Name</th>
+<th>Type</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>sling:hideProperties</td>
+<td>String[]</td>
+</tr>
+<tr>
+<td>sling:hideChildren</td>
+<td>String[]</td>
+</tr>
+<tr>
+<td>sling:hideResource</td>
+<td>Boolean</td>
+</tr>
+<tr>
+<td>sling:orderBefore</td>
+<td>String</td>
+</tr>
+</tbody>
+</table>
+<h1 id="resource-pickers">Resource Pickers<a class="headerlink"
href="#resource-pickers" title="Permanent link">¶</a></h1>
+<h2 id="merging-resource-picker-overlay-approach">Merging Resource Picker
(Overlay approach)<a class="headerlink"
href="#merging-resource-picker-overlay-approach" title="Permanent
link">¶</a></h2>
+<table class="table">
+<thead>
+<tr>
+<th>Description</th>
+<th>Merged Resource Path</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>
+</tr>
+</tbody>
+</table>
+<p>This picker is thought for globally overlaying content by placing the
diff-resource in "/apps" without actually touching anything in "/libs" (since
this is only thought for Sling itself). This should be used whenever some
deviation of content is desired which is initially shipped with Sling. The
client (i.e. the code using the merged resource) does not have to know if there
is an overlay in place.</p>
+<h3 id="example">Example<a class="headerlink" href="#example" title="Permanent
link">¶</a></h3>
+<div class="codehilite"><pre><span class="o">/</span><span
class="n">libs</span><span class="o">/</span><span class="n">sling</span><span
class="o">/</span><span class="n">example</span> <span class="p">(</span><span
class="n">nt</span><span class="p">:</span><span class="n">folder</span><span
class="p">)</span>
+ <span class="o">+--</span> <span class="n">sling</span><span
class="p">:</span><span class="n">resourceType</span> <span class="p">=</span>
"<span class="n">some</span><span class="o">/</span><span
class="n">resource</span><span class="o">/</span><span
class="n">type</span>"
+ <span class="o">+--</span> <span class="n">child1</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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">child1</span>"
+ <span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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>"
+
+
+<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="p">(</span><span
class="n">sling</span><span class="p">:</span><span
class="n">Folder</span><span class="p">)</span>
+ <span class="o">+--</span> <span class="n">property1</span> <span
class="p">=</span> "<span class="n">property</span> <span
class="n">added</span> <span class="n">in</span> <span
class="n">apps</span>"
+ <span class="o">+--</span> <span class="n">child1</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">sling</span><span class="p">:</span><span
class="n">hideResource</span> <span class="p">=</span> <span
class="n">true</span>
+ <span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <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>"
+
+
+<span class="o">/</span><span class="n">mnt</span><span
class="o">/</span><span class="n">overlay</span><span class="o">/</span><span
class="n">sling</span><span class="o">/</span><span class="n">example</span>
<span class="p">(</span><span class="n">sling</span><span
class="p">:</span><span class="n">Folder</span><span class="p">)</span>
+ <span class="o">+--</span> <span class="n">sling</span><span
class="p">:</span><span class="n">resourceType</span> <span class="p">=</span>
"<span class="n">some</span><span class="o">/</span><span
class="n">resource</span><span class="o">/</span><span
class="n">type</span>"
+ <span class="o">+--</span> <span class="n">property1</span> <span
class="p">=</span> "<span class="n">property</span> <span
class="n">added</span> <span class="n">in</span> <span
class="n">apps</span>"
+ <span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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>"
+ <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>
+
+
+<h2 id="overriding-resource-picker-override-approach">Overriding Resource
Picker (Override approach)<a class="headerlink"
href="#overriding-resource-picker-override-approach" title="Permanent
link">¶</a></h2>
+<table class="table">
+<thead>
+<tr>
+<th>Description</th>
+<th>Merged Resource Path</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Merging based on the <code>sling:resourceSuperType</code></td>
+<td><code>/mnt/override/<absolute resource type></code></td>
+</tr>
+</tbody>
+</table>
+<p>This picker is thought for extending content of another already existing
resource (which should not be modified). The client (i.e. the code using the
merged resource) must directly reference the most specific resource type (i.e.
it must be aware of the sub resource type).</p>
+<h3 id="example_1">Example<a class="headerlink" href="#example_1"
title="Permanent link">¶</a></h3>
+<div class="codehilite"><pre><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">base</span> <span class="p">(</span><span
class="n">nt</span><span class="p">:</span><span class="n">folder</span><span
class="p">)</span>
+ <span class="o">+--</span> <span class="n">child1</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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">child1</span>"
+ <span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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>"
+
+
+<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="p">(</span><span
class="n">sling</span><span class="p">:</span><span
class="n">Folder</span><span class="p">)</span>
+ <span class="o">+--</span> <span class="n">sling</span><span
class="p">:</span><span class="n">resourceSuperType</span> <span
class="p">=</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">base</span>"
+ <span class="o">+--</span> <span class="n">property1</span> <span
class="p">=</span> "<span class="n">property</span> <span
class="n">added</span> <span class="n">in</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">child1</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">sling</span><span class="p">:</span><span
class="n">hideResource</span> <span class="p">=</span> <span
class="n">true</span>
+ <span class="o">+--</span> <span class="n">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <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>"
+
+
+<span class="o">/</span><span class="n">mnt</span><span
class="o">/</span><span class="n">overlay</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="p">(</span><span
class="n">sling</span><span class="p">:</span><span
class="n">Folder</span><span class="p">)</span>
+ <span class="o">+--</span> <span class="n">sling</span><span
class="p">:</span><span class="n">resourceSuperType</span> <span
class="p">=</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">base</span>"
+ <span class="o">+--</span> <span class="n">property1</span> <span
class="p">=</span> "<span class="n">property</span> <span
class="n">added</span> <span class="n">in</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">child2</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</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">child2</span>"
+ <span class="o">+--</span> <span class="n">child3</span> <span
class="p">(</span><span class="n">nt</span><span class="p">:</span><span
class="n">folder</span><span class="p">)</span>
+ <span class="o">|</span> <span class="o">+--</span> <span
class="n">property1</span> <span class="p">=</span> "<span
class="n">property</span> <span class="n">from</span> <span
class="o">/</span><span class="n">libs</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>"
+ <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
+ </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/the-sling-engine/resources.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html
(original)
+++
websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html
Tue Feb 2 18:02:44 2016
@@ -133,6 +133,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><a href="#bundle-based-resources">Bundle-based Resources</a></li>
<li><a href="#servlet-resources">Servlet Resources</a></li>
<li><a href="#file-system-resources">File System Resources</a></li>
+<li><a href="#merged-resources">Merged Resources</a></li>
<li><a href="#custom-resource-providers">Custom Resource providers</a></li>
</ul>
</li>
@@ -273,6 +274,9 @@ and <code>getResource(Resource base, Str
<h3 id="file-system-resources">File System Resources<a class="headerlink"
href="#file-system-resources" title="Permanent link">¶</a></h3>
<p>The Filesystem Resource Provider provides access to the operating system's
filesystem through the Sling ResourceResolver. Multiple locations may be mapped
into the resource tree by configuring the filesystem location and the resource
tree root path for each location to be mapped. </p>
<p>For details see <a
href="/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">File
System Resources</a>.</p>
+<h3 id="merged-resources">Merged Resources<a class="headerlink"
href="#merged-resources" title="Permanent link">¶</a></h3>
+<p>The merged resource provider exposes a view on merged resources from
multiple locations.</p>
+<p>For details see <a
href="/documentation/bundles/resource-merger.html">Resource Merger</a>.</p>
<h3 id="custom-resource-providers">Custom Resource providers<a
class="headerlink" href="#custom-resource-providers" title="Permanent
link">¶</a></h3>
<p>Custom ResourceProvider services can be used to integrate your own custom
resources in the Sling resource tree.</p>
<p>For a simple example of that, see the <a
href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/resourceprovider/";>PlanetResourceProvider</a>
used in our integration tests.</p>
@@ -283,7 +287,7 @@ and <code>getResource(Resource base, Str
<h2 id="wrapdecorate-resources">Wrap/Decorate Resources<a class="headerlink"
href="#wrapdecorate-resources" title="Permanent link">¶</a></h2>
<p>The Sling API provides an easy way to wrap or decorate a resource before
returning. Details see <a
href="/documentation/the-sling-engine/wrap-or-decorate-resources.html">Wrap or
Decorate Resources</a>.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1624417 by fmeschbe on Thu, 11 Sep 2014 22:50:12 +0000
+ Rev. 1728165 by kwin on Tue, 2 Feb 2016 18:02:28 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
