You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bu...@apache.org on 2013/09/22 22:17:46 UTC

svn commit: r879474 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html

Author: buildbot
Date: Sun Sep 22 20:17:45 2013
New Revision: 879474

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/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 22 20:17:45 2013
@@ -1 +1 @@
-1525427
+1525430

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html Sun Sep 22 20:17:45 2013
@@ -103,8 +103,8 @@ Alternatively, you can also configure so
 (explained later, in <a href="#dynamic-dependency-configuration">#Dynamic Dependency Configuration</a>.</li>
 </ul>
 <p>2) Wait for extra dependencies optionally configured from the init() method.</p>
-<p>3) If the component is not using the @<em>LifecycleController</em> annotation (detailed in the 
-<a href="#controlling-the-lifecycle.path">#Controlling the Lifecycle</a> section), then:</p>
+<p>3) If the component is not using the @<em>LifecycleController</em> annotation (described in the 
+<a href="#controlling-the-lifecycle">#Controlling the Lifecycle</a> section), then:</p>
 <ul>
 <li>Invoke the component start method (annotated with <em>@Start</em>).</li>
 <li>Publish some OSGi services (if the component provides some services).</li>
@@ -316,7 +316,7 @@ following:</p>
 <p>Notice that properties returned by the Map take precedence over other properties, and may 
 override some of them.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1525427 by pderop on Sun, 22 Sep 2013 20:11:50 +0000
+        Rev. 1525430 by pderop on Sun, 22 Sep 2013 20:17:37 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project