incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r895142 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/models.html
Date Wed, 22 Jan 2014 19:28:17 GMT
Author: buildbot
Date: Wed Jan 22 19:28:16 2014
New Revision: 895142

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 Jan 22 19:28:16 2014
@@ -1 +1 @@
-1560484
+1560487

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 Jan 22 19:28:16
2014
@@ -133,7 +133,7 @@
 
 
 <p>Or</p>
-<div class="codehilite"><pre><span class="nt">&lt;sling:adaptTo</span>
<span class="na">adaptable=</span><span class="s">&quot;${resource}&quot;</span>
         <span class="na">adaptTo=</span><span class="s">&quot;org.apache.sling.models.it.models.MyModel&quot;</span>
<span class="na">var=</span><span class="s">&quot;model&quot;</span><span
class="nt">/&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;sling:adaptTo</span>
<span class="na">adaptable=</span><span class="s">&quot;${resource}&quot;</span>
<span class="na">adaptTo=</span><span class="s">&quot;org.apache.sling.models.it.models.MyModel&quot;</span>
<span class="na">var=</span><span class="s">&quot;model&quot;</span><span
class="nt">/&gt;</span>
 </pre></div>
 
 
@@ -283,65 +283,75 @@
 <h1 id="annotation-reference">Annotation Reference</h1>
 <dl>
 <dt><code>@Model</code></dt>
-<dd>
-<dl>
-<dt>declares a model class or interface</dt>
+<dd>declares a model class or interface</dd>
 <dt><code>@Inject</code></dt>
-<dd>
-<dl>
-<dt>marks a field or method as injectable</dt>
+<dd>marks a field or method as injectable</dd>
 <dt><code>@Named</code></dt>
-<dd>
-<dl>
-<dt>declare a name for the injection (otherwise, defaults based on field or method
name).</dt>
+<dd>declare a name for the injection (otherwise, defaults based on field or method
name).</dd>
 <dt><code>@Optional</code></dt>
-<dd>
-<dl>
-<dt>marks a field or method injection as optional</dt>
+<dd>marks a field or method injection as optional</dd>
 <dt><code>@Source</code></dt>
-<dd>
-<dl>
-<dt>explictly tie an injected field or method to a particular injector (by name). Can
also be on other annotations.</dt>
+<dd>explictly tie an injected field or method to a particular injector (by name). Can
also be on other annotations.</dd>
 <dt><code>@Filter</code></dt>
-<dd>
-<dl>
-<dt>an OSGi service filter</dt>
+<dd>an OSGi service filter</dd>
 <dt><code>@PostConstruct</code></dt>
-<dd>
-<dl>
-<dt>methods to call upon model option creation (only for model classes)</dt>
+<dd>methods to call upon model option creation (only for model classes)</dd>
 <dt><code>@Via</code></dt>
-<dd>
-<dl>
-<dt>use a JavaBean property of the adaptable as the source of the injection</dt>
+<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>
 </dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
 <h1 id="available-injectors">Available Injectors</h1>
-<p>Title   Name (for @Source)  Description Applicable To (including using @Via)   
Notes
-Value Map   valuemap    Gets a property from a Value Map    Any object which is or can be
adapted to a ValueMap 
-OSGI Services   osgi-services   Lookup services based on class name Any object  Effectively
ignores name.
-Script Bindings script-bindings Lookup objects in the script bindings object    A ServletRequest
object which has the Sling Bindings attribute defined<br />
-Child Resources child-resources Gets a child resource by name   Resource objects  <br
/>
-Request Attributes  request-attributes  Get a request attribute ServletRequest objects  </p>
+<table>
+<thead>
+<tr>
+<th>Title</th>
+<th>Name (for <code>@Source</code>)</th>
+<th>Description</th>
+<th>Applicable To (including using <code>@Via</code>)</th>
+<th>Notes</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Value Map</td>
+<td>valuemap</td>
+<td>Gets a property from a Value Map</td>
+<td>Any object which is or can be adapted to a ValueMap</td>
+<td></td>
+</tr>
+<tr>
+<td>OSGI Services</td>
+<td>osgi-services</td>
+<td>Lookup services based on class name</td>
+<td>Any object</td>
+<td>Effectively ignores name.</td>
+</tr>
+<tr>
+<td>Script Bindings</td>
+<td>script-bindings</td>
+<td>Lookup objects in the script bindings object</td>
+<td>A ServletRequest object which has the Sling Bindings attribute defined</td>
+<td></td>
+</tr>
+<tr>
+<td>Child Resources</td>
+<td>child-resources</td>
+<td>Gets a child resource by name</td>
+<td>Resource objects</td>
+<td></td>
+</tr>
+<tr>
+<td>Request Attributes</td>
+<td>request-attributes</td>
+<td>Get a request attribute</td>
+<td>ServletRequest objects</td>
+<td></td>
+</tr>
+</tbody>
+</table>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1560484 by justin on Wed, 22 Jan 2014 19:21:21 +0000
+        Rev. 1560487 by justin on Wed, 22 Jan 2014 19:28:10 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message