Author: sseifert
Date: Wed Sep 10 12:50:19 2014
New Revision: 1623986
URL: http://svn.apache.org/r1623986
Log:
"applicable to" is not correct for SlingObject injector
Modified:
sling/site/trunk/content/documentation/bundles/models.mdtext
Modified: sling/site/trunk/content/documentation/bundles/models.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/models.mdtext?rev=1623986&r1=1623985&r2=1623986&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles/models.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/models.mdtext Wed Sep 10
12:50:19 2014
@@ -329,9 +329,9 @@ Request Attributes | `request-attributes
OSGi Services | `osgi-services` | 5000 | Lookup
services based on class name | Any object | yes | yes | Parameterized `List`
and `Collection` injection points are injected by getting an array of the
services and creating an unmodifiable `List` from the array.
Resource Path | `resource-path` | 2500 | Injects a
resource by its path. | `Resource` or `SlingHttpRequest` objects | yes | none |
none
Self | `self` | `Integer.MAX_VALUE` | Injects
the adaptable object itself (if the class of the field matches or is a
supertype). If the @Self annotation is present it is tried to adapt the
adaptable to the field type. | Any object | yes | none | none
-Sling Object | `sling-object` | `Integer.MAX_VALUE` | Injects
commonly used sling objects if the field matches with the class: request,
response, resource resolver, current resource, SlingScriptHelper | resource,
resource resolver, resource objects | yes | none | none
+Sling Object | `sling-object` | `Integer.MAX_VALUE` | Injects
commonly used sling objects if the field matches with the class: request,
response, resource resolver, current resource, SlingScriptHelper | `Resource`,
`ResourceResolver` or `SlingHttpRequest` objects | yes | none | none
-# Injector-specific Annotations (Since Sling Model Impl 1.0.6)
+# Injector-specific Annotations (Since Sling Models Impl 1.0.6)
See also [SLING-3499](https://issues.apache.org/jira/browse/SLING-3499)
@@ -366,7 +366,7 @@ To create a custom annotation, implement
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
[Subversion](http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/injectors/)
for examples.
-# Specifying an Alternate Adapter Class (Since Sling Model 1.1.0)
+# Specifying an Alternate Adapter Class (Since Sling Models 1.1.0)
By default, each model class is registered using its own implementation class
as adapter. If the class has additional interfaces this is not relevant.
