Author: buildbot
Date: Wed Sep 10 12:50:32 2014
New Revision: 921769
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 Wed Sep 10 12:50:32 2014
@@ -1 +1 @@
-1623682
+1623986
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 Wed
Sep 10 12:50:32 2014
@@ -98,12 +98,12 @@
<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-model-impl-106">Injector-specific
Annotations (Since Sling Model Impl 1.0.6)</a><ul>
+<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="#hints">Hints</a></li>
<li><a href="#custom-annotations">Custom Annotations</a></li>
</ul>
</li>
-<li><a
href="#specifying-an-alternate-adapter-class-since-sling-model-110">Specifying
an Alternate Adapter Class (Since Sling Model 1.1.0)</a></li>
+<li><a
href="#specifying-an-alternate-adapter-class-since-sling-models-110">Specifying
an Alternate Adapter Class (Since Sling Models 1.1.0)</a></li>
</ul>
</div>
<p>Many Sling projects want to be able to create model objects - POJOs which
are automatically mapped from Sling objects, typically resources, but also
request objects. Sometimes these POJOs need OSGi services as well.</p>
@@ -499,14 +499,14 @@ strategy by using adding <code>defaultIn
<td><code>sling-object</code></td>
<td><code>Integer.MAX_VALUE</code></td>
<td>Injects commonly used sling objects if the field matches with the class:
request, response, resource resolver, current resource, SlingScriptHelper</td>
-<td>resource, resource resolver, resource objects</td>
+<td><code>Resource</code>, <code>ResourceResolver</code> or
<code>SlingHttpRequest</code> objects</td>
<td>yes</td>
<td>none</td>
<td>none</td>
</tr>
</tbody>
</table>
-<h1
id="injector-specific-annotations-since-sling-model-impl-106">Injector-specific
Annotations (Since Sling Model Impl 1.0.6)</h1>
+<h1
id="injector-specific-annotations-since-sling-models-impl-106">Injector-specific
Annotations (Since Sling Models Impl 1.0.6)</h1>
<p>See also <a
href="https://issues.apache.org/jira/browse/SLING-3499";>SLING-3499</a></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>
@@ -574,7 +574,7 @@ the following advantages over using the
<p>To create a custom annotation, implement the
<code>org.apache.sling.models.spi.injectorspecific.InjectAnnotationProcessorFactory</code>
interface.
This interface may be implemented by the same class as implements an injector,
but this is not strictly necessary. Please refer to the
injectors in <a
href="http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/injectors/";>Subversion</a>
for examples.</p>
-<h1
id="specifying-an-alternate-adapter-class-since-sling-model-110">Specifying an
Alternate Adapter Class (Since Sling Model 1.1.0)</h1>
+<h1
id="specifying-an-alternate-adapter-class-since-sling-models-110">Specifying an
Alternate Adapter Class (Since Sling Models 1.1.0)</h1>
<p>By default, each model class is registered using its own implementation
class as adapter. If the class has additional interfaces this is not
relevant.</p>
<p>The <code>@Model</code> annotations provides an optional
<code>adapters</code> attribute which allows specifying under which type(s) the
model
implementation should be registered in the Models Adapter Factory. With this
property it is possible to register the model
@@ -596,7 +596,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. 1623417 by justin on Mon, 8 Sep 2014 14:50:50 +0000
+ Rev. 1623986 by sseifert on Wed, 10 Sep 2014 12:50:19 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
