svn commit: r943065 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-dependency-manager-4/reference/components.html

[bu...@apache.org]

Author: buildbot
Date: Mon Mar  9 20:37:17 2015
New Revision: 943065

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-4/reference/components.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar  9 20:37:17 2015
@@ -1 +1 @@
-1665344
+1665349

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/components.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/components.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/components.html Mon Mar  9 20:37:17 2015
@@ -74,16 +74,16 @@
 <p>There are different types of Dependency Manager components:</p>
 <ul>
 <li><a href="component-singleton.html"><em>Component</em></a>: Components are the main building blocks for OSGi applications. They can publish themselves as a service, and/or they can have dependencies. These dependencies will influence their life cycle as component will only be activated when all required dependencies are available.</li>
-<li><a href="component-singleton.html"><em>Aspect Service</em></a>: A service that provides a non-functional aspect on top of an existing service. In aspect oriented programming, an aspect, or interceptor can sit between a client and another target service used by the client. An Aspect Service first tracks a target service and is created once the target service is detected. Then the Aspect Service is provided, but with a higher  ranking, and the client is transparently updated with the aspect. Aspects can be chained and may apply to the same target service (and in this case, the ranking of the Aspect service is used to chain aspects in  the proper order).</li>
-<li><a href="component-singleton.html"><em>Adapter Service</em></a>: A Service that adapts another existing service into a new one. Like with aspects, sometimes you want to create adapters for certain services, which add certain behavior that results in the publication of (in this case) a different service. Adapters can dynamically be added and removed and allow you to keep your basic services implementations clean and simple, adding extra features on top of them in a modular way.</li>
-<li><a href="component-singleton.html"><em>Bundle Adapter Service</em></a>: creates an OSGi service a service on top of a given bundle.</li>
-<li><a href="component-singleton.html"><em>Resource Adapter Service</em></a>: creates an OSGi service on top of a specific Resource.</li>
-<li><a href="component-singleton.html"><em>Factory Configuration Adapter Service</em></a>: creates an OSGi service from ConfigAdmin, using a factoryPid, and a ManagedServiceFactory.</li>
+<li><a href="component-aspect.html"><em>Aspect Service</em></a>: A service that provides a non-functional aspect on top of an existing service. In aspect oriented programming, an aspect, or interceptor can sit between a client and another target service used by the client. An Aspect Service first tracks a target service and is created once the target service is detected. Then the Aspect Service is provided, but with a higher  ranking, and the client is transparently updated with the aspect. Aspects can be chained and may apply to the same target service (and in this case, the ranking of the Aspect service is used to chain aspects in  the proper order).</li>
+<li><a href="component-adapter.html"><em>Adapter Service</em></a>: A Service that adapts another existing service into a new one. Like with aspects, sometimes you want to create adapters for certain services, which add certain behavior that results in the publication of (in this case) a different service. Adapters can dynamically be added and removed and allow you to keep your basic services implementations clean and simple, adding extra features on top of them in a modular way.</li>
+<li><a href="component-bundle-adapter.html"><em>Bundle Adapter Service</em></a>: creates an OSGi service a service on top of a given bundle.</li>
+<li><a href="component-resource-adapter.html"><em>Resource Adapter Service</em></a>: creates an OSGi service on top of a specific Resource.</li>
+<li><a href="component-factory-configuration-adapter.html"><em>Factory Configuration Adapter Service</em></a>: creates an OSGi service from ConfigAdmin, using a factoryPid, and a ManagedServiceFactory.</li>
 </ul>
 <h1 id="life-cycle">Life cycle</h1>
 <p>The dependency manager, as part of a bundle, shares the generic bundle life cycle explained in the OSGi specification. The life cycle of the dependency manager itself, and the components it manages, can be located inside the <em>active</em> state of the hosting bundle.</p>
 <p>Each component you define gets its own life cycle, which is explained in the state diagram below.</p>
-<p><img alt="State diagram" src="./diagrams/statediagram.png" /></p>
+<p><img src="./diagrams/statediagram.png" alt="State diagram"/></p>
 <p>A component is associated with an instance. This instance can either be specified directly, or you can specify its class. If you do the latter, the actual instance will be created lazily. </p>
 <p>Changes in the state of the component will trigger the following life cycle methods:</p>
 <ul>
@@ -105,7 +105,7 @@
 <h1 id="factories">Factories</h1>
 <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. 1665343 by uiterlix on Mon, 9 Mar 2015 20:24:11 +0000
+        Rev. 1665349 by uiterlix on Mon, 9 Mar 2015 20:37:02 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project