Return-Path: 
 <commits-return-18858-apmail-felix-commits-archive=felix.apache.org@felix.apache.org>
X-Original-To: apmail-felix-commits-archive@www.apache.org
Delivered-To: apmail-felix-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5CBB2CBC7
	for <apmail-felix-commits-archive@www.apache.org>;
 Fri, 14 Jun 2013 14:12:36 +0000 (UTC)
Received: (qmail 55211 invoked by uid 500); 14 Jun 2013 14:12:36 -0000
Delivered-To: apmail-felix-commits-archive@felix.apache.org
Received: (qmail 55170 invoked by uid 500); 14 Jun 2013 14:12:36 -0000
Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@felix.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@felix.apache.org>
List-Post: <mailto:commits@felix.apache.org>
List-Id: <commits.felix.apache.org>
Reply-To: dev@felix.apache.org
Delivered-To: mailing list commits@felix.apache.org
Received: (qmail 55156 invoked by uid 99); 14 Jun 2013 14:12:35 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 14:12:35 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 14:12:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0BF3C2388AA9
	for <commits@felix.apache.org>; Fri, 14 Jun 2013 14:12:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r865657 [4/27] - in
 /websites/staging/felix/trunk/content: ./
 documentation/ documentation/community/ documentation/development/
 documentation/faqs/ documentation/subprojects/
 documentation/subprojects/apache-felix-commons/ documentation/su...
Date: Fri, 14 Jun 2013 14:11:48 -0000
To: commits@felix.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130614141200.0BF3C2388AA9@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-dependencies.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-dependencies.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-dependencies.html Fri Jun 14 14:11:44 2013
@@ -49,8 +49,7 @@
 <a href="http://www.apache.org/">asf</a>  <br />
 <a href="http://www.apache.org/security/">security</a>  <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship</a>  <br />
-<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>  <br />
-</p>
+<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>    </p>
 <iframe
     src="http://www.apache.org/ads/button.html"
     style="border-width:0; float: left"
@@ -90,11 +89,11 @@ Notice that the changed/removed callback
 <li><em>propagate</em>: Returns true if the dependency service properties must be published along with the service. Any additional service properties specified directly are merged with these.</li>
 </ul>
 <p>Usage Example: Here, the MyComponent component is injected with a dependency over a "MyDependency" service.</p>
-<div class="codehilite"><pre>     <span class="nv">@Component</span>
+<div class="codehilite"><pre>     <span class="p">@</span><span class="n">Component</span>
      <span class="n">class</span> <span class="n">MyComponent</span> <span class="p">{</span>
-         <span class="nv">@ServiceDependency</span><span class="p">(</span><span class="n">timeout</span><span class="o">=</span><span class="mi">15000</span><span class="p">)</span>
+         <span class="p">@</span><span class="n">ServiceDependency</span><span class="p">(</span><span class="n">timeout</span><span class="p">=</span>15000<span class="p">)</span>
          <span class="n">MyDependency</span> <span class="n">dependency</span><span class="p">;</span>
-         <span class="o">...</span>
+         <span class="p">...</span>
      <span class="p">}</span>
 </pre></div>
 
@@ -102,43 +101,43 @@ Notice that the changed/removed callback
 <p>Usage example of a Service whose dependency filter is configured from ConfigAdmin, using a "named" dependency
 (please check <a href="">Apache Felix Dependency Manager - Using Annotations - Lifecycle#Dynamic Dependency Configuration</a> for more informations about "named" dependencies):</p>
 <div class="codehilite"><pre>      <span class="o">/**</span>
-        <span class="o">*</span> <span class="n">A</span> <span class="n">Service</span> <span class="n">whose</span> <span class="n">service</span> <span class="n">dependency</span> <span class="s">&quot;otherService&quot;</span> <span class="n">filter</span> <span class="n">is</span> <span class="n">configured</span> <span class="n">from</span> <span class="n">ConfigAdmin</span>
+        <span class="o">*</span> <span class="n">A</span> <span class="n">Service</span> <span class="n">whose</span> <span class="n">service</span> <span class="n">dependency</span> &quot;<span class="n">otherService</span>&quot; <span class="n">filter</span> <span class="n">is</span> <span class="n">configured</span> <span class="n">from</span> <span class="n">ConfigAdmin</span>
         <span class="o">*/</span>
-      <span class="nv">@Service</span>
+      <span class="p">@</span><span class="n">Service</span>
       <span class="n">class</span> <span class="n">X</span> <span class="p">{</span>
           <span class="n">private</span> <span class="n">Dictionary</span> <span class="n">m_config</span><span class="p">;</span>
 
           <span class="o">/**</span>
-           <span class="o">*</span> <span class="n">Initialize</span> <span class="k">our</span> <span class="n">service</span> <span class="n">from</span> <span class="n">config</span> <span class="o">...</span> <span class="ow">and</span> <span class="n">store</span> <span class="n">the</span> <span class="n">config</span> <span class="k">for</span> <span class="n">later</span> <span class="n">usage</span> <span class="p">(</span><span class="n">from</span> <span class="k">our</span> <span class="n">init</span> <span class="n">method</span><span class="p">)</span>
+           <span class="o">*</span> <span class="n">Initialize</span> <span class="n">our</span> <span class="n">service</span> <span class="n">from</span> <span class="n">config</span> <span class="p">...</span> <span class="n">and</span> <span class="n">store</span> <span class="n">the</span> <span class="n">config</span> <span class="k">for</span> <span class="n">later</span> <span class="n">usage</span> <span class="p">(</span><span class="n">from</span> <span class="n">our</span> <span class="n">init</span> <span class="n">method</span><span class="p">)</span>
            <span class="o">*/</span>
-          <span class="nv">@ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="o">=</span><span class="s">&quot;MyPid&quot;</span><span class="p">)</span>
+          <span class="p">@</span><span class="n">ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="p">=</span>&quot;<span class="n">MyPid</span>&quot;<span class="p">)</span>
           <span class="n">void</span> <span class="n">configure</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">conf</span><span class="p">)</span> <span class="p">{</span>
-               <span class="n">m_config</span> <span class="o">=</span> <span class="n">config</span><span class="p">;</span>
+               <span class="n">m_config</span> <span class="p">=</span> <span class="n">config</span><span class="p">;</span>
           <span class="p">}</span>
 
           <span class="o">/**</span>
-           <span class="o">*</span> <span class="n">All</span> <span class="n">unnamed</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected:</span> <span class="n">we</span> <span class="n">can</span> <span class="n">now</span> <span class="n">configure</span> <span class="n">other</span> <span class="n">named</span>
-           <span class="o">*</span> <span class="n">dependencies</span><span class="p">,</span> <span class="n">using</span> <span class="n">the</span> <span class="n">already</span> <span class="n">injected</span> <span class="n">configuration</span><span class="o">.</span>
-           <span class="o">*</span> <span class="n">The</span> <span class="n">returned</span> <span class="n">Map</span> <span class="n">will</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">configure</span> <span class="k">our</span> <span class="s">&quot;otherService&quot;</span> <span class="n">Dependency</span><span class="o">.</span>
+           <span class="o">*</span> <span class="n">All</span> <span class="n">unnamed</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected</span><span class="p">:</span> <span class="n">we</span> <span class="n">can</span> <span class="n">now</span> <span class="n">configure</span> <span class="n">other</span> <span class="n">named</span>
+           <span class="o">*</span> <span class="n">dependencies</span><span class="p">,</span> <span class="n">using</span> <span class="n">the</span> <span class="n">already</span> <span class="n">injected</span> <span class="n">configuration</span><span class="p">.</span>
+           <span class="o">*</span> <span class="n">The</span> <span class="n">returned</span> <span class="n">Map</span> <span class="n">will</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">configure</span> <span class="n">our</span> &quot;<span class="n">otherService</span>&quot; <span class="n">Dependency</span><span class="p">.</span>
            <span class="o">*/</span>
-          <span class="nv">@Init</span>
+          <span class="p">@</span><span class="n">Init</span>
           <span class="n">Map</span> <span class="n">init</span><span class="p">()</span> <span class="p">{</span>
-              <span class="k">return</span> <span class="k">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
+              <span class="k">return</span> <span class="n">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
           <span class="p">}</span>
 
           <span class="o">/**</span>
-           <span class="o">*</span> <span class="n">This</span> <span class="n">named</span> <span class="n">dependency</span> <span class="n">filter</span><span class="o">/</span><span class="n">required</span> <span class="n">flag</span> <span class="n">will</span> <span class="n">be</span> <span class="n">configured</span> <span class="n">by</span> <span class="k">our</span> <span class="n">init</span> <span class="n">method</span> <span class="p">(</span><span class="n">see</span> <span class="n">above</span><span class="p">)</span><span class="o">.</span>
+           <span class="o">*</span> <span class="n">This</span> <span class="n">named</span> <span class="n">dependency</span> <span class="n">filter</span><span class="o">/</span><span class="n">required</span> <span class="n">flag</span> <span class="n">will</span> <span class="n">be</span> <span class="n">configured</span> <span class="n">by</span> <span class="n">our</span> <span class="n">init</span> <span class="n">method</span> <span class="p">(</span><span class="n">see</span> <span class="n">above</span><span class="p">).</span>
            <span class="o">*/</span>
-          <span class="nv">@ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;otherService&quot;</span><span class="p">)</span>
+          <span class="p">@</span><span class="n">ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="p">=</span>&quot;<span class="n">otherService</span>&quot;<span class="p">)</span>
           <span class="n">void</span> <span class="n">bindOtherService</span><span class="p">(</span><span class="n">OtherService</span> <span class="n">other</span><span class="p">)</span> <span class="p">{</span>
           <span class="p">}</span>
 
           <span class="o">/**</span>
-           <span class="o">*</span> <span class="n">All</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected</span> <span class="ow">and</span> <span class="k">our</span> <span class="n">service</span> <span class="n">is</span> <span class="n">now</span> <span class="n">ready</span> <span class="n">to</span> <span class="n">be</span> <span class="n">published</span><span class="o">.</span>
-           <span class="o">*</span> <span class="n">Notice</span> <span class="n">that</span> <span class="n">you</span> <span class="n">can</span> <span class="n">also</span> <span class="k">use</span> <span class="n">the</span> <span class="n">publisher</span> <span class="n">service</span> <span class="n">attribute</span> <span class="k">if</span> <span class="n">you</span> <span class="n">need</span>
-           <span class="o">*</span> <span class="n">to</span> <span class="n">take</span> <span class="n">control</span> <span class="n">on</span> <span class="n">service</span> <span class="n">exposition</span><span class="o">.</span>
+           <span class="o">*</span> <span class="n">All</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected</span> <span class="n">and</span> <span class="n">our</span> <span class="n">service</span> <span class="n">is</span> <span class="n">now</span> <span class="n">ready</span> <span class="n">to</span> <span class="n">be</span> <span class="n">published</span><span class="p">.</span>
+           <span class="o">*</span> <span class="n">Notice</span> <span class="n">that</span> <span class="n">you</span> <span class="n">can</span> <span class="n">also</span> <span class="n">use</span> <span class="n">the</span> <span class="n">publisher</span> <span class="n">service</span> <span class="n">attribute</span> <span class="k">if</span> <span class="n">you</span> <span class="n">need</span>
+           <span class="o">*</span> <span class="n">to</span> <span class="n">take</span> <span class="n">control</span> <span class="n">on</span> <span class="n">service</span> <span class="n">exposition</span><span class="p">.</span>
            <span class="o">*/</span>
-          <span class="nv">@Start</span>
+          <span class="p">@</span><span class="n">Start</span>
           <span class="n">void</span> <span class="n">start</span><span class="p">()</span> <span class="p">{</span>
           <span class="p">}</span>
       <span class="p">}</span>
@@ -157,44 +156,44 @@ Notice that the changed/removed callback
 </ul>
 <p>Usage Examples</p>
 <p>In the following example, the "Printer" component depends on a configuration whose PID name is "org.apache.felix.sample.Printer". This service will initialize its ip/port number from the provided configuration:</p>
-<div class="codehilite"><pre>     <span class="nb">package</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">sample</span><span class="p">;</span>
+<div class="codehilite"><pre>     <span class="n">package</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">sample</span><span class="p">;</span>
 
-     <span class="nv">@Component</span>
+     <span class="p">@</span><span class="n">Component</span>
      <span class="n">public</span> <span class="n">class</span> <span class="n">Printer</span> <span class="p">{</span>
-         <span class="nv">@ConfigurationDependency</span>
+         <span class="p">@</span><span class="n">ConfigurationDependency</span>
          <span class="n">void</span> <span class="n">updated</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">config</span><span class="p">)</span> <span class="p">{</span>
-             <span class="sr">//</span> <span class="n">load</span> <span class="n">printer</span> <span class="n">ip</span><span class="o">/</span><span class="n">port</span> <span class="n">from</span> <span class="n">the</span> <span class="n">provided</span> <span class="n">dictionary</span><span class="o">.</span>
+             <span class="o">//</span> <span class="n">load</span> <span class="n">printer</span> <span class="n">ip</span><span class="o">/</span><span class="n">port</span> <span class="n">from</span> <span class="n">the</span> <span class="n">provided</span> <span class="n">dictionary</span><span class="p">.</span>
          <span class="p">}</span>
      <span class="p">}</span>
 </pre></div>
 
 
 <p>This other example shows how to specify a configuration dependency, as well as meta data used to customize the WebConsole GUI. Using these meta data, you can specify for example the default value for your configurations data, some descriptions, the cardinality of configuration values, etc ...</p>
-<div class="codehilite"><pre>     <span class="nb">package</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">sample</span><span class="p">;</span>
+<div class="codehilite"><pre>     <span class="n">package</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">sample</span><span class="p">;</span>
 
-     <span class="nv">@Component</span>
+     <span class="p">@</span><span class="n">Component</span>
      <span class="n">public</span> <span class="n">class</span> <span class="n">Printer</span> <span class="p">{</span>
-         <span class="nv">@ConfigurationDependency</span><span class="p">(</span>
-             <span class="n">heading</span> <span class="o">=</span> <span class="s">&quot;Printer Service&quot;</span><span class="p">,</span>
-             <span class="n">description</span> <span class="o">=</span> <span class="s">&quot;Declare here parameters used to configure the Printer service&quot;</span><span class="p">,</span>
-             <span class="n">metadata</span> <span class="o">=</span> <span class="p">{</span>
-                 <span class="nv">@PropertyMetaData</span><span class="p">(</span><span class="n">heading</span> <span class="o">=</span> <span class="s">&quot;Ip Address&quot;</span><span class="p">,</span>
-                                   <span class="n">description</span> <span class="o">=</span> <span class="s">&quot;Enter the ip address for the Printer service&quot;</span><span class="p">,</span>
-                                   <span class="n">defaults</span> <span class="o">=</span> <span class="p">{</span> <span class="s">&quot;127.0.0.1&quot;</span> <span class="p">},</span>
-                                   <span class="n">type</span> <span class="o">=</span> <span class="n">String</span><span class="o">.</span><span class="n">class</span><span class="p">,</span>
-                                   <span class="n">id</span> <span class="o">=</span> <span class="s">&quot;IPADDR&quot;</span><span class="p">,</span>
-                                   <span class="n">cardinality</span> <span class="o">=</span> <span class="mi">0</span><span class="p">),</span>
-                 <span class="nv">@PropertyMetaData</span><span class="p">(</span><span class="n">heading</span> <span class="o">=</span> <span class="s">&quot;Port Number&quot;</span><span class="p">,</span>
-                                   <span class="n">description</span> <span class="o">=</span> <span class="s">&quot;Enter the port number for the Printer service&quot;</span><span class="p">,</span>
-                                   <span class="n">defaults</span> <span class="o">=</span> <span class="p">{</span> <span class="s">&quot;4444&quot;</span> <span class="p">},</span>
-                                   <span class="n">type</span> <span class="o">=</span> <span class="n">Integer</span><span class="o">.</span><span class="n">class</span><span class="p">,</span>
-                                   <span class="n">id</span> <span class="o">=</span> <span class="s">&quot;PORTNUM&quot;</span><span class="p">,</span>
-                                   <span class="n">cardinality</span> <span class="o">=</span> <span class="mi">0</span><span class="p">)</span>
+         <span class="p">@</span><span class="n">ConfigurationDependency</span><span class="p">(</span>
+             <span class="n">heading</span> <span class="p">=</span> &quot;<span class="n">Printer</span> <span class="n">Service</span>&quot;<span class="p">,</span>
+             <span class="n">description</span> <span class="p">=</span> &quot;<span class="n">Declare</span> <span class="n">here</span> <span class="n">parameters</span> <span class="n">used</span> <span class="n">to</span> <span class="n">configure</span> <span class="n">the</span> <span class="n">Printer</span> <span class="n">service</span>&quot;<span class="p">,</span>
+             <span class="n">metadata</span> <span class="p">=</span> <span class="p">{</span>
+                 <span class="p">@</span><span class="n">PropertyMetaData</span><span class="p">(</span><span class="n">heading</span> <span class="p">=</span> &quot;<span class="n">Ip</span> <span class="n">Address</span>&quot;<span class="p">,</span>
+                                   <span class="n">description</span> <span class="p">=</span> &quot;<span class="n">Enter</span> <span class="n">the</span> <span class="n">ip</span> <span class="n">address</span> <span class="k">for</span> <span class="n">the</span> <span class="n">Printer</span> <span class="n">service</span>&quot;<span class="p">,</span>
+                                   <span class="n">defaults</span> <span class="p">=</span> <span class="p">{</span> &quot;127<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span>1&quot; <span class="p">},</span>
+                                   <span class="n">type</span> <span class="p">=</span> <span class="n">String</span><span class="p">.</span><span class="n">class</span><span class="p">,</span>
+                                   <span class="n">id</span> <span class="p">=</span> &quot;<span class="n">IPADDR</span>&quot;<span class="p">,</span>
+                                   <span class="n">cardinality</span> <span class="p">=</span> 0<span class="p">),</span>
+                 <span class="p">@</span><span class="n">PropertyMetaData</span><span class="p">(</span><span class="n">heading</span> <span class="p">=</span> &quot;<span class="n">Port</span> <span class="n">Number</span>&quot;<span class="p">,</span>
+                                   <span class="n">description</span> <span class="p">=</span> &quot;<span class="n">Enter</span> <span class="n">the</span> <span class="n">port</span> <span class="n">number</span> <span class="k">for</span> <span class="n">the</span> <span class="n">Printer</span> <span class="n">service</span>&quot;<span class="p">,</span>
+                                   <span class="n">defaults</span> <span class="p">=</span> <span class="p">{</span> &quot;4444&quot; <span class="p">},</span>
+                                   <span class="n">type</span> <span class="p">=</span> <span class="n">Integer</span><span class="p">.</span><span class="n">class</span><span class="p">,</span>
+                                   <span class="n">id</span> <span class="p">=</span> &quot;<span class="n">PORTNUM</span>&quot;<span class="p">,</span>
+                                   <span class="n">cardinality</span> <span class="p">=</span> 0<span class="p">)</span>
 
              <span class="p">}</span>
          <span class="p">)</span>
          <span class="n">void</span> <span class="n">updated</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">config</span><span class="p">)</span> <span class="p">{</span>
-             <span class="sr">//</span> <span class="n">load</span> <span class="n">configuration</span> <span class="n">from</span> <span class="n">the</span> <span class="n">provided</span> <span class="n">dictionary</span><span class="o">.</span>
+             <span class="o">//</span> <span class="n">load</span> <span class="n">configuration</span> <span class="n">from</span> <span class="n">the</span> <span class="n">provided</span> <span class="n">dictionary</span><span class="p">.</span>
          <span class="p">}</span>
 </pre></div>
 
@@ -214,19 +213,19 @@ Please refer to <a href="">Apache Felix 
 </ul>
 <p>Usage Examples</p>
 <p>In the following example, the "SCR" Component allows to track all bundles containing a specific "Service-Component" OSGi header, in order to load and manage all Declarative Service components specified in the SCR xml documents referenced by the header:</p>
-<div class="codehilite"><pre>     <span class="nv">@Component</span>
+<div class="codehilite"><pre>     <span class="p">@</span><span class="n">Component</span>
      <span class="n">public</span> <span class="n">class</span> <span class="n">SCR</span> <span class="p">{</span>
-         <span class="nv">@BundleDependency</span><span class="p">(</span><span class="n">required</span> <span class="o">=</span> <span class="n">false</span><span class="p">,</span>
-                           <span class="n">removed</span> <span class="o">=</span> <span class="s">&quot;unloadServiceComponents&quot;</span><span class="p">,</span>
-                           <span class="n">filter</span> <span class="o">=</span> <span class="s">&quot;(Service-Component=*)&quot;</span>
-                           <span class="n">stateMask</span> <span class="o">=</span> <span class="n">Bundle</span><span class="o">.</span><span class="n">ACTIVE</span><span class="p">)</span>
+         <span class="p">@</span><span class="n">BundleDependency</span><span class="p">(</span><span class="n">required</span> <span class="p">=</span> <span class="n">false</span><span class="p">,</span>
+                           <span class="n">removed</span> <span class="p">=</span> &quot;<span class="n">unloadServiceComponents</span>&quot;<span class="p">,</span>
+                           <span class="n">filter</span> <span class="p">=</span> &quot;<span class="p">(</span><span class="n">Service</span><span class="o">-</span><span class="n">Component</span><span class="p">=</span><span class="o">*</span><span class="p">)</span>&quot;
+                           <span class="n">stateMask</span> <span class="p">=</span> <span class="n">Bundle</span><span class="p">.</span><span class="n">ACTIVE</span><span class="p">)</span>
          <span class="n">void</span> <span class="n">loadServiceComponents</span><span class="p">(</span><span class="n">Bundle</span> <span class="n">b</span><span class="p">)</span> <span class="p">{</span>
-             <span class="n">String</span> <span class="n">descriptorPaths</span> <span class="o">=</span> <span class="p">(</span><span class="n">String</span><span class="p">)</span> <span class="n">b</span><span class="o">.</span><span class="n">getHeaders</span><span class="p">()</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s">&quot;Service-Component&quot;</span><span class="p">);</span>
-             <span class="sr">//</span> <span class="n">load</span> <span class="n">all</span> <span class="n">service</span> <span class="n">component</span> <span class="n">specified</span> <span class="n">in</span> <span class="n">the</span> <span class="n">XML</span> <span class="n">descriptorPaths</span> <span class="n">files</span> <span class="o">...</span>
+             <span class="n">String</span> <span class="n">descriptorPaths</span> <span class="p">=</span> <span class="p">(</span><span class="n">String</span><span class="p">)</span> <span class="n">b</span><span class="p">.</span><span class="n">getHeaders</span><span class="p">().</span><span class="n">get</span><span class="p">(</span>&quot;<span class="n">Service</span><span class="o">-</span><span class="n">Component</span>&quot;<span class="p">);</span>
+             <span class="o">//</span> <span class="n">load</span> <span class="n">all</span> <span class="n">service</span> <span class="n">component</span> <span class="n">specified</span> <span class="n">in</span> <span class="n">the</span> <span class="n">XML</span> <span class="n">descriptorPaths</span> <span class="n">files</span> <span class="p">...</span>
          <span class="p">}</span>
 
          <span class="n">void</span> <span class="n">unloadServiceComponents</span><span class="p">(</span><span class="n">Bundle</span> <span class="n">b</span><span class="p">)</span> <span class="p">{</span>
-             <span class="sr">//</span> <span class="n">unload</span> <span class="n">all</span> <span class="n">service</span> <span class="n">component</span> <span class="n">we</span> <span class="n">loaded</span> <span class="n">from</span> <span class="k">our</span> <span class="s">&quot;loadServiceComponents&quot;</span> <span class="n">method</span><span class="o">.</span>
+             <span class="o">//</span> <span class="n">unload</span> <span class="n">all</span> <span class="n">service</span> <span class="n">component</span> <span class="n">we</span> <span class="n">loaded</span> <span class="n">from</span> <span class="n">our</span> &quot;<span class="n">loadServiceComponents</span>&quot; <span class="n">method</span><span class="p">.</span>
          <span class="p">}</span>
      <span class="p">}</span>
 </pre></div>
@@ -247,64 +246,64 @@ A resource is a URL and you can use a fi
 </ul>
 <p>Usage Examples
 Here, the "VideoPlayer" component plays any provided MKV video resources</p>
-<div class="codehilite"><pre>     <span class="nv">@Component</span>
+<div class="codehilite"><pre>     <span class="p">@</span><span class="n">Component</span>
      <span class="n">public</span> <span class="n">class</span> <span class="n">VideoPlayer</span> <span class="p">{</span>
-         <span class="nv">@ResourceDependency</span><span class="p">(</span><span class="n">required</span><span class="o">=</span><span class="n">false</span><span class="p">,</span> <span class="n">filter</span><span class="o">=</span><span class="s">&quot;(path=/videos/*.mkv)&quot;</span><span class="p">)</span>
-         <span class="n">void</span> <span class="n">playResource</span><span class="p">(</span><span class="n">URL</span> <span class="n">video</span><span class="p">)</span> <span class="p">{</span> <span class="o">...</span> <span class="p">}</span>
+         <span class="p">@</span><span class="n">ResourceDependency</span><span class="p">(</span><span class="n">required</span><span class="p">=</span><span class="n">false</span><span class="p">,</span> <span class="n">filter</span><span class="p">=</span>&quot;<span class="p">(</span><span class="n">path</span><span class="p">=</span><span class="o">/</span><span class="n">videos</span><span class="o">/*</span><span class="p">.</span><span class="n">mkv</span><span class="p">)</span>&quot;<span class="p">)</span>
+         <span class="n">void</span> <span class="n">playResource</span><span class="p">(</span><span class="n">URL</span> <span class="n">video</span><span class="p">)</span> <span class="p">{</span> <span class="p">...</span> <span class="p">}</span>
      <span class="p">}</span>
 </pre></div>
 
 
 <p>And here is an example of a VideoProvider, which provides some videos using a web URL. Notice that Resource providers need to depend on the DependencyManager API:</p>
-<div class="codehilite"><pre>     <span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">net</span><span class="o">.</span><span class="n">MalformedURLException</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">net</span><span class="o">.</span><span class="n">URL</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">HashMap</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Map</span><span class="p">;</span>
-
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">dm</span><span class="o">.</span><span class="n">ResourceHandler</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">dm</span><span class="o">.</span><span class="n">ResourceUtil</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">dm</span><span class="o">.</span><span class="n">annotation</span><span class="o">.</span><span class="n">api</span><span class="o">.</span><span class="n">Component</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">dm</span><span class="o">.</span><span class="n">annotation</span><span class="o">.</span><span class="n">api</span><span class="o">.</span><span class="n">Init</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">dm</span><span class="o">.</span><span class="n">annotation</span><span class="o">.</span><span class="n">api</span><span class="o">.</span><span class="n">ServiceDependency</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">BundleContext</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">Filter</span><span class="p">;</span>
-     <span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">InvalidSyntaxException</span><span class="p">;</span>
+<div class="codehilite"><pre>     <span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">net</span><span class="p">.</span><span class="n">MalformedURLException</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">net</span><span class="p">.</span><span class="n">URL</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">HashMap</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Map</span><span class="p">;</span>
+
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">dm</span><span class="p">.</span><span class="n">ResourceHandler</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">dm</span><span class="p">.</span><span class="n">ResourceUtil</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">dm</span><span class="p">.</span><span class="n">annotation</span><span class="p">.</span><span class="n">api</span><span class="p">.</span><span class="n">Component</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">dm</span><span class="p">.</span><span class="n">annotation</span><span class="p">.</span><span class="n">api</span><span class="p">.</span><span class="n">Init</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">dm</span><span class="p">.</span><span class="n">annotation</span><span class="p">.</span><span class="n">api</span><span class="p">.</span><span class="n">ServiceDependency</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">BundleContext</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">Filter</span><span class="p">;</span>
+     <span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">InvalidSyntaxException</span><span class="p">;</span>
 
-     <span class="nv">@Component</span>
+     <span class="p">@</span><span class="n">Component</span>
      <span class="n">public</span> <span class="n">class</span> <span class="n">VideoProvider</span>
      <span class="p">{</span>
-         <span class="sr">//</span> <span class="n">Injected</span> <span class="n">by</span> <span class="n">reflection</span>
+         <span class="o">//</span> <span class="n">Injected</span> <span class="n">by</span> <span class="n">reflection</span>
          <span class="n">private</span> <span class="n">volatile</span> <span class="n">BundleContext</span> <span class="n">context</span><span class="p">;</span>
-         <span class="sr">//</span> <span class="n">List</span> <span class="n">of</span> <span class="n">known</span> <span class="n">resource</span> <span class="n">handlers</span>
-         <span class="n">private</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">ResourceHandler</span><span class="p">,</span> <span class="n">Filter</span><span class="o">&gt;</span> <span class="n">m_handlers</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">ResourceHandler</span><span class="p">,</span> <span class="n">Filter</span><span class="o">&gt;</span><span class="p">();</span>
-         <span class="sr">//</span> <span class="n">List</span> <span class="n">of</span> <span class="n">known</span> <span class="n">video</span> <span class="n">resources</span>
-         <span class="n">private</span> <span class="n">URL</span><span class="o">[]</span> <span class="n">m_videos</span><span class="p">;</span>
+         <span class="o">//</span> <span class="n">List</span> <span class="n">of</span> <span class="n">known</span> <span class="n">resource</span> <span class="n">handlers</span>
+         <span class="n">private</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">ResourceHandler</span><span class="p">,</span> <span class="n">Filter</span><span class="o">&gt;</span> <span class="n">m_handlers</span> <span class="p">=</span> <span class="n">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">ResourceHandler</span><span class="p">,</span> <span class="n">Filter</span><span class="o">&gt;</span><span class="p">();</span>
+         <span class="o">//</span> <span class="n">List</span> <span class="n">of</span> <span class="n">known</span> <span class="n">video</span> <span class="n">resources</span>
+         <span class="n">private</span> <span class="n">URL</span><span class="p">[]</span> <span class="n">m_videos</span><span class="p">;</span>
 
-         <span class="nv">@Init</span>
+         <span class="p">@</span><span class="n">Init</span>
          <span class="n">void</span> <span class="n">init</span><span class="p">()</span> <span class="n">throws</span> <span class="n">MalformedURLException</span>
          <span class="p">{</span>
-            <span class="n">m_videos</span> <span class="o">=</span> <span class="k">new</span> <span class="n">URL</span><span class="o">[]</span> <span class="p">{</span>
-                    <span class="k">new</span> <span class="n">URL</span><span class="p">(</span><span class="s">&quot;http://localhost:8080/videos/video1.mkv&quot;</span><span class="p">),</span>
-                    <span class="k">new</span> <span class="n">URL</span><span class="p">(</span><span class="s">&quot;http://localhost:8080/videos/video2.mkv&quot;</span><span class="p">),</span>
+            <span class="n">m_videos</span> <span class="p">=</span> <span class="n">new</span> <span class="n">URL</span><span class="p">[]</span> <span class="p">{</span>
+                    <span class="n">new</span> <span class="n">URL</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">videos</span><span class="o">/</span><span class="n">video1</span><span class="p">.</span><span class="n">mkv</span>&quot;<span class="p">),</span>
+                    <span class="n">new</span> <span class="n">URL</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">videos</span><span class="o">/</span><span class="n">video2</span><span class="p">.</span><span class="n">mkv</span>&quot;<span class="p">),</span>
              <span class="p">};</span>
          <span class="p">}</span>
 
-         <span class="sr">//</span> <span class="n">Track</span> <span class="n">resource</span> <span class="n">handlers</span>
-         <span class="nv">@ServiceDependency</span><span class="p">(</span><span class="n">required</span> <span class="o">=</span> <span class="n">false</span><span class="p">)</span>
+         <span class="o">//</span> <span class="n">Track</span> <span class="n">resource</span> <span class="n">handlers</span>
+         <span class="p">@</span><span class="n">ServiceDependency</span><span class="p">(</span><span class="n">required</span> <span class="p">=</span> <span class="n">false</span><span class="p">)</span>
          <span class="n">public</span> <span class="n">void</span> <span class="n">add</span><span class="p">(</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">serviceProperties</span><span class="p">,</span> <span class="n">ResourceHandler</span> <span class="n">handler</span><span class="p">)</span> <span class="n">throws</span> <span class="n">InvalidSyntaxException</span>
          <span class="p">{</span>
-             <span class="n">String</span> <span class="n">filterString</span> <span class="o">=</span> <span class="n">serviceProperties</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s">&quot;filter&quot;</span><span class="p">);</span>
-             <span class="n">filterString</span> <span class="o">=</span> <span class="p">(</span><span class="n">filterString</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">?</span> <span class="n">filterString</span> <span class="p">:</span> <span class="s">&quot;(path=*)&quot;</span><span class="p">;</span>
-             <span class="n">Filter</span> <span class="n">filter</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="n">createFilter</span><span class="p">(</span><span class="n">filterString</span><span class="p">);</span>
+             <span class="n">String</span> <span class="n">filterString</span> <span class="p">=</span> <span class="n">serviceProperties</span><span class="p">.</span><span class="n">get</span><span class="p">(</span>&quot;<span class="n">filter</span>&quot;<span class="p">);</span>
+             <span class="n">filterString</span> <span class="p">=</span> <span class="p">(</span><span class="n">filterString</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> ? <span class="n">filterString</span> <span class="p">:</span> &quot;<span class="p">(</span><span class="n">path</span><span class="p">=</span><span class="o">*</span><span class="p">)</span>&quot;<span class="p">;</span>
+             <span class="n">Filter</span> <span class="n">filter</span> <span class="p">=</span> <span class="n">context</span><span class="p">.</span><span class="n">createFilter</span><span class="p">(</span><span class="n">filterString</span><span class="p">);</span>
              <span class="n">synchronized</span> <span class="p">(</span><span class="n">this</span><span class="p">)</span>
              <span class="p">{</span>
-                 <span class="n">m_handlers</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="n">handler</span><span class="p">,</span> <span class="n">filter</span><span class="p">);</span>
+                 <span class="n">m_handlers</span><span class="p">.</span><span class="n">put</span><span class="p">(</span><span class="n">handler</span><span class="p">,</span> <span class="n">filter</span><span class="p">);</span>
              <span class="p">}</span>
              <span class="k">for</span> <span class="p">(</span><span class="n">URL</span> <span class="n">video</span> <span class="p">:</span> <span class="n">m_videos</span><span class="p">)</span>
              <span class="p">{</span>
-                 <span class="k">if</span> <span class="p">(</span><span class="n">filter</span><span class="o">.</span><span class="n">match</span><span class="p">(</span><span class="n">ResourceUtil</span><span class="o">.</span><span class="n">createProperties</span><span class="p">(</span><span class="n">video</span><span class="p">)))</span>
+                 <span class="k">if</span> <span class="p">(</span><span class="n">filter</span><span class="p">.</span><span class="n">match</span><span class="p">(</span><span class="n">ResourceUtil</span><span class="p">.</span><span class="n">createProperties</span><span class="p">(</span><span class="n">video</span><span class="p">)))</span>
                  <span class="p">{</span>
-                     <span class="n">handler</span><span class="o">.</span><span class="n">added</span><span class="p">(</span><span class="n">video</span><span class="p">);</span>
+                     <span class="n">handler</span><span class="p">.</span><span class="n">added</span><span class="p">(</span><span class="n">video</span><span class="p">);</span>
                  <span class="p">}</span>
              <span class="p">}</span>
          <span class="p">}</span>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-lifecycle.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-lifecycle.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-lifecycle.html Fri Jun 14 14:11:44 2013
@@ -49,8 +49,7 @@
 <a href="http://www.apache.org/">asf</a>  <br />
 <a href="http://www.apache.org/security/">security</a>  <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship</a>  <br />
-<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>  <br />
-</p>
+<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>    </p>
 <iframe
     src="http://www.apache.org/ads/button.html"
     style="border-width:0; float: left"
@@ -99,25 +98,25 @@
 1. * invoke <em>removed</em> callbacks for required dependencies, if any.</p>
 <h3 id="example">Example</h3>
 <p>The following example shows a basic component, which uses the @Start, @Stop, annotation:</p>
-<div class="codehilite"><pre><span class="o">/**</span>
- <span class="o">*</span> <span class="n">A</span> <span class="n">Component</span> <span class="n">Using</span> <span class="n">lifecyce</span> <span class="n">callbacks</span>
- <span class="o">*/</span>
-<span class="nv">@Component</span>
-<span class="n">class</span> <span class="n">X</span> <span class="n">implements</span> <span class="n">Y</span> <span class="p">{</span>
-    <span class="nv">@ServiceDependency</span>
-    <span class="n">void</span> <span class="n">bindOtherService</span><span class="p">(</span><span class="n">OtherService</span> <span class="n">other</span><span class="p">)</span> <span class="p">{</span>
-       <span class="sr">//</span> <span class="n">Will</span> <span class="n">be</span> <span class="n">injected</span> <span class="n">before</span> <span class="n">we</span> <span class="n">are</span> <span class="n">started</span> <span class="p">(</span><span class="n">because</span> <span class="n">it</span><span class="err">&#39;</span><span class="n">s</span> <span class="n">a</span> <span class="n">required</span> <span class="n">dependency</span><span class="p">)</span><span class="o">.</span>
-    <span class="p">}</span>
-
-    <span class="nv">@Start</span>
-    <span class="n">void</span> <span class="n">publishing</span><span class="p">()</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">All</span> <span class="n">required</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected:</span> <span class="n">initialize</span> <span class="k">our</span> <span class="n">component</span><span class="o">.</span>
-        <span class="sr">//</span> <span class="n">Once</span> <span class="n">we</span> <span class="k">return</span><span class="p">,</span> <span class="k">our</span> <span class="n">Y</span> <span class="n">service</span> <span class="n">will</span> <span class="n">be</span> <span class="n">published</span> <span class="n">in</span> <span class="n">the</span> <span class="n">OSGi</span> <span class="n">registry</span><span class="o">.</span>
-    <span class="p">}</span>
-
-    <span class="nv">@Stop</span>
-    <span class="n">void</span> <span class="n">unpublished</span><span class="p">()</span> <span class="p">{</span>
-       <span class="sr">//</span> <span class="n">We</span> <span class="n">are</span> <span class="ow">not</span> <span class="n">registered</span> <span class="n">anymore</span> <span class="n">in</span> <span class="n">the</span> <span class="n">OSGi</span> <span class="n">registry</span><span class="o">.</span>
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * A Component Using lifecyce callbacks</span>
+<span class="cm"> */</span>
+<span class="p">@</span><span class="n">Component</span>
+<span class="k">class</span> <span class="no">X</span> <span class="n">implements</span> <span class="no">Y</span> <span class="p">{</span>
+    <span class="p">@</span><span class="n">ServiceDependency</span>
+    <span class="k">void</span> <span class="n">bindOtherService</span><span class="p">(</span><span class="n">OtherService</span> <span class="n">other</span><span class="p">)</span> <span class="p">{</span>
+       <span class="c1">// Will be injected before we are started (because it&#39;s a required dependency).</span>
+    <span class="p">}</span>
+
+    <span class="p">@</span><span class="n">Start</span>
+    <span class="k">void</span> <span class="n">publishing</span><span class="p">()</span> <span class="p">{</span>
+        <span class="c1">// All required dependencies are injected: initialize our component.</span>
+        <span class="c1">// Once we return, our Y service will be published in the OSGi registry.</span>
+    <span class="p">}</span>
+
+    <span class="p">@</span><span class="n">Stop</span>
+    <span class="k">void</span> <span class="n">unpublished</span><span class="p">()</span> <span class="p">{</span>
+       <span class="c1">// We are not registered anymore in the OSGi registry.</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -130,15 +129,15 @@
 <p>So, all this is possible using <em>named</em> dependencies: When you assign a name to a dependency; for instance <em>@ServiceDependency(name="foo")</em>, then this has an impact on how the dependency is handled. Indeed, all named dependencies are calculated <em>after</em> the @Init method returns. So from your @Init method, you can then  configure your named dependencies, using data provided by  already injected dependencies.</p>
 <p>To do so, your @Init method is allowed to return a Map containing  the filters and required flags for each named dependencies. For a given  named dependency, the corresponding filter and required flag must be  stored in the Map, using the "<em>filter</em>" and "<em>required</em>" keys, prefixed with the name of the dependency.</p>
 <p>For instance, if you define a Dependency like this:</p>
-<div class="codehilite"><pre><span class="nv">@ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="p">=</span>&quot;<span class="n">foo</span>&quot;<span class="p">)</span>
 <span class="n">FooService</span> <span class="n">fooService</span><span class="p">;</span>
 </pre></div>
 
 
 <p>Then you can return this map from your @Init method:</p>
-<div class="codehilite"><pre><span class="nv">@Init</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Init</span>
 <span class="n">Map</span> <span class="n">init</span><span class="p">()</span> <span class="p">{</span>
-    <span class="k">return</span> <span class="k">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
+    <span class="k">return</span> <span class="n">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -146,42 +145,42 @@
 <p>So, after the init method returns, the map will be used to configure  the dependency named "foo", which will then be evaluated. And once the  dependency is available, then your @Start callback will be invoked.</p>
 <h4 id="usage-example">Usage example:</h4>
 <p>This is an example of a component X whose dependency "foo" filter is  configured from ConfigAdmin. First, we defined a ConfigurationDependency  in order to get injected with our configuration. Next, we define a  dependency on the <em>FooService</em>, but this time, we declare the annotation  like this: <em>@ServiceDependency(</em>{<em>}{</em>}name="foo"<em>{</em>}<em>)</em>. As explained  above, The  ConfigurationDependency will be injected <em>before</em> the @Init method, and  the named dependency ("foo") will be calculated <em>after</em> the @Init method  returns. So, from our Init method, we just return a map which contains  the filter and required flag for the "foo" dependency, and we actually  use the configuration which has already been injected:</p>
-<div class="codehilite"><pre><span class="o">/**</span>
- <span class="o">*</span> <span class="n">A</span> <span class="n">component</span> <span class="n">whose</span> <span class="n">FooService</span> <span class="n">dependency</span> <span class="n">filter</span> <span class="n">is</span> <span class="n">configured</span> <span class="n">from</span> <span class="n">ConfigAdmin</span>
- <span class="o">*/</span>
-<span class="nv">@Component</span>
-<span class="n">class</span> <span class="n">X</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * A component whose FooService dependency filter is configured from ConfigAdmin</span>
+<span class="cm"> */</span>
+<span class="p">@</span><span class="n">Component</span>
+<span class="k">class</span> <span class="no">X</span> <span class="p">{</span>
     <span class="n">private</span> <span class="n">Dictionary</span> <span class="n">m_config</span><span class="p">;</span>
 
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">Initialize</span> <span class="k">our</span> <span class="n">component</span> <span class="n">from</span> <span class="n">config</span> <span class="o">...</span> <span class="ow">and</span> <span class="n">store</span> <span class="n">the</span> <span class="n">config</span> <span class="k">for</span> <span class="n">later</span> <span class="n">usage</span> <span class="p">(</span><span class="n">from</span> <span class="k">our</span> <span class="n">init</span> <span class="n">method</span><span class="p">)</span>
-     <span class="o">*/</span>
-    <span class="nv">@ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="o">=</span><span class="s">&quot;MyPid&quot;</span><span class="p">)</span>
-    <span class="n">void</span> <span class="n">configure</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">conf</span><span class="p">)</span> <span class="p">{</span>
-         <span class="n">m_config</span> <span class="o">=</span> <span class="n">config</span><span class="p">;</span>
+    <span class="cm">/**</span>
+<span class="cm">     * Initialize our component from config ... and store the config for later usage (from our init method)</span>
+<span class="cm">     */</span>
+    <span class="p">@</span><span class="n">ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="o">=</span><span class="s">&quot;MyPid&quot;</span><span class="p">)</span>
+    <span class="k">void</span> <span class="n">configure</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">conf</span><span class="p">)</span> <span class="p">{</span>
+         <span class="n">m_config</span> <span class="o">=</span> <span class="k">config</span><span class="p">;</span>
     <span class="p">}</span>
 
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">All</span> <span class="n">unnamed</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected:</span> <span class="n">we</span> <span class="n">can</span> <span class="n">now</span> <span class="n">configure</span> <span class="n">other</span> <span class="n">named</span>
-     <span class="o">*</span> <span class="n">dependencies</span><span class="p">,</span> <span class="n">using</span> <span class="n">the</span> <span class="n">already</span> <span class="n">injected</span> <span class="n">configuration</span><span class="o">.</span>
-     <span class="o">*</span> <span class="n">The</span> <span class="n">returned</span> <span class="n">Map</span> <span class="n">will</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">configure</span> <span class="k">our</span> <span class="s">&quot;foo&quot;</span> <span class="n">Dependency</span> <span class="p">(</span><span class="n">see</span> <span class="n">below</span><span class="p">)</span>
-     <span class="o">*/</span>
-    <span class="nv">@Init</span>
+    <span class="cm">/**</span>
+<span class="cm">     * All unnamed dependencies are injected: we can now configure other named</span>
+<span class="cm">     * dependencies, using the already injected configuration.</span>
+<span class="cm">     * The returned Map will be used to configure our &quot;foo&quot; Dependency (see below)</span>
+<span class="cm">     */</span>
+    <span class="p">@</span><span class="n">Init</span>
     <span class="n">Map</span> <span class="n">init</span><span class="p">()</span> <span class="p">{</span>
         <span class="k">return</span> <span class="k">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
     <span class="p">}</span>
 
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">This</span> <span class="n">named</span> <span class="n">dependency</span> <span class="n">filter</span><span class="o">/</span><span class="n">required</span> <span class="n">flag</span> <span class="n">will</span> <span class="n">be</span> <span class="n">configured</span> <span class="n">by</span> <span class="k">our</span> <span class="n">init</span> <span class="n">method</span> <span class="p">(</span><span class="n">see</span> <span class="n">above</span><span class="p">)</span><span class="o">.</span>
-     <span class="o">*/</span>
-    <span class="nv">@ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">)</span>
+    <span class="cm">/**</span>
+<span class="cm">     * This named dependency filter/required flag will be configured by our init method (see above).</span>
+<span class="cm">     */</span>
+    <span class="p">@</span><span class="n">ServiceDependency</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">)</span>
     <span class="n">FooService</span> <span class="n">fooService</span><span class="p">;</span>
 
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">All</span> <span class="n">dependencies</span> <span class="n">are</span> <span class="n">injected</span> <span class="ow">and</span> <span class="k">our</span> <span class="n">service</span> <span class="n">is</span> <span class="n">now</span> <span class="n">ready</span> <span class="n">to</span> <span class="n">be</span> <span class="n">published</span><span class="o">.</span>
-     <span class="o">*/</span>
-    <span class="nv">@Start</span>
-    <span class="n">void</span> <span class="n">start</span><span class="p">()</span> <span class="p">{</span>
+    <span class="cm">/**</span>
+<span class="cm">     * All dependencies are injected and our service is now ready to be published.</span>
+<span class="cm">     */</span>
+    <span class="p">@</span><span class="n">Start</span>
+    <span class="k">void</span> <span class="n">start</span><span class="p">()</span> <span class="p">{</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -193,47 +192,47 @@
 <p>This can be done using the @LifecycleController annotation. This  annotation injects a Runnable object that can be invoked once you want  to trigger your service startup and publication.</p>
 <p>For instance, imagine that your component publishes an OSGi service,  but before, it needs to register into a DHT (Distributed Hash Table),  whose API is asynchronous: that is: the DHT API will callback you once  you are inserted into a node in the DHT. In this case, what you would  like to do is to publish your OSGi service, but only after you are  inserted into the DHT (when the DHT callbacks you) ... Such a case  is supported using the @LifecyceController annotation, which gives you  full control of when your component is <em>started/published</em> and <em>unpublished/stopped</em>.</p>
 <p>Let's illustrate this use case with a concrete example: First here is the DHT asynchronous API:</p>
-<div class="codehilite"><pre><span class="o">/**</span>
- <span class="o">*</span> <span class="n">This</span> <span class="n">is</span> <span class="n">an</span> <span class="n">element</span> <span class="n">which</span> <span class="n">can</span> <span class="n">be</span> <span class="n">inserted</span> <span class="n">into</span> <span class="n">the</span> <span class="n">distributed</span> <span class="n">hash</span> <span class="n">table</span><span class="o">.</span>
- <span class="o">*/</span>
-<span class="n">public</span> <span class="n">interface</span> <span class="n">DHTElement</span> <span class="p">{</span>
-   <span class="n">void</span> <span class="n">inserted</span><span class="p">();</span> <span class="sr">//</span> <span class="n">callback</span> <span class="n">used</span> <span class="n">to</span> <span class="n">notify</span> <span class="n">that</span> <span class="n">the</span> <span class="n">element</span> <span class="n">is</span> <span class="n">inserted</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT</span>
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * This is an element which can be inserted into the distributed hash table.</span>
+<span class="cm"> */</span>
+<span class="n">public</span> <span class="k">interface</span> <span class="n">DHTElement</span> <span class="p">{</span>
+   <span class="k">void</span> <span class="n">inserted</span><span class="p">();</span> <span class="c1">// callback used to notify that the element is inserted into the DHT</span>
 <span class="p">}</span>
 
-<span class="o">/**</span>
- <span class="o">*</span> <span class="n">This</span> <span class="n">is</span> <span class="n">the</span> <span class="n">DHTService</span><span class="p">,</span> <span class="n">which</span> <span class="n">registers</span> <span class="n">a</span> <span class="n">DHTElement</span> <span class="n">asynchronously</span><span class="o">.</span>
- <span class="o">*/</span>
-<span class="n">public</span> <span class="n">interface</span> <span class="n">DHTService</span> <span class="p">{</span>
-   <span class="n">void</span> <span class="n">insert</span><span class="p">(</span><span class="n">DHTElement</span> <span class="n">element</span><span class="p">);</span> <span class="sr">//</span> <span class="n">will</span> <span class="n">callback</span> <span class="n">element</span><span class="o">.</span><span class="n">inserted</span><span class="p">()</span> <span class="n">later</span><span class="p">,</span> <span class="n">once</span> <span class="n">registered</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT</span><span class="o">.</span>
+<span class="cm">/**</span>
+<span class="cm"> * This is the DHTService, which registers a DHTElement asynchronously.</span>
+<span class="cm"> */</span>
+<span class="n">public</span> <span class="k">interface</span> <span class="n">DHTService</span> <span class="p">{</span>
+   <span class="k">void</span> <span class="n">insert</span><span class="p">(</span><span class="n">DHTElement</span> <span class="n">element</span><span class="p">);</span> <span class="c1">// will callback element.inserted() later, once registered into the DHT.</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Next, here is our service, which uses the @LifecycleController in  order to take control of when the service is published into the OSGi  registry:</p>
-<div class="codehilite"><pre><span class="nv">@Component</span><span class="p">(</span><span class="n">provides</span><span class="o">=</span><span class="p">{</span><span class="n">MyService</span><span class="o">.</span><span class="n">class</span><span class="p">})</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Component</span><span class="p">(</span><span class="n">provides</span><span class="p">={</span><span class="n">MyService</span><span class="p">.</span><span class="n">class</span><span class="p">})</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">MyServiceImpl</span> <span class="n">implements</span> <span class="n">MyService</span><span class="p">,</span> <span class="n">DHTElement</span> <span class="p">{</span>
-    <span class="nv">@ServiceDependency</span>
+    <span class="p">@</span><span class="n">ServiceDependency</span>
     <span class="n">DHTService</span> <span class="n">dht</span><span class="p">;</span>
 
-    <span class="nv">@LifecycleController</span>
-    <span class="n">Runnable</span> <span class="n">trigger</span><span class="p">;</span> <span class="sr">//</span> <span class="n">will</span> <span class="n">fire</span> <span class="n">component</span> <span class="n">startup</span><span class="p">,</span> <span class="n">once</span> <span class="n">invoked</span><span class="o">.</span>
+    <span class="p">@</span><span class="n">LifecycleController</span>
+    <span class="n">Runnable</span> <span class="n">trigger</span><span class="p">;</span> <span class="o">//</span> <span class="n">will</span> <span class="n">fire</span> <span class="n">component</span> <span class="n">startup</span><span class="p">,</span> <span class="n">once</span> <span class="n">invoked</span><span class="p">.</span>
 
-    <span class="nv">@Init</span>
+    <span class="p">@</span><span class="n">Init</span>
     <span class="n">void</span> <span class="n">init</span><span class="p">()</span> <span class="p">{</span>
-        <span class="n">dht</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="n">this</span><span class="p">);</span> <span class="sr">//</span> <span class="n">asynchronous</span><span class="p">,</span> <span class="n">will</span> <span class="n">callback</span> <span class="n">us</span> <span class="n">in</span> <span class="k">our</span> <span class="n">inserted</span> <span class="n">method</span> <span class="n">once</span> <span class="n">registered</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT</span>
+        <span class="n">dht</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">this</span><span class="p">);</span> <span class="o">//</span> <span class="n">asynchronous</span><span class="p">,</span> <span class="n">will</span> <span class="n">callback</span> <span class="n">us</span> <span class="n">in</span> <span class="n">our</span> <span class="n">inserted</span> <span class="n">method</span> <span class="n">once</span> <span class="n">registered</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT</span>
     <span class="p">}</span>
 
     <span class="n">public</span> <span class="n">void</span> <span class="n">inserted</span><span class="p">()</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">We</span> <span class="n">are</span> <span class="n">inserted</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT:</span> <span class="n">we</span> <span class="n">can</span> <span class="n">now</span> <span class="n">trigger</span> <span class="k">our</span> <span class="n">component</span> <span class="n">startup</span><span class="o">.</span>
-        <span class="sr">//</span> <span class="n">We</span> <span class="n">just</span> <span class="n">invoke</span> <span class="n">the</span> <span class="n">runnable</span> <span class="n">injected</span> <span class="n">by</span> <span class="k">our</span> <span class="nv">@LifecycleController</span> <span class="n">annotation</span><span class="p">,</span> <span class="n">which</span> <span class="n">will</span> <span class="n">trigger</span> <span class="k">our</span>
-        <span class="sr">//</span> <span class="n">service</span> <span class="n">publication</span> <span class="p">(</span><span class="n">we</span><span class="err">&#39;</span><span class="n">ll</span> <span class="n">be</span> <span class="n">called</span> <span class="n">in</span> <span class="k">our</span> <span class="nv">@Start</span> <span class="n">method</span> <span class="n">before</span><span class="p">)</span>
-        <span class="n">trigger</span><span class="o">.</span><span class="n">run</span><span class="p">();</span>
+        <span class="o">//</span> <span class="n">We</span> <span class="n">are</span> <span class="n">inserted</span> <span class="n">into</span> <span class="n">the</span> <span class="n">DHT</span><span class="p">:</span> <span class="n">we</span> <span class="n">can</span> <span class="n">now</span> <span class="n">trigger</span> <span class="n">our</span> <span class="n">component</span> <span class="n">startup</span><span class="p">.</span>
+        <span class="o">//</span> <span class="n">We</span> <span class="n">just</span> <span class="n">invoke</span> <span class="n">the</span> <span class="n">runnable</span> <span class="n">injected</span> <span class="n">by</span> <span class="n">our</span> <span class="p">@</span><span class="n">LifecycleController</span> <span class="n">annotation</span><span class="p">,</span> <span class="n">which</span> <span class="n">will</span> <span class="n">trigger</span> <span class="n">our</span>
+        <span class="o">//</span> <span class="n">service</span> <span class="n">publication</span> <span class="p">(</span><span class="n">we</span><span class="o">&#39;</span><span class="n">ll</span> <span class="n">be</span> <span class="n">called</span> <span class="n">in</span> <span class="n">our</span> <span class="p">@</span><span class="n">Start</span> <span class="n">method</span> <span class="n">before</span><span class="p">)</span>
+        <span class="n">trigger</span><span class="p">.</span><span class="n">run</span><span class="p">();</span>
     <span class="p">}</span>
 
-    <span class="nv">@Start</span>
+    <span class="p">@</span><span class="n">Start</span>
     <span class="n">void</span> <span class="n">start</span><span class="p">()</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">method</span> <span class="n">called</span> <span class="n">only</span> <span class="n">once</span> <span class="n">we</span> <span class="n">invoke</span> <span class="k">our</span> <span class="n">trigger</span> <span class="n">Runnable</span> <span class="p">(</span><span class="n">see</span> <span class="n">inserted</span> <span class="n">method</span><span class="p">)</span><span class="o">.</span>
-        <span class="sr">//</span> <span class="n">Our</span> <span class="n">Service</span> <span class="n">will</span> <span class="n">be</span> <span class="n">published</span> <span class="n">once</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span><span class="o">.</span>
+        <span class="o">//</span> <span class="n">method</span> <span class="n">called</span> <span class="n">only</span> <span class="n">once</span> <span class="n">we</span> <span class="n">invoke</span> <span class="n">our</span> <span class="n">trigger</span> <span class="n">Runnable</span> <span class="p">(</span><span class="n">see</span> <span class="n">inserted</span> <span class="n">method</span><span class="p">).</span>
+        <span class="o">//</span> <span class="n">Our</span> <span class="n">Service</span> <span class="n">will</span> <span class="n">be</span> <span class="n">published</span> <span class="n">once</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span><span class="p">.</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -246,20 +245,20 @@
 </em> Any properties provided by a FactorySet are also inserted in the published service
 <em> Any Dependency whose </em>propagate* attribute is set to true will also insert its properties to the published service</p>
 <p>But when the component needs to specify some service properties dynamically (not statically from the annotation), then it may do so by just returning a Map from the @Start callback. For instance:</p>
-<div class="codehilite"><pre><span class="nv">@Component</span><span class="p">(</span><span class="n">properties</span><span class="o">=</span><span class="p">{</span><span class="nv">@Property</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">,</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;bar&quot;</span><span class="p">)})</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Component</span><span class="p">(</span><span class="k">properties</span><span class="p">={@</span><span class="n">Property</span><span class="p">(</span><span class="n">name</span><span class="p">=</span>&quot;<span class="n">foo</span>&quot;<span class="p">,</span> <span class="n">value</span><span class="p">=</span>&quot;<span class="n">bar</span>&quot;<span class="p">)})</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">MyServiceImpl</span> <span class="n">implements</span> <span class="n">MyService</span> <span class="p">{</span>
-    <span class="nv">@ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="o">=</span><span class="s">&quot;MyPid&quot;</span><span class="p">,</span> <span class="n">propagate</span><span class="o">=</span><span class="n">true</span><span class="p">)</span>
+    <span class="p">@</span><span class="n">ConfigurationDependency</span><span class="p">(</span><span class="n">pid</span><span class="p">=</span>&quot;<span class="n">MyPid</span>&quot;<span class="p">,</span> <span class="n">propagate</span><span class="p">=</span><span class="n">true</span><span class="p">)</span>
     <span class="n">void</span> <span class="n">updated</span><span class="p">(</span><span class="n">Dictionary</span> <span class="n">conf</span><span class="p">)</span> <span class="p">{</span>
-       <span class="sr">//</span> <span class="s">&quot;conf&quot;</span> <span class="n">contains</span> <span class="n">foo2</span><span class="o">=</span><span class="n">bar2</span><span class="p">,</span> <span class="k">for</span> <span class="n">example</span><span class="p">,</span> <span class="ow">and</span> <span class="n">since</span> <span class="n">we</span> <span class="n">have</span> <span class="n">set</span> <span class="n">the</span> <span class="s">&quot;propagate&quot;</span> <span class="n">attribute</span> <span class="n">to</span> <span class="n">true</span><span class="p">,</span> <span class="k">then</span>
-       <span class="sr">//</span> <span class="n">the</span> <span class="n">property</span> <span class="n">will</span> <span class="n">be</span> <span class="n">propagated</span> <span class="n">to</span> <span class="k">our</span> <span class="n">published</span> <span class="n">service</span> <span class="o">...</span>
+       <span class="o">//</span> &quot;<span class="n">conf</span>&quot; <span class="n">contains</span> <span class="n">foo2</span><span class="p">=</span><span class="n">bar2</span><span class="p">,</span> <span class="k">for</span> <span class="n">example</span><span class="p">,</span> <span class="n">and</span> <span class="n">since</span> <span class="n">we</span> <span class="n">have</span> <span class="n">set</span> <span class="n">the</span> &quot;<span class="n">propagate</span>&quot; <span class="n">attribute</span> <span class="n">to</span> <span class="n">true</span><span class="p">,</span> <span class="n">then</span>
+       <span class="o">//</span> <span class="n">the</span> <span class="n">property</span> <span class="n">will</span> <span class="n">be</span> <span class="n">propagated</span> <span class="n">to</span> <span class="n">our</span> <span class="n">published</span> <span class="n">service</span> <span class="p">...</span>
     <span class="p">}</span>
 
-    <span class="nv">@Start</span>
+    <span class="p">@</span><span class="n">Start</span>
     <span class="n">Map</span> <span class="n">start</span><span class="p">()</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">Return</span> <span class="n">some</span> <span class="n">extra</span> <span class="n">properties</span> <span class="n">to</span> <span class="n">be</span> <span class="n">inserted</span> <span class="n">along</span> <span class="n">with</span> <span class="k">our</span> <span class="n">published</span> <span class="n">properties</span><span class="o">.</span> <span class="n">This</span> <span class="nb">map</span> <span class="n">takes</span>
-        <span class="sr">//</span> <span class="n">precedence</span><span class="p">,</span> <span class="ow">and</span> <span class="n">may</span> <span class="n">override</span> <span class="n">some</span> <span class="n">properties</span> <span class="n">specified</span> <span class="n">in</span> <span class="k">our</span> <span class="nv">@Component</span> <span class="n">annotation</span><span class="p">,</span> <span class="ow">or</span> <span class="n">some</span> <span class="n">properties</span>
-        <span class="sr">//</span> <span class="n">propagated</span> <span class="n">from</span> <span class="k">our</span> <span class="nv">@ConfigurationDependency</span> <span class="n">dependency</span> <span class="o">...</span>
-        <span class="k">return</span> <span class="k">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
+        <span class="o">//</span> <span class="n">Return</span> <span class="n">some</span> <span class="n">extra</span> <span class="k">properties</span> <span class="n">to</span> <span class="n">be</span> <span class="n">inserted</span> <span class="n">along</span> <span class="n">with</span> <span class="n">our</span> <span class="n">published</span> <span class="k">properties</span><span class="p">.</span> <span class="n">This</span> <span class="n">map</span> <span class="n">takes</span>
+        <span class="o">//</span> <span class="n">precedence</span><span class="p">,</span> <span class="n">and</span> <span class="n">may</span> <span class="n">override</span> <span class="n">some</span> <span class="k">properties</span> <span class="n">specified</span> <span class="n">in</span> <span class="n">our</span> <span class="p">@</span><span class="n">Component</span> <span class="n">annotation</span><span class="p">,</span> <span class="n">or</span> <span class="n">some</span> <span class="k">properties</span>
+        <span class="o">//</span> <span class="n">propagated</span> <span class="n">from</span> <span class="n">our</span> <span class="p">@</span><span class="n">ConfigurationDependency</span> <span class="n">dependency</span> <span class="p">...</span>
+        <span class="k">return</span> <span class="n">new</span> <span class="n">HashMap</span><span class="p">()</span> <span class="p">;</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-quick-tour.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-quick-tour.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/apache-felix-dependency-manager-using-annotations-quick-tour.html Fri Jun 14 14:11:44 2013
@@ -49,8 +49,7 @@
 <a href="http://www.apache.org/">asf</a>  <br />
 <a href="http://www.apache.org/security/">security</a>  <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship</a>  <br />
-<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>  <br />
-</p>
+<a href="http://www.apache.org/foundation/thanks.html">sponsors</a>    </p>
 <iframe
     src="http://www.apache.org/ads/button.html"
     style="border-width:0; float: left"