Author: buildbot
Date: Fri May 13 08:28:37 2016
New Revision: 988121
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/models.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 13 08:28:37 2016
@@ -1 +1 @@
-1743614
+1743616
Modified: websites/staging/sling/trunk/content/documentation/bundles/models.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/models.html
(original)
+++ websites/staging/sling/trunk/content/documentation/bundles/models.html Fri
May 13 08:28:37 2016
@@ -139,7 +139,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><a href="#custom-injectors">Custom Injectors</a></li>
<li><a href="#annotation-reference">Annotation Reference</a></li>
<li><a href="#available-injectors">Available Injectors</a></li>
-<li><a
href="#injector-specific-annotations-since-sling-models-impl-106">Injector-specific
Annotations (Since Sling Models Impl 1.0.6)</a><ul>
+<li><a href="#injector-specific-annotations">Injector-specific
Annotations</a><ul>
<li><a href="#hints">Hints</a></li>
<li><a href="#custom-annotations">Custom Annotations</a></li>
</ul>
@@ -504,7 +504,10 @@ Validation is only supported on models w
<dd>use a JavaBean property of the adaptable as the source of the
injection</dd>
<dt><code>@Default</code></dt>
<dd>set default values for a field or method</dd>
+<dt><code>@Path</code></dt>
+<dd>only used together with the resource-path injector to specify the path of
a resource</dd>
</dl>
+<p>In addition all <a href="#injector-specific-annotations">injector-specific
annotations</a>.</p>
<h1 id="available-injectors">Available Injectors<a class="headerlink"
href="#available-injectors" title="Permanent link">¶</a></h1>
<table class="table">
<thead>
@@ -581,10 +584,10 @@ Validation is only supported on models w
<td><code>resource-path</code></td>
<td>2500</td>
<td>1.1.0</td>
-<td>Injects a resource by its path derived from the name.</td>
+<td>Injects one or multiple resources. The resource paths are either given by
<code>@Path</code> annotations, the element <code>path</code> or
<code>paths</code> of the annotation <code>@ResourcePath</code> or by paths
given through a resource property being referenced by either
<code>@Named</code> or element <code>name</code> of the annotation
<code>@ResourcePath</code>.</td>
<td><code>Resource</code> or <code>SlingHttpServletRequest</code> objects</td>
<td>yes</td>
-<td>none</td>
+<td>yes</td>
<td>none</td>
</tr>
<tr>
@@ -611,8 +614,8 @@ Validation is only supported on models w
</tr>
</tbody>
</table>
-<h1
id="injector-specific-annotations-since-sling-models-impl-106">Injector-specific
Annotations (Since Sling Models Impl 1.0.6)<a class="headerlink"
href="#injector-specific-annotations-since-sling-models-impl-106"
title="Permanent link">¶</a></h1>
-<p><em>See also <a
href="https://issues.apache.org/jira/browse/SLING-3499";>SLING-3499</a></em></p>
+<h1 id="injector-specific-annotations">Injector-specific Annotations<a
class="headerlink" href="#injector-specific-annotations" title="Permanent
link">¶</a></h1>
+<p><em>Introduced with <a
href="https://issues.apache.org/jira/browse/SLING-3499";>SLING-3499</a> in Sling
Models Impl 1.0.6</em></p>
<p>Sometimes it is desirable to use customized annotations which aggregate the
standard annotations described above. This will generally have
the following advantages over using the standard annotations:</p>
<ul>
@@ -702,7 +705,7 @@ SPI interface which could use context to
content path context. If multiple implementations of the
<code>ImplementationPicker</code> interface are present, they are queried
one after another in order of their service ranking property, the first one
that picks an implementation wins.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1739790 by kwin on Mon, 18 Apr 2016 16:52:17 +0000
+ Rev. 1743616 by kwin on Fri, 13 May 2016 08:28:23 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
