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

[buildbot]

Author: buildbot
Date: Sat Mar  7 23:21:13 2015
New Revision: 942803

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Mar  7 23:21:13 2015
@@ -1 +1 @@
-1664930
+1664931

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html
 Sat Mar  7 23:21:13 2015
@@ -156,30 +156,30 @@ another pid for a second "global" config
         <span class="n">m_config</span> <span class="o">=</span> <span 
class="n">config</span><span class="o">;</span>
     <span class="o">}</span>
 
-   <span class="cm">/**</span>
-<span class="cm">    * All unnamed dependencies are injected: we can now 
configure our dynamic configuration whose dependency name is 
&quot;global&quot;.</span>
-<span class="cm">    */</span>
-   <span class="nd">@Init</span>
-   <span class="n">Map</span> <span class="nf">init</span><span 
class="o">()</span> <span class="o">{</span>
-       <span class="k">return</span> <span class="k">new</span> <span 
class="nf">HashMap</span><span class="o">()</span> <span class="o">;</span>
-   <span class="o">}</span>
+    <span class="cm">/**</span>
+<span class="cm">     * All unnamed dependencies are injected: we can now 
configure our dynamic configuration whose dependency name is 
&quot;global&quot;.</span>
+<span class="cm">     */</span>
+    <span class="nd">@Init</span>
+    <span class="n">Map</span> <span class="nf">init</span><span 
class="o">()</span> <span class="o">{</span>
+    <span class="k">return</span> <span class="k">new</span> <span 
class="nf">HashMap</span><span class="o">()</span> <span class="o">;</span>
+    <span class="o">}</span>
 
-   <span class="c1">// Injected after init, and dynamically configured by the 
init method.</span>
-   <span class="nd">@ConfigurationDependency</span><span 
class="o">(</span><span class="n">name</span><span class="o">=</span><span 
class="s">&quot;global&quot;</span><span class="o">)</span>
-   <span class="kt">void</span> <span 
class="nf">globalConfiguration</span><span class="o">(</span><span 
class="n">Dictionary</span> <span class="n">globalConfig</span><span 
class="o">)</span> <span class="o">{</span>
-       <span class="c1">// you must throw an exception if the configuration is 
not valid</span>
-   <span class="o">}</span>
+    <span class="c1">// Injected after init, and dynamically configured by the 
init method.</span>
+    <span class="nd">@ConfigurationDependency</span><span 
class="o">(</span><span class="n">name</span><span class="o">=</span><span 
class="s">&quot;global&quot;</span><span class="o">)</span>
+    <span class="kt">void</span> <span 
class="nf">globalConfiguration</span><span class="o">(</span><span 
class="n">Dictionary</span> <span class="n">globalConfig</span><span 
class="o">)</span> <span class="o">{</span>
+    <span class="c1">// you must throw an exception if the configuration is 
not valid</span>
+    <span class="o">}</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="nd">@Start</span>
-   <span class="kt">void</span> <span class="nf">start</span><span 
class="o">()</span> <span class="o">{</span>
-   <span class="o">}</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="nd">@Start</span>
+    <span class="kt">void</span> <span class="nf">start</span><span 
class="o">()</span> <span class="o">{</span>
+    <span class="o">}</span>
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1664930 by pderop on Sat, 7 Mar 2015 23:18:17 +0000
+        Rev. 1664931 by pderop on Sat, 7 Mar 2015 23:21:00 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project