Author: buildbot
Date: Thu Mar 12 22:36:25 2015
New Revision: 943593

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 12 22:36:25 2015
@@ -1 +1 @@
-1666327
+1666329

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 Thu Mar 12 22:36:25 2015
@@ -119,11 +119,13 @@ then tracked.</li>
 <ol>
 <li>The service is instantiated.</li>
 <li>The following special objects are injected through reflection on class 
fields, if 
-they exist (but you can deactivate this behavior from the API):</li>
+they exist (but you can deactivate this behavior from the API):<ul>
 <li>BundleContext</li>
 <li>ServiceRegistration</li>
 <li>DependencyManager</li>
 <li>Component</li>
+</ul>
+</li>
 <li><em>autoconfig</em> dependencies are injected through reflection on class 
fields, if they exist. If an <em>autoconfig</em>
 optional dependency is unavailable, a NullObject is then injected.</li>
 <li>Required dependency callbacks defined from the Activator are called.</li>
@@ -151,7 +153,7 @@ then be injected after the <em>@init</em
 <h2 id="factories">Factories</h2>
 <p>Out of the box, there already is support for lazy instantiation, meaning 
that the dependency manager can create component instances for you when their 
required dependencies are resolved. However, sometimes creating a single 
instance using a default constructor is not enough. In those cases, you can 
tell the dependency manager to delegate the creation process to a factory.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1666327 by pderop on Thu, 12 Mar 2015 22:32:33 +0000
+        Rev. 1666329 by pderop on Thu, 12 Mar 2015 22:36:12 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project


Reply via email to