[sling-org-apache-sling-models-api] 13/34: SLING-4083 revert all changes from trunk, copied to branch https://svn.apache.org/repos/asf/sling/whiteboard/sseifert/SLING-4083_models_slingobject_threadlocal

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.models.api-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git

commit 562c886087efc209cf81111642d126fb415eda10
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Oct 30 10:02:59 2014 +0000

    SLING-4083 revert all changes from trunk, copied to branch https://svn.apache.org/repos/asf/sling/whiteboard/sseifert/SLING-4083_models_slingobject_threadlocal
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/api@1635446 13f79535-47bb-0310-9956-ffa450edef68
---
 .../annotations/injectorspecific/SlingObject.java      | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java b/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
index 50d3f82..07a7c7c 100644
--- a/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
+++ b/src/main/java/org/apache/sling/models/annotations/injectorspecific/SlingObject.java
@@ -52,35 +52,31 @@ import org.apache.sling.models.spi.injectorspecific.InjectAnnotation;
  * <td>{@link Resource}</td>
  * <td>Resource</td>
  * <td style="text-align:center">X</td>
- * <td style="text-align:center">X*</td>
+ * <td></td>
  * <td style="text-align:center">X</td>
  * </tr>
  * <tr style="background-color:#eee">
  * <td>{@link SlingHttpServletRequest}</td>
  * <td>Sling request</td>
  * <td style="text-align:center">X</td>
- * <td style="text-align:center">X*</td>
- * <td style="text-align:center">X*</td>
+ * <td></td>
+ * <td></td>
  * </tr>
  * <tr>
  * <td>{@link SlingHttpServletResponse}</td>
  * <td>Sling response</td>
  * <td style="text-align:center">X</td>
- * <td style="text-align:center">X*</td>
- * <td style="text-align:center">X*</td>
+ * <td></td>
+ * <td></td>
  * </tr>
  * <tr style="background-color:#eee">
  * <td>{@link SlingScriptHelper}</td>
  * <td>Sling script helper</td>
  * <td style="text-align:center">X</td>
- * <td style="text-align:center">X*</td>
- * <td style="text-align:center">X*</td>
+ * <td></td>
+ * <td></td>
  * </tr>
  * </table>
- * <p>
- * In case of X* the class cannot be derived from the adaptable, but is derived from the request of the current thread
- * set by a servlet filter. If the current thread is not associated with a request nothing is injected.
- * </p>
  */
 @Target({ METHOD, FIELD, PARAMETER })
 @Retention(RUNTIME)

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.