Author: buildbot
Date: Wed Oct 10 22:50:34 2018
New Revision: 1036239
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/dm-annotations.html
Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 10 22:50:34 2018
@@ -1 +1 @@
-1843473
+1843521
Modified:
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html
==============================================================================
---
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html
(original)
+++
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html
Wed Oct 10 22:50:34 2018
@@ -510,7 +510,7 @@ Manager API or DM Lambda). Alternatively
<p>2) Wait for extra required dependencies optionally configured from the
init() method. When all extra
required dependencies are available:</p>
<ul>
-<li>inject required dependencies</li>
+<li>inject extra required dependencies (if some were defined in init()
method).</li>
<li>invoke the start method annotated with <a
href="http://felix.apache.org/apidocs/dependencymanager.annotations/r12/org/apache/felix/dm/annotation/api/Start.html";>@Start
annotation</a>.
The start method may return a Map<String, Object> that will
be appended to the provided service properties (the the component provides a
service).</li>
@@ -1645,7 +1645,7 @@ in the following, the service properties
<span class="o">}</span>
</pre></div>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1843473 by pderop on Wed, 10 Oct 2018 17:08:07 +0000
+ Rev. 1843521 by pderop on Wed, 10 Oct 2018 22:49:57 +0000
</div>
<div class="trademarkFooter">
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
