felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r865657 [15/27] - in /websites/staging/felix/trunk/content: ./ documentation/ documentation/community/ documentation/development/ documentation/faqs/ documentation/subprojects/ documentation/subprojects/apache-felix-commons/ documentation/s...
Date Fri, 14 Jun 2013 14:11:48 GMT
Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-quickstart.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-quickstart.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-quickstart.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"
@@ -155,21 +154,21 @@ ivy.jar=/opt/apache-ivy-2.0.0-rc2/ivy-2.
 <li><em>spring</em> - this resolves against an OBR index for the SpringSource Enterprise Repository.</li>
 </ul>
 <p>It's also possible to define a <em>filesystem</em> repository based on a local directory containing bundles.</p>
-<div class="codehilite"><pre><span class="c1"># repository config</span>
+<div class="codehilite"><pre><span class="c"># repository config</span>
 
-<span class="o">-</span><span class="n">repositories:</span>  <span class="nb">system</span><span class="p">,</span> <span class="n">project</span><span class="p">,</span> <span class="n">spring</span>
+<span class="o">-</span><span class="n">repositories</span><span class="p">:</span>  <span class="nb">system</span><span class="p">,</span> <span class="n">project</span><span class="p">,</span> <span class="nb">spring</span>
 
-<span class="nb">system</span><span class="p">;</span><span class="n">provider:</span>        <span class="nb">system</span>
-<span class="nb">system</span><span class="p">;</span><span class="n">level:</span>           <span class="o">-</span><span class="mi">1</span>
+<span class="nb">system</span><span class="p">;</span><span class="n">provider</span><span class="p">:</span>        <span class="nb">system</span>
+<span class="nb">system</span><span class="p">;</span><span class="n">level</span><span class="p">:</span>           <span class="o">-</span>1
 
-<span class="n">project</span><span class="p">;</span><span class="n">provider:</span>       <span class="n">project</span>
-<span class="n">project</span><span class="p">;</span><span class="n">level:</span>  <span class="mi">0</span>
-<span class="n">project</span><span class="p">;</span><span class="n">pattern:</span>        <span class="o">..</span><span class="sr">/*/</span><span class="p">[</span><span class="n">sigilproject</span><span class="p">]</span>
+<span class="n">project</span><span class="p">;</span><span class="n">provider</span><span class="p">:</span>       <span class="n">project</span>
+<span class="n">project</span><span class="p">;</span><span class="n">level</span><span class="p">:</span>  0
+<span class="n">project</span><span class="p">;</span><span class="n">pattern</span><span class="p">:</span>        <span class="p">.</span><span class="o">./*/</span><span class="p">[</span><span class="n">sigilproject</span><span class="p">]</span>
 
-<span class="n">spring</span><span class="p">;</span><span class="n">provider:</span>        <span class="n">obr</span>
-<span class="n">spring</span><span class="p">;</span><span class="n">level:</span>           <span class="mi">2</span>
-<span class="n">spring</span><span class="p">;</span><span class="n">url:</span>             <span class="n">http:</span><span class="sr">//sigi</span><span class="n">l</span><span class="o">.</span><span class="n">codecauldron</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">spring</span><span class="o">-</span><span class="n">repository</span><span class="o">.</span><span class="n">obr</span>
-<span class="n">spring</span><span class="p">;</span><span class="nb">index</span><span class="p">:</span>           <span class="o">..</span><span class="sr">/settings/s</span><span class="n">pring</span><span class="o">-</span><span class="n">repository</span><span class="o">.</span><span class="n">obr</span>
+<span class="nb">spring</span><span class="p">;</span><span class="n">provider</span><span class="p">:</span>        <span class="n">obr</span>
+<span class="nb">spring</span><span class="p">;</span><span class="n">level</span><span class="p">:</span>           2
+<span class="nb">spring</span><span class="p">;</span><span class="n">url</span><span class="p">:</span>             <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">sigil</span><span class="p">.</span><span class="n">codecauldron</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="nb">spring</span><span class="o">-</span><span class="n">repository</span><span class="p">.</span><span class="n">obr</span>
+<span class="nb">spring</span><span class="p">;</span><span class="nb">index</span><span class="p">:</span>           <span class="p">.</span><span class="o">./</span><span class="n">settings</span><span class="o">/</span><span class="nb">spring</span><span class="o">-</span><span class="n">repository</span><span class="p">.</span><span class="n">obr</span>
 </pre></div>
 
 
@@ -200,19 +199,19 @@ ivy.jar=/opt/apache-ivy-2.0.0-rc2/ivy-2.
 
 <h3 id="sigilproperties">sigil.properties</h3>
 <p>Placing a sigil.properties file next to an ivy.xml file, causes the sigil-parser to dynamically replace the dependencies contained in ivy.xml with dependencies determined from the -imports property in sigil.properties.</p>
-<div class="codehilite"><pre><span class="c1"># dependee sigil.properties</span>
+<div class="codehilite"><pre><span class="c"># dependee sigil.properties</span>
 
-<span class="n">version:</span> <span class="mf">1.0.0</span>
+<span class="nb">version</span><span class="p">:</span> 1<span class="p">.</span>0<span class="p">.</span>0
 
-<span class="o">-</span><span class="n">bundles:</span> <span class="n">dependee</span>
+<span class="o">-</span><span class="n">bundles</span><span class="p">:</span> <span class="n">dependee</span>
 
-<span class="o">-</span><span class="n">exports:</span> <span class="n">standalone</span>
+<span class="o">-</span><span class="n">exports</span><span class="p">:</span> <span class="n">standalone</span>
 
-<span class="o">-</span><span class="n">imports:</span> <span class="o">\</span>
-  <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">lang</span><span class="p">;</span><span class="n">version</span><span class="o">=</span><span class="s">&quot;[2.0.0,2.4.0)&quot;</span><span class="p">,</span> <span class="o">\</span>
+<span class="o">-</span><span class="n">imports</span><span class="p">:</span> <span class="o">\</span>
+  <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">lang</span><span class="p">;</span><span class="nb">version</span><span class="p">=</span><span class="s">&quot;[2.0.0,2.4.0)&quot;</span><span class="p">,</span> <span class="o">\</span>
 
-<span class="o">-</span><span class="n">resources:</span> <span class="o">\</span>
-  <span class="n">version</span><span class="o">.</span><span class="n">properties</span>
+<span class="o">-</span><span class="n">resources</span><span class="p">:</span> <span class="o">\</span>
+  <span class="nb">version</span><span class="p">.</span><span class="k">properties</span>
 </pre></div>
 
 
@@ -259,11 +258,11 @@ Total time: 6 seconds</p>
 
 <p>-imports: \
   org.apache.commons.lang;version="[2.0.0,2.4.0)"</p>
-<div class="codehilite"><pre><span class="n">in</span> <span class="n">sigil</span><span class="o">.</span><span class="n">properties</span> <span class="n">is</span> <span class="n">resolved</span> <span class="n">to</span> <span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">lang</span><span class="o">-</span><span class="mf">2.1.0</span><span class="o">.</span><span class="n">jar</span><span class="p">,</span> <span class="n">using</span> <span class="n">the</span> <span class="n">OBR</span> <span class="n">resolver</span><span class="o">.</span>
+<div class="codehilite"><pre><span class="n">in</span> <span class="n">sigil</span><span class="p">.</span><span class="k">properties</span> <span class="n">is</span> <span class="n">resolved</span> <span class="n">to</span> <span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">lang</span><span class="o">-</span>2<span class="p">.</span>1<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span><span class="p">,</span> <span class="n">using</span> <span class="n">the</span> <span class="n">OBR</span> <span class="n">resolver</span><span class="p">.</span>
 
-<span class="n">The</span> <span class="n">dependencies</span> <span class="n">in</span> <span class="n">ivy</span><span class="o">.</span><span class="n">xml</span> <span class="n">are</span> <span class="n">ignored</span> <span class="n">by</span> <span class="n">default</span><span class="p">,</span> <span class="n">you</span> <span class="n">can</span> <span class="n">retain</span> <span class="n">them</span> <span class="n">by</span> <span class="n">setting</span> <span class="n">the</span> <span class="n">keepDependencies</span> <span class="n">attribute</span> <span class="n">on</span> <span class="n">the</span> <span class="n">sigil</span><span class="o">-</span><span class="n">parser</span><span class="o">.</span>
+<span class="n">The</span> <span class="n">dependencies</span> <span class="n">in</span> <span class="n">ivy</span><span class="p">.</span><span class="n">xml</span> <span class="n">are</span> <span class="n">ignored</span> <span class="n">by</span> <span class="n">default</span><span class="p">,</span> <span class="n">you</span> <span class="n">can</span> <span class="n">retain</span> <span class="n">them</span> <span class="n">by</span> <span class="n">setting</span> <span class="n">the</span> <span class="n">keepDependencies</span> <span class="n">attribute</span> <span class="n">on</span> <span class="n">the</span> <span class="n">sigil</span><span class="o">-</span><span class="n">parser</span><span class="p">.</span>
 
-<span class="n">Now</span> <span class="n">let</span><span class="s">&#39;s pretend that we&#39;</span><span class="n">ve</span> <span class="n">added</span> <span class="n">some</span> <span class="n">code</span> <span class="n">which</span> <span class="n">requires</span> <span class="n">the</span> <span class="n">following</span> <span class="n">imports</span> <span class="n">in</span> <span class="n">sigil</span><span class="o">.</span><span class="n">properties:</span>
+<span class="n">Now</span> <span class="n">let</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">pretend</span> <span class="n">that</span> <span class="n">we</span><span class="o">&#39;</span><span class="n">ve</span> <span class="n">added</span> <span class="n">some</span> <span class="n">code</span> <span class="n">which</span> <span class="n">requires</span> <span class="n">the</span> <span class="n">following</span> <span class="n">imports</span> <span class="n">in</span> <span class="n">sigil</span><span class="p">.</span><span class="k">properties</span><span class="p">:</span>
 </pre></div>
 
 
@@ -272,57 +271,57 @@ Total time: 6 seconds</p>
   javax.servlet;version="(2.4,3.0]", \
   org.apache.log4j;version="[1.2.14,1.3)", \
   org.apache.commons.logging</p>
-<div class="codehilite"><pre><span class="p">{</span><span class="n">code:bgColor</span><span class="o">=</span><span class="c1">#FFFFCE}</span>
-<span class="nv">$</span> <span class="nv">ant</span> <span class="n">jar</span>
-<span class="n">Buildfile:</span> <span class="n">build</span><span class="o">.</span><span class="n">xml</span>
-
-<span class="n">init:</span>
-
-<span class="n">resolve:</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="o">::</span> <span class="n">Ivy</span> <span class="mf">2.0.0</span><span class="o">-</span><span class="n">rc2</span> <span class="o">-</span> <span class="mi">20081028224207</span> <span class="o">::</span> <span class="n">http:</span><span class="sr">//</span><span class="n">ant</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/ivy/</span> <span class="o">::</span>
-<span class="o">::</span> <span class="n">loading</span> <span class="n">settings</span> <span class="o">::</span> <span class="n">file</span> <span class="o">=</span> <span class="sr">/Volumes/</span><span class="n">Users</span><span class="sr">/derek/sigi</span><span class="n">l</span><span class="o">-</span><span class="mf">0.7.0</span><span class="sr">/example/</span><span class="n">dependence</span><span class="sr">/settings/i</span><span class="n">vysettings</span><span class="o">.</span><span class="n">xml</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">Sigil:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="o">=</span><span class="n">dependee</span> <span class="n">ant</span><span class="o">.</span><span class="n">project</span><span class="o">.</span><span class="n">name</span><span class="o">=</span><span class="n">dependee</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">Sigil:</span> <span class="n">loading</span> <span class="n">Project</span> <span class="n">Repository:</span> <span class="sr">/Volumes/</span><span class="n">Users</span><span class="sr">/derek/sigi</span><span class="n">l</span><span class="o">-</span><span class="mf">0.7.0</span><span class="sr">/example/</span><span class="n">dependence</span><span class="sr">/*/sigi</span><span class="n">l</span><span class="o">.</span><span class="n">properties</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="o">::</span> <span class="n">resolving</span> <span class="n">dependencies</span> <span class="o">::</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="c1">#dependee;working@rodney</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">confs:</span> <span class="p">[</span><span class="n">default</span><span class="p">]</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">Sigil:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="o">=</span><span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">logging</span> <span class="n">ant</span><span class="o">.</span><span class="n">project</span><span class="o">.</span><span class="n">name</span><span class="o">=</span><span class="n">dependee</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span><span class="c1">#com.springsource.org.apache.commons.logging;1.1.1 in sigil</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">Sigil:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="o">=</span><span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">log4j</span> <span class="n">ant</span><span class="o">.</span><span class="n">project</span><span class="o">.</span><span class="n">name</span><span class="o">=</span><span class="n">dependee</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span><span class="c1">#com.springsource.org.apache.log4j;1.2.15 in sigil</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span><span class="c1">#com.springsource.org.apache.commons.lang;2.1.0 in sigil</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">Sigil:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="o">=</span><span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">javax</span><span class="o">.</span><span class="n">servlet</span> <span class="n">ant</span><span class="o">.</span><span class="n">project</span><span class="o">.</span><span class="n">name</span><span class="o">=</span><span class="n">dependee</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span><span class="c1">#com.springsource.javax.servlet;2.5.0 in sigil</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http:</span><span class="sr">//</span><span class="n">repository</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">com</span><span class="sr">/ivy/</span><span class="n">bundles</span><span class="sr">/external/o</span><span class="n">rg</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">/</span>
-    <span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">logging</span><span class="sr">/1.1.1/com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">logging</span><span class="o">-</span><span class="mf">1.1.1</span><span class="o">.</span><span class="n">jar</span> <span class="o">...</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span><span class="c1">#com.springsource.org.apache.commons.logging;1.1.1!com.springsource.org.apache.commons.logging.jar (3180ms)</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http:</span><span class="sr">//</span><span class="n">repository</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">com</span><span class="sr">/ivy/</span><span class="n">bundles</span><span class="sr">/external/o</span><span class="n">rg</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">log4j</span><span class="o">/</span>
-    <span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">log4j</span><span class="sr">/1.2.15/com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">log4j</span><span class="o">-</span><span class="mf">1.2.15</span><span class="o">.</span><span class="n">jar</span> <span class="o">...</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span><span class="c1">#com.springsource.org.apache.log4j;1.2.15!com.springsource.org.apache.log4j.jar (5680ms)</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http:</span><span class="sr">//</span><span class="n">repository</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">com</span><span class="sr">/ivy/</span><span class="n">bundles</span><span class="sr">/external/</span><span class="n">javax</span><span class="o">.</span><span class="n">servlet</span><span class="o">/</span>
-    <span class="n">com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">javax</span><span class="o">.</span><span class="n">servlet</span><span class="sr">/2.5.0/com</span><span class="o">.</span><span class="n">springsource</span><span class="o">.</span><span class="n">javax</span><span class="o">.</span><span class="n">servlet</span><span class="o">-</span><span class="mf">2.5.0</span><span class="o">.</span><span class="n">jar</span> <span class="o">...</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span><span class="c1">#com.springsource.javax.servlet;2.5.0!com.springsource.javax.servlet.jar (1856ms)</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="o">::</span> <span class="n">resolution</span> <span class="n">report</span> <span class="o">::</span> <span class="n">resolve</span> <span class="mi">562</span><span class="n">ms</span> <span class="o">::</span> <span class="n">artifacts</span> <span class="n">dl</span> <span class="mi">10733</span><span class="n">ms</span>
+<div class="codehilite"><pre><span class="p">{</span><span class="n">code</span><span class="p">:</span><span class="n">bgColor</span><span class="p">=</span>#<span class="n">FFFFCE</span><span class="p">}</span>
+$ <span class="n">ant</span> <span class="n">jar</span>
+<span class="n">Buildfile</span><span class="p">:</span> <span class="n">build</span><span class="p">.</span><span class="n">xml</span>
+
+<span class="n">init</span><span class="p">:</span>
+
+<span class="n">resolve</span><span class="p">:</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="p">::</span> <span class="n">Ivy</span> 2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">rc2</span> <span class="o">-</span> 20081028224207 <span class="p">::</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">ant</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">ivy</span><span class="o">/</span> <span class="p">::</span>
+<span class="p">::</span> <span class="n">loading</span> <span class="n">settings</span> <span class="p">::</span> <span class="n">file</span> <span class="p">=</span> <span class="o">/</span><span class="n">Volumes</span><span class="o">/</span><span class="n">Users</span><span class="o">/</span><span class="n">derek</span><span class="o">/</span><span class="n">sigil</span><span class="o">-</span>0<span class="p">.</span>7<span class="p">.</span>0<span class="o">/</span><span class="n">example</span><span class="o">/</span><span class="n">dependence</span><span class="o">/</span><span class="n">settings</span><span class="o">/</span><span class="n">ivysettings</span><span class="p">.</span><span class="n">xml</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">Sigil</span><span class="p">:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="p">=</span><span class="n">dependee</span> <span class="n">ant</span><span class="p">.</span><span class="n">project</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">dependee</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">Sigil</span><span class="p">:</span> <span class="n">loading</span> <span class="n">Project</span> <span class="n">Repository</span><span class="p">:</span> <span class="o">/</span><span class="n">Volumes</span><span class="o">/</span><span class="n">Users</span><span class="o">/</span><span class="n">derek</span><span class="o">/</span><span class="n">sigil</span><span class="o">-</span>0<span class="p">.</span>7<span class="p">.</span>0<span class="o">/</span><span class="n">example</span><span class="o">/</span><span class="n">dependence</span><span class="o">/*/</span><span class="n">sigil</span><span class="p">.</span><span class="k">properties</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="p">::</span> <span class="n">resolving</span> <span class="n">dependencies</span> <span class="p">::</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span>#<span class="n">dependee</span><span class="p">;</span><span class="n">working</span><span class="p">@</span><span class="n">rodney</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">confs</span><span class="p">:</span> <span class="p">[</span><span class="n">default</span><span class="p">]</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">Sigil</span><span class="p">:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="p">=</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span> <span class="n">ant</span><span class="p">.</span><span class="n">project</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">dependee</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="p">;</span>1<span class="p">.</span>1<span class="p">.</span>1 <span class="n">in</span> <span class="n">sigil</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">Sigil</span><span class="p">:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="p">=</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span> <span class="n">ant</span><span class="p">.</span><span class="n">project</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">dependee</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="p">;</span>1<span class="p">.</span>2<span class="p">.</span>15 <span class="n">in</span> <span class="n">sigil</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">lang</span><span class="p">;</span>2<span class="p">.</span>1<span class="p">.</span>0 <span class="n">in</span> <span class="n">sigil</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">Sigil</span><span class="p">:</span> <span class="n">augmenting</span> <span class="n">module</span><span class="p">=</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span> <span class="n">ant</span><span class="p">.</span><span class="n">project</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">dependee</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">found</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="p">;</span>2<span class="p">.</span>5<span class="p">.</span>0 <span class="n">in</span> <span class="n">sigil</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repository</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">ivy</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">external</span><span class="o">/</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="o">/</span>
+    <span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="o">/</span>1<span class="p">.</span>1<span class="p">.</span>1<span class="o">/</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="o">-</span>1<span class="p">.</span>1<span class="p">.</span>1<span class="p">.</span><span class="n">jar</span> <span class="p">...</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="p">;</span>1<span class="p">.</span>1<span class="p">.</span>1!<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="p">.</span><span class="n">jar</span> <span class="p">(</span>318
 0<span class="n">ms</span><span class="p">)</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repository</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">ivy</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">external</span><span class="o">/</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="o">/</span>
+    <span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="o">/</span>1<span class="p">.</span>2<span class="p">.</span>15<span class="o">/</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="o">-</span>1<span class="p">.</span>2<span class="p">.</span>15<span class="p">.</span><span class="n">jar</span> <span class="p">...</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="p">;</span>1<span class="p">.</span>2<span class="p">.</span>15!<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="p">.</span><span class="n">jar</span> <span class="p">(</span>5680<span class="n">ms</span><span class="p">)</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="n">downloading</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repository</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">ivy</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">external</span><span class="o">/</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="o">/</span>
+    <span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="o">/</span>2<span class="p">.</span>5<span class="p">.</span>0<span class="o">/</span><span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="o">-</span>2<span class="p">.</span>5<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="p">...</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="p">[</span><span class="n">SUCCESSFUL</span> <span class="p">]</span> <span class="n">sigil</span>#<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="p">;</span>2<span class="p">.</span>5<span class="p">.</span>0!<span class="n">com</span><span class="p">.</span><span class="n">springsource</span><span class="p">.</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">jar</span> <span class="p">(</span>1856<span class="n">ms</span><span class="p">)</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="p">::</span> <span class="n">resolution</span> <span class="n">report</span> <span class="p">::</span> <span class="n">resolve</span> 562<span class="n">ms</span> <span class="p">::</span> <span class="n">artifacts</span> <span class="n">dl</span> 10733<span class="n">ms</span>
         <span class="o">---------------------------------------------------------------------</span>
         <span class="o">|</span>                  <span class="o">|</span>            <span class="n">modules</span>            <span class="o">||</span>   <span class="n">artifacts</span>   <span class="o">|</span>
         <span class="o">|</span>       <span class="n">conf</span>       <span class="o">|</span> <span class="n">number</span><span class="o">|</span> <span class="n">search</span><span class="o">|</span><span class="n">dwnlded</span><span class="o">|</span><span class="n">evicted</span><span class="o">||</span> <span class="n">number</span><span class="o">|</span><span class="n">dwnlded</span><span class="o">|</span>
         <span class="o">---------------------------------------------------------------------</span>
-        <span class="o">|</span>      <span class="n">default</span>     <span class="o">|</span>   <span class="mi">4</span>   <span class="o">|</span>   <span class="mi">3</span>   <span class="o">|</span>   <span class="mi">3</span>   <span class="o">|</span>   <span class="mi">0</span>   <span class="o">||</span>   <span class="mi">4</span>   <span class="o">|</span>   <span class="mi">3</span>   <span class="o">|</span>
+        <span class="o">|</span>      <span class="n">default</span>     <span class="o">|</span>   4   <span class="o">|</span>   3   <span class="o">|</span>   3   <span class="o">|</span>   0   <span class="o">||</span>   4   <span class="o">|</span>   3   <span class="o">|</span>
         <span class="o">---------------------------------------------------------------------</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="o">::</span> <span class="n">retrieving</span> <span class="o">::</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="c1">#dependee</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="n">confs:</span> <span class="p">[</span><span class="n">default</span><span class="p">]</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span>  <span class="mi">3</span> <span class="n">artifacts</span> <span class="n">copied</span><span class="p">,</span> <span class="mi">1</span> <span class="n">already</span> <span class="n">retrieved</span> <span class="p">(</span><span class="mi">534</span><span class="n">kB</span><span class="o">/</span><span class="mi">50</span><span class="n">ms</span><span class="p">)</span>
-
-<span class="n">compile:</span>
-
-<span class="n">jar:</span>
-<span class="p">[</span><span class="n">propertyfile</span><span class="p">]</span> <span class="n">Updating</span> <span class="n">property</span> <span class="n">file:</span> <span class="sr">/Volumes/</span><span class="n">Users</span><span class="sr">/derek/sigi</span><span class="n">l</span><span class="o">-</span><span class="mf">0.7.0</span><span class="sr">/example/</span><span class="n">dependence</span><span class="sr">/dependee/</span><span class="n">build</span><span class="sr">/classes/</span><span class="n">version</span><span class="o">.</span><span class="n">properties</span>
-<span class="p">[</span><span class="n">sigil</span><span class="o">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">creating</span> <span class="n">bundle:</span> <span class="n">dependee</span>
-<span class="p">[</span><span class="n">sigil</span><span class="o">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">BND:</span> <span class="n">Importing</span> <span class="n">packages</span> <span class="n">that</span> <span class="n">are</span> <span class="n">never</span> <span class="n">refered</span> <span class="n">to</span> <span class="n">by</span> <span class="n">any</span> <span class="n">class</span> <span class="n">on</span> <span class="n">the</span> <span class="n">Bundle</span><span class="o">-</span><span class="n">Classpath</span><span class="p">[</span><span class="n">Jar:dot</span><span class="p">]:</span> 
-    <span class="p">[</span><span class="n">javax</span><span class="o">.</span><span class="n">servlet</span><span class="p">,</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">logging</span><span class="p">,</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">log4j</span><span class="p">]</span>
-<span class="p">[</span><span class="n">sigil</span><span class="o">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">dependee:</span> <span class="mi">0</span> <span class="n">errors</span><span class="p">,</span> <span class="mi">1</span> <span class="n">warning</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="p">::</span> <span class="n">retrieving</span> <span class="p">::</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span>#<span class="n">dependee</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  <span class="n">confs</span><span class="p">:</span> <span class="p">[</span><span class="n">default</span><span class="p">]</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span>  3 <span class="n">artifacts</span> <span class="n">copied</span><span class="p">,</span> 1 <span class="n">already</span> <span class="n">retrieved</span> <span class="p">(</span>534<span class="n">kB</span><span class="o">/</span>50<span class="n">ms</span><span class="p">)</span>
+
+<span class="n">compile</span><span class="p">:</span>
+
+<span class="n">jar</span><span class="p">:</span>
+<span class="p">[</span><span class="n">propertyfile</span><span class="p">]</span> <span class="n">Updating</span> <span class="n">property</span> <span class="n">file</span><span class="p">:</span> <span class="o">/</span><span class="n">Volumes</span><span class="o">/</span><span class="n">Users</span><span class="o">/</span><span class="n">derek</span><span class="o">/</span><span class="n">sigil</span><span class="o">-</span>0<span class="p">.</span>7<span class="p">.</span>0<span class="o">/</span><span class="n">example</span><span class="o">/</span><span class="n">dependence</span><span class="o">/</span><span class="n">dependee</span><span class="o">/</span><span class="n">build</span><span class="o">/</span><span class="n">classes</span><span class="o">/</span><span class="n">version</span><span class="p">.</span><span class="k">properties</span>
+<span class="p">[</span><span class="n">sigil</span><span class="p">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">creating</span> <span class="n">bundle</span><span class="p">:</span> <span class="n">dependee</span>
+<span class="p">[</span><span class="n">sigil</span><span class="p">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">BND</span><span class="p">:</span> <span class="n">Importing</span> <span class="n">packages</span> <span class="n">that</span> <span class="n">are</span> <span class="n">never</span> <span class="n">refered</span> <span class="n">to</span> <span class="n">by</span> <span class="n">any</span> <span class="n">class</span> <span class="n">on</span> <span class="n">the</span> <span class="n">Bundle</span><span class="o">-</span><span class="n">Classpath</span><span class="p">[</span><span class="n">Jar</span><span class="p">:</span><span class="nb">dot</span><span class="p">]:</span> 
+    <span class="p">[</span><span class="n">javax</span><span class="p">.</span><span class="n">servlet</span><span class="p">,</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">commons</span><span class="p">.</span><span class="n">logging</span><span class="p">,</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">log4j</span><span class="p">]</span>
+<span class="p">[</span><span class="n">sigil</span><span class="p">.</span><span class="n">bundle</span><span class="p">]</span> <span class="n">dependee</span><span class="p">:</span> 0 <span class="n">errors</span><span class="p">,</span> 1 <span class="n">warning</span>
 
 <span class="n">BUILD</span> <span class="n">SUCCESSFUL</span>
-<span class="n">Total</span> <span class="nb">time</span><span class="p">:</span> <span class="mi">16</span> <span class="n">seconds</span>
+<span class="n">Total</span> <span class="n">time</span><span class="p">:</span> 16 <span class="n">seconds</span>
 </pre></div>
 
 

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-settings.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-settings.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-ivy/apache-felix-sigil-ivy-settings.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-junit.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-junit.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-junit.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"
@@ -76,38 +75,38 @@
       <h1>Sigil JUnit</h1>
       <h2 id="overview">Overview</h2>
 <p>The Sigil JUnit plugin is an OSGi bundle that when started in an OSGi enabled JVM watches for other bundles that contain JUnit TestCase classes in the framework. The main access point to the plugin is the <code>org.cauldron.sigil.junit.server.JUnitService</code>.</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>JUnitService.java|borderStyle=solid</B></DIV><DIV class="codeContent panelContent">
-    package org.cauldron.sigil.junit.server;</p>
-<div class="codehilite"><pre><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">Set</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">junit</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">TestSuite</span><span class="p">;</span>
-
-<span class="o">/**</span>
- <span class="o">*</span>
- <span class="o">*/</span> 
-<span class="n">public</span> <span class="n">interface</span> <span class="n">JUnitService</span> <span class="p">{</span>
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">Returns</span> <span class="n">the</span> <span class="n">names</span> <span class="n">of</span> <span class="n">all</span> <span class="n">tests</span> <span class="n">currently</span> <span class="n">installed</span> <span class="n">in</span> <span class="n">the</span> <span class="n">OSGi</span> <span class="n">runtime</span>
-     <span class="o">*/</span> 
-    <span class="n">Set</span><span class="sr">&lt;String&gt;</span> <span class="n">getTests</span><span class="p">();</span>
-
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">Create</span> <span class="n">a</span> <span class="k">new</span> <span class="n">instance</span> <span class="n">of</span> <span class="n">the</span> <span class="n">specified</span> <span class="n">test</span><span class="o">.</span> <span class="n">Equivalent</span> <span class="n">to</span> <span class="n">calling</span> <span class="n">createTest</span><span class="p">(</span><span class="n">test</span><span class="p">,</span> <span class="n">null</span><span class="p">);</span>
-     <span class="o">*/</span> 
-    <span class="n">TestSuite</span> <span class="n">createTest</span><span class="p">(</span><span class="n">String</span> <span class="n">test</span><span class="p">);</span>
-
-    <span class="o">/**</span>
-     <span class="o">*</span> <span class="n">Create</span> <span class="n">a</span> <span class="k">new</span> <span class="n">instance</span> <span class="n">of</span> <span class="n">the</span> <span class="n">specified</span> <span class="n">test</span> <span class="n">passing</span> <span class="n">the</span> <span class="n">specified</span> <span class="n">bundle</span> <span class="n">context</span> <span class="n">to</span> <span class="n">the</span> <span class="n">test</span> <span class="n">classes</span><span class="o">.</span>
-     <span class="o">*</span> <span class="n">If</span> <span class="n">ctx</span> <span class="n">is</span> <span class="n">null</span> <span class="n">the</span> <span class="n">callers</span> <span class="n">BundleContext</span> <span class="n">is</span> <span class="n">passed</span> <span class="n">to</span> <span class="n">the</span> <span class="n">test</span><span class="o">.</span>
-     <span class="o">*/</span> 
-    <span class="n">TestSuite</span> <span class="n">createTest</span><span class="p">(</span><span class="n">String</span> <span class="n">test</span><span class="p">,</span> <span class="n">BundleContext</span> <span class="n">ctx</span><span class="p">);</span>
-<span class="p">}</span>
-</pre></div>
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>JUnitService.java|borderStyle=solid</B></DIV><DIV class="codeContent panelContent">
+    package org.cauldron.sigil.junit.server;
 
+    import java.util.Set;
 
-<p>When a test is created the <code>JUnitService</code> introspects the test class and looks for a method <code>public void setBundleContext(BundleContext ctx);</code> if one is found then the BundleContext is injected into the test class before being returned to the caller. </p>
+    import org.osgi.framework.BundleContext;
+
+    import junit.framework.TestSuite;
+
+    /**
+     *
+     */ 
+    public interface JUnitService {
+        /**
+         * Returns the names of all tests currently installed in the OSGi runtime
+         */ 
+        Set<String> getTests();
+
+        /**
+         * Create a new instance of the specified test. Equivalent to calling createTest(test, null);
+         */ 
+        TestSuite createTest(String test);
+
+        /**
+         * Create a new instance of the specified test passing the specified bundle context to the test classes.
+         * If ctx is null the callers BundleContext is passed to the test.
+         */ 
+        TestSuite createTest(String test, BundleContext ctx);
+    }
+
+
+When a test is created the `JUnitService` introspects the test class and looks for a method `public void setBundleContext(BundleContext ctx);` if one is found then the BundleContext is injected into the test class before being returned to the caller.
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
         Rev. 1422427 by fmeschbe on Sun, 16 Dec 2012 00:36:51 +0000
       </div>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-projects.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-projects.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-projects.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"
@@ -77,46 +76,60 @@
       <h1 id="sigil-projects">Sigil Projects</h1>
 <p>This page is meant as an overview of how to set up sigil projects, for an in depth look at the file format see <a href="/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.html">Sigil Properties</a>.</p>
 <h3 id="basics">Basics</h3>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
     -bundles: org.foo
     -version: 1.0.0
     -exports: org.foo.api
     -imports: org.foo.api
-    -sourcedirs: src</p>
-<p>This describes a bundle with symbolic name org.foo that has version 1.0.0 and embeds all java classes found in the folder src within our bundle. It exports the package org.foo.api and imports the package org.foo.api. If we assume that the src folder contains classes in the package org.foo.api then both the exports and imports will also inherit the version from the bundle (as no explicit version is specified).</p>
-<h3 id="version-management">Version management</h3>
-<p>If we wanted to have explicit control we could do:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
+    -sourcedirs: src
+
+This describes a bundle with symbolic name org.foo that has version 1.0.0 and embeds all java classes found in the folder src within our bundle. It exports the package org.foo.api and imports the package org.foo.api. If we assume that the src folder contains classes in the package org.foo.api then both the exports and imports will also inherit the version from the bundle (as no explicit version is specified).
+
+### Version management
+
+If we wanted to have explicit control we could do:
+
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
     -bundles: org.foo
     -version: 1.1.0
     -exports: org.foo.api;version=1.1.1
     -imports: org.foo.api;version=[1.0,1.2)
-    -sourcedirs: src</p>
-<h3 id="multi-project-builds">Multi project builds</h3>
-<p>You can also set default versions and import ranges in your project hierarchy so leaf projects inherit the version strategy of their parent:</p>
-<div class="codehilite"><pre><span class="o">+</span> <span class="n">project</span>
-   <span class="o">+</span> <span class="n">sigil</span><span class="o">-</span><span class="n">defaults</span><span class="o">.</span><span class="n">properties</span>
-   <span class="o">+</span> <span class="n">leaf</span><span class="o">-</span><span class="n">project</span>
-      <span class="o">+</span> <span class="n">sigil</span><span class="o">.</span><span class="n">properties</span>
-      <span class="o">+</span> <span class="n">src</span>
-         <span class="o">+</span> <span class="n">org</span>
-            <span class="o">+</span> <span class="n">foo</span>
-               <span class="o">+</span> <span class="n">api</span>
-                  <span class="o">+</span> <span class="n">Foo</span><span class="o">.</span><span class="n">java</span>
-</pre></div>
+    -sourcedirs: src
+
+
+### Multi project builds
+
+You can also set default versions and import ranges in your project hierarchy so leaf projects inherit the version strategy of their parent:
+
 
+    + project
+       + sigil-defaults.properties
+       + leaf-project
+          + sigil.properties
+          + src
+             + org
+                + foo
+                   + api
+                      + Foo.java
 
-<p>If we define in sigil-defaults.properties:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil-defaults.properties</B></DIV><DIV class="codeContent panelContent">
+
+If we define in sigil-defaults.properties:
+
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil-defaults.properties</B></DIV><DIV class="codeContent panelContent">
     version: 1.1.0
-    package;org.foo.api: [1.0,1.2)</p>
-<p>Then we could change our sigil.properties file to:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
+    package;org.foo.api: [1.0,1.2)
+
+
+Then we could change our sigil.properties file to:
+
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sigil.properties</B></DIV><DIV class="codeContent panelContent">
     -bundles: org.foo
     -exports: org.foo.api;version=1.1.1
     -imports: org.foo.api
-    -sourcedirs: src</p>
-<p>Where the bundle version and the import range is inherited from the package;org.foo.api property from the parent sigil-defaults.properties file.</p>
+    -sourcedirs: src
+
+
+Where the bundle version and the import range is inherited from the package;org.foo.api property from the parent sigil-defaults.properties file.
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
         Rev. 1422427 by fmeschbe on Sun, 16 Dec 2012 00:36:51 +0000
       </div>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-properties.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-filesystem.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-filesystem.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-filesystem.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-sigil/sigil-user-guide/sigil-repositories/apache-felix-sigil-obr.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"
@@ -80,7 +79,7 @@
 <h2 id="available-repositories">Available Repositories</h2>
 <p>The following is a list of OBR repositories.
 - Felix Repository</p>
-<div class="codehilite"><pre><span class="n">http:</span><span class="sr">//</span><span class="n">felix</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/obr/</span><span class="n">releases</span><span class="o">.</span><span class="n">xml</span>
+<div class="codehilite"><pre><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">felix</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">obr</span><span class="o">/</span><span class="n">releases</span><span class="p">.</span><span class="n">xml</span>
 </pre></div>
 
 

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-acknowledgments.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-acknowledgments.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-acknowledgments.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-driver-architecture.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-driver-architecture.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-driver-architecture.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-getting-started.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-getting-started.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-getting-started.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-known-issues.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-known-issues.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-known-issues.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples.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"

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples/upnp-writing-cd-and-cp.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples/upnp-writing-cd-and-cp.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples/upnp-writing-cd-and-cp.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"
@@ -82,33 +81,33 @@
 <h2 id="the-extra-bundle-and-the-driver-interfaces">The Extra bundle and the driver interfaces</h2>
 <p>We provide some utility classes and services through the extra bundle and the services registered by the UPnP Base Driver.</p>
 <p>In the Extra bundle the class <a href="http://svn.apache.org/viewvc/felix/trunk/upnp/extra/src/main/java/org/apache/felix/upnp/extra/util/UPnPSubscriber.java?view=markup">org.apache.felix.upnp.extra.util.UPnPSubscriber</a> can be instantiated to subscribe one or more services. The constructor takes two parameters a [BundleContext |http://www.osgi.org/javadoc/r4/org/osgi/framework/BundleContext.html] reference and a [UPnPEventListener |http://www.osgi.org/javadoc/r4/org/osgi/service/upnp/UPnPEventListener.html] reference. In this class the method subscribe(Filter aFilter) is a general and powerful way to subscribe to any service by using an [LDAP filter|http://www.osgi.org/javadoc/r4/org/osgi/framework/Filter.html]. For example by using the string :</p>
-<div class="codehilite"><pre><span class="s">&quot;(&amp; (UPnP.device.type=urn:schemas-upnp-org:device:BinaryLight:1) (UPnP.service.type= urn:schemas-upnp-org:service:SwitchPower:1))&quot;</span>
+<div class="codehilite"><pre>&quot;<span class="p">(</span><span class="o">&amp;</span> <span class="p">(</span><span class="n">UPnP</span><span class="p">.</span><span class="n">device</span><span class="p">.</span><span class="n">type</span><span class="p">=</span><span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">device</span><span class="p">:</span><span class="n">BinaryLight</span><span class="p">:</span>1<span class="p">)</span> <span class="p">(</span><span class="n">UPnP</span><span class="p">.</span><span class="n">service</span><span class="p">.</span><span class="n">type</span><span class="p">=</span> <span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:<
 /span><span class="n">service</span><span class="p">:</span><span class="n">SwitchPower</span><span class="p">:</span>1<span class="p">))</span>&quot;
 </pre></div>
 
 
 <p>we would subscribe to the SwitchPower service offered by any device implementing the BinaryLight profile. Looking at the Felix UPnP TV sample code, the UPnPSubscriber class is used in the file <a href="http://svn.apache.org/viewvc/felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java?view=markup">org.apache.felix.upnp.sample.tv.TVDevice</a> to subscribe to the different service types offered by the Cyberlink sample devices. However, in this case, the utility method {color:black}{<em>}subscribeEveryServiceType{</em>}{color} is used to provide just the device and service types.</p>
-<div class="codehilite"><pre><span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">CLOCK_DEVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:device:clock:1&quot;</span><span class="p">;</span>
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">TIME_SERVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:service:timer:1&quot;</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">CLOCK_DEVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">device</span><span class="p">:</span><span class="n">clock</span><span class="p">:</span>1&quot;<span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">TIME_SERVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">service</span><span class="p">:</span><span class="n">timer</span><span class="p">:</span>1&quot;<span class="p">;</span>
 
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">LIGHT_DEVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:device:light:1&quot;</span><span class="p">;</span>
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">POWER_SERVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:service:power:1&quot;</span><span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">LIGHT_DEVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">device</span><span class="p">:</span><span class="n">light</span><span class="p">:</span>1&quot;<span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">POWER_SERVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">service</span><span class="p">:</span><span class="n">power</span><span class="p">:</span>1&quot;<span class="p">;</span>
 
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">AIRCON_DEVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:device:aircon:1&quot;</span><span class="p">;</span>
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">TEMP_SERVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:service:temp:1&quot;</span><span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">AIRCON_DEVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">device</span><span class="p">:</span><span class="n">aircon</span><span class="p">:</span>1&quot;<span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">TEMP_SERVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">service</span><span class="p">:</span><span class="n">temp</span><span class="p">:</span>1&quot;<span class="p">;</span>
 
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">WASHER_DEVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:device:washer:1&quot;</span><span class="p">;</span>
-<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">STATUS_SERVICE_TYPE</span> <span class="o">=</span> <span class="s">&quot;urn:schemas-upnp-org:service:state:1&quot;</span><span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">WASHER_DEVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">device</span><span class="p">:</span><span class="n">washer</span><span class="p">:</span>1&quot;<span class="p">;</span>
+<span class="n">private</span> <span class="n">final</span> <span class="n">static</span> <span class="n">String</span> <span class="n">STATUS_SERVICE_TYPE</span> <span class="p">=</span> &quot;<span class="n">urn</span><span class="p">:</span><span class="n">schemas</span><span class="o">-</span><span class="n">upnp</span><span class="o">-</span><span class="n">org</span><span class="p">:</span><span class="n">service</span><span class="p">:</span><span class="n">state</span><span class="p">:</span>1&quot;<span class="p">;</span>
 
 <span class="n">public</span> <span class="n">void</span> <span class="n">doSubscribe</span><span class="p">()</span> <span class="p">{</span>
-  <span class="n">subscriber</span> <span class="o">=</span> <span class="k">new</span> <span class="n">UPnPSubscriber</span><span class="p">(</span><span class="n">Activator</span><span class="o">.</span><span class="n">context</span><span class="p">,</span> <span class="n">this</span><span class="p">);</span>
-  <span class="n">subscriber</span><span class="o">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">CLOCK_DEVICE_TYPE</span><span class="p">,</span> <span class="n">TIME_SERVICE_TYPE</span><span class="p">);</span>
-  <span class="n">subscriber</span><span class="o">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">AIRCON_DEVICE_TYPE</span><span class="p">,</span> <span class="n">TEMP_SERVICE_TYPE</span><span class="p">);</span>
-  <span class="n">subscriber</span><span class="o">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">LIGHT_DEVICE_TYPE</span><span class="p">,</span> <span class="n">POWER_SERVICE_TYPE</span><span class="p">);</span>
-  <span class="n">subscriber</span><span class="o">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">WASHER_DEVICE_TYPE</span><span class="p">,</span> <span class="n">STATUS_SERVICE_TYPE</span><span class="p">);</span>
+  <span class="n">subscriber</span> <span class="p">=</span> <span class="n">new</span> <span class="n">UPnPSubscriber</span><span class="p">(</span><span class="n">Activator</span><span class="p">.</span><span class="n">context</span><span class="p">,</span> <span class="n">this</span><span class="p">);</span>
+  <span class="n">subscriber</span><span class="p">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">CLOCK_DEVICE_TYPE</span><span class="p">,</span> <span class="n">TIME_SERVICE_TYPE</span><span class="p">);</span>
+  <span class="n">subscriber</span><span class="p">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">AIRCON_DEVICE_TYPE</span><span class="p">,</span> <span class="n">TEMP_SERVICE_TYPE</span><span class="p">);</span>
+  <span class="n">subscriber</span><span class="p">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">LIGHT_DEVICE_TYPE</span><span class="p">,</span> <span class="n">POWER_SERVICE_TYPE</span><span class="p">);</span>
+  <span class="n">subscriber</span><span class="p">.</span><span class="n">subscribeEveryServiceType</span><span class="p">(</span><span class="n">WASHER_DEVICE_TYPE</span><span class="p">,</span> <span class="n">STATUS_SERVICE_TYPE</span><span class="p">);</span>
 <span class="p">}</span>
 
 <span class="n">public</span> <span class="n">void</span> <span class="n">undoSubscribe</span><span class="p">(){</span>
-       <span class="n">subscriber</span><span class="o">.</span><span class="n">unsubscribeAll</span><span class="p">();}</span>
+       <span class="n">subscriber</span><span class="p">.</span><span class="n">unsubscribeAll</span><span class="p">();}</span>
 </pre></div>
 
 

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-user-admin.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"



Mime
View raw message