svn commit: r943062 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-dependency-manager-4/reference/ documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/

[bu...@apache.org]

Author: buildbot
Date: Mon Mar  9 20:24:25 2015
New Revision: 943062

Log:
Staging update by buildbot for felix

Added:
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.png   (with props)
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.uxf   (with props)
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:24:25 2015
@@ -1 +1 @@
-1665340
+1665343

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:24:25 2015
@@ -83,7 +83,7 @@
 <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>TODO {gliffy:name=state-diagram|align=center|size=L|version=2}</p>
+<p><img alt="State diagram" src="./diagrams/statediagram.png" /></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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665343 by uiterlix on Mon, 9 Mar 2015 20:24:11 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project

Added: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.uxf
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/diagrams/statediagram.uxf
------------------------------------------------------------------------------
    svn:mime-type = application/xml