svn commit: r942804 - 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:22:50 2015
New Revision: 942804

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:22:50 2015
@@ -1 +1 @@
-1664931
+1664932

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:22:50 2015
@@ -161,13 +161,16 @@ another pid for a second "global" config
 <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="n">Map</span> <span class="n">properties</span> <span 
class="o">=</span> <span class="k">new</span> <span 
class="n">HashMap</span><span class="o">();</span>
+        <span class="n">properties</span><span class="o">.</span><span 
class="na">put</span><span class="o">(</span><span 
class="s">&quot;global.pid&quot;</span><span class="o">,</span> <span 
class="n">m_config</span><span class="o">.</span><span 
class="na">get</span><span class="o">(</span><span 
class="s">&quot;globalConfig.pid&quot;</span><span class="o">));</span>
+        <span class="n">properties</span><span class="o">.</span><span 
class="na">put</span><span class="o">(</span><span 
class="s">&quot;global.propagate&quot;</span><span class="o">,</span> <span 
class="n">m_config</span><span class="o">.</span><span 
class="na">get</span><span class="o">(</span><span 
class="s">&quot;globalConfig.propagate&quot;</span><span class="o">));</span>
+        <span class="k">return</span> <span class="n">properties</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="c1">// you must throw an exception if the configuration 
is not valid</span>
     <span class="o">}</span>
 
     <span class="cm">/**</span>
@@ -179,7 +182,7 @@ another pid for a second "global" config
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1664931 by pderop on Sat, 7 Mar 2015 23:21:00 +0000
+        Rev. 1664932 by pderop on Sat, 7 Mar 2015 23:22:37 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project