felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r865657 [17/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-web-console/web-console-security-provider.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/web-console-security-provider.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-web-console/web-console-security-provider.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"
@@ -112,45 +111,47 @@ public Object authenticate( String usern
  </em>/
 public boolean authorize( Object user, String role );</p>
 <div class="codehilite"><pre><span class="p">{</span><span class="n">note</span><span class="p">}</span>
-<span class="n">Use</span> <span class="n">of</span> <span class="n">the</span>  <span class="n">method</span> <span class="n">is</span> <span class="ow">not</span> <span class="n">currently</span> <span class="n">implemented</span><span class="p">,</span> <span class="n">though</span><span class="o">.</span> <span class="n">Mainly</span> <span class="n">this</span> <span class="n">is</span> <span class="n">because</span> <span class="n">it</span> <span class="n">is</span> <span class="ow">not</span> <span class="n">readily</span> <span class="n">clear</span><span class="p">,</span> <span class="n">what</span> <span class="n">exactly</span> <span class="n">the</span>  <span class="n">means</span><span class="o">.</span> <span class="n">One</span> <span class="n">possible</span> <span class="n">interpretation</span> <span class="n">could</span> <span class="n">be</span> <span class="n">that</span> <span class="n">this</span> <span class="n">is</span> <span class="n">the</span
 > <span class="n">label</span> <span class="n">of</span> <span class="n">the</span> <span class="n">plugin</span> <span class="n">whose</span> <span class="n">access</span> <span class="n">is</span> <span class="n">checked</span><span class="o">.</span> <span class="n">Or</span> <span class="n">it</span> <span class="n">might</span> <span class="n">be</span> <span class="n">a</span> <span class="n">combination</span> <span class="n">of</span> <span class="n">the</span> <span class="n">plugin</span> <span class="n">called</span> <span class="ow">and</span> <span class="n">the</span> <span class="n">request</span> <span class="n">method</span> <span class="n">used</span><span class="o">.</span>
+<span class="n">Use</span> <span class="n">of</span> <span class="n">the</span>  <span class="n">method</span> <span class="n">is</span> <span class="n">not</span> <span class="n">currently</span> <span class="n">implemented</span><span class="p">,</span> <span class="n">though</span><span class="p">.</span> <span class="n">Mainly</span> <span class="n">this</span> <span class="n">is</span> <span class="n">because</span> <span class="n">it</span> <span class="n">is</span> <span class="n">not</span> <span class="n">readily</span> <span class="n">clear</span><span class="p">,</span> <span class="n">what</span> <span class="n">exactly</span> <span class="n">the</span>  <span class="n">means</span><span class="p">.</span> <span class="n">One</span> <span class="n">possible</span> <span class="n">interpretation</span> <span class="n">could</span> <span class="n">be</span> <span class="n">that</span> <span class="n">this</span> <span class="n">is</span> <span class="n">the</span> 
 <span class="n">label</span> <span class="n">of</span> <span class="n">the</span> <span class="n">plugin</span> <span class="n">whose</span> <span class="n">access</span> <span class="n">is</span> <span class="n">checked</span><span class="p">.</span> <span class="n">Or</span> <span class="n">it</span> <span class="n">might</span> <span class="n">be</span> <span class="n">a</span> <span class="n">combination</span> <span class="n">of</span> <span class="n">the</span> <span class="n">plugin</span> <span class="n">called</span> <span class="n">and</span> <span class="n">the</span> <span class="n">request</span> <span class="n">method</span> <span class="n">used</span><span class="p">.</span>
 <span class="p">{</span><span class="n">note</span><span class="p">}</span>
 
-<span class="n">The</span> <span class="n">drawback</span> <span class="n">of</span> <span class="n">the</span>  <span class="n">interface</span> <span class="n">is</span> <span class="n">that</span> <span class="n">it</span> <span class="n">just</span> <span class="n">provides</span> <span class="n">a</span> <span class="n">mechanism</span> <span class="n">to</span> <span class="n">check</span> <span class="k">for</span> <span class="n">a</span> <span class="n">user</span> <span class="n">name</span> <span class="ow">and</span> <span class="n">password</span> <span class="n">using</span> <span class="n">HTTP</span> <span class="n">BASIC</span> <span class="n">authentication</span><span class="o">.</span> <span class="n">If</span> <span class="n">other</span> <span class="n">authenication</span> <span class="n">mechanisms</span> <span class="n">should</span> <span class="n">be</span> <span class="n">used</span> <span class="n">the</span>  <span class="n">interface</span> <sp
 an class="n">introduced</span> <span class="n">in</span> <span class="n">Apache</span> <span class="n">Felix</span> <span class="n">Web</span> <span class="n">Console</span> <span class="mf">3.1.4</span> <span class="n">can</span> <span class="n">be</span> <span class="n">used</span><span class="o">.</span>
+<span class="n">The</span> <span class="n">drawback</span> <span class="n">of</span> <span class="n">the</span>  <span class="n">interface</span> <span class="n">is</span> <span class="n">that</span> <span class="n">it</span> <span class="n">just</span> <span class="n">provides</span> <span class="n">a</span> <span class="n">mechanism</span> <span class="n">to</span> <span class="n">check</span> <span class="k">for</span> <span class="n">a</span> <span class="n">user</span> <span class="n">name</span> <span class="n">and</span> <span class="n">password</span> <span class="n">using</span> <span class="n">HTTP</span> <span class="n">BASIC</span> <span class="n">authentication</span><span class="p">.</span> <span class="n">If</span> <span class="n">other</span> <span class="n">authenication</span> <span class="n">mechanisms</span> <span class="n">should</span> <span class="n">be</span> <span class="n">used</span> <span class="n">the</span>  <span class="n">interface</span> <spa
 n class="n">introduced</span> <span class="n">in</span> <span class="n">Apache</span> <span class="n">Felix</span> <span class="n">Web</span> <span class="n">Console</span> 3<span class="p">.</span>1<span class="p">.</span>4 <span class="n">can</span> <span class="n">be</span> <span class="n">used</span><span class="p">.</span>
 
-<span class="n">h2</span><span class="o">.</span> <span class="n">WebConsoleSecurityProvider2</span>
 
-<span class="n">The</span>  <span class="n">interface</span> <span class="n">extends</span> <span class="n">the</span>  <span class="n">by</span> <span class="n">a</span> <span class="n">single</span> <span class="n">method:</span>
+<span class="n">h2</span><span class="p">.</span> <span class="n">WebConsoleSecurityProvider2</span>
 
-<span class="p">{</span><span class="n">code:java</span><span class="p">}</span>
+<span class="n">The</span>  <span class="n">interface</span> <span class="n">extends</span> <span class="n">the</span>  <span class="n">by</span> <span class="n">a</span> <span class="n">single</span> <span class="n">method</span><span class="p">:</span>
+
+<span class="p">{</span><span class="n">code</span><span class="p">:</span><span class="n">java</span><span class="p">}</span>
 <span class="o">/**</span>
  <span class="o">*</span> <span class="n">The</span> <span class="n">name</span> <span class="n">of</span> <span class="n">the</span> <span class="n">request</span> <span class="n">attribute</span> <span class="n">providing</span> <span class="n">the</span> <span class="n">object</span> <span class="n">representing</span> <span class="n">the</span>
- <span class="o">*</span> <span class="n">authenticated</span> <span class="n">user</span><span class="o">.</span> <span class="n">This</span> <span class="n">object</span> <span class="n">is</span> <span class="n">used</span> <span class="n">to</span> <span class="n">call</span> <span class="n">the</span>
- <span class="o">*</span> <span class="p">{</span><span class="nv">@link</span> <span class="n">WebConsoleSecurityProvider</span><span class="c1">#authorize(Object, String)} to</span>
- <span class="o">*</span> <span class="n">authorize</span> <span class="n">access</span> <span class="k">for</span> <span class="n">certain</span> <span class="n">roles</span><span class="o">.</span>
+ <span class="o">*</span> <span class="n">authenticated</span> <span class="n">user</span><span class="p">.</span> <span class="n">This</span> <span class="n">object</span> <span class="n">is</span> <span class="n">used</span> <span class="n">to</span> <span class="n">call</span> <span class="n">the</span>
+ <span class="o">*</span> <span class="p">{@</span><span class="n">link</span> <span class="n">WebConsoleSecurityProvider</span>#<span class="n">authorize</span><span class="p">(</span><span class="n">Object</span><span class="p">,</span> <span class="n">String</span><span class="p">)}</span> <span class="n">to</span>
+ <span class="o">*</span> <span class="n">authorize</span> <span class="n">access</span> <span class="k">for</span> <span class="n">certain</span> <span class="n">roles</span><span class="p">.</span>
  <span class="o">*/</span>
-<span class="n">String</span> <span class="n">USER_ATTRIBUTE</span> <span class="o">=</span> <span class="s">&quot;org.apache.felix.webconsole.user&quot;</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">USER_ATTRIBUTE</span> <span class="p">=</span> &quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">.</span><span class="n">webconsole</span><span class="p">.</span><span class="n">user</span>&quot;<span class="p">;</span>
+
 
 <span class="o">/**</span>
- <span class="o">*</span> <span class="n">Authenticates</span> <span class="n">the</span> <span class="n">given</span> <span class="n">request</span> <span class="ow">or</span> <span class="n">asks</span> <span class="n">the</span> <span class="n">client</span> <span class="k">for</span> <span class="n">credentials</span><span class="o">.</span>
- <span class="o">*</span> <span class="sr">&lt;p&gt;</span>
- <span class="o">*</span> <span class="n">Implementations</span> <span class="n">of</span> <span class="n">this</span> <span class="n">method</span> <span class="n">are</span> <span class="n">expected</span> <span class="n">to</span> <span class="n">respect</span> <span class="ow">and</span> <span class="n">implement</span>
- <span class="o">*</span> <span class="n">the</span> <span class="n">semantics</span> <span class="n">of</span> <span class="n">the</span> <span class="sr">&lt;code&gt;</span><span class="n">HttpContext</span><span class="o">.</span><span class="n">handleSecurity</span><span class="sr">&lt;/code&gt;</span> <span class="n">method</span>
- <span class="o">*</span> <span class="n">as</span> <span class="n">specified</span> <span class="n">in</span> <span class="n">the</span> <span class="n">OSGi</span> <span class="n">HTTP</span> <span class="n">Service</span> <span class="n">specification</span><span class="o">.</span>
- <span class="o">*</span> <span class="sr">&lt;p&gt;</span>
- <span class="o">*</span> <span class="n">If</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span> <span class="sr">&lt;code&gt;</span><span class="n">true</span><span class="sr">&lt;/code&gt;</span> <span class="n">it</span> <span class="n">is</span> <span class="n">assumed</span> <span class="n">the</span> <span class="n">request</span>
+ <span class="o">*</span> <span class="n">Authenticates</span> <span class="n">the</span> <span class="n">given</span> <span class="n">request</span> <span class="n">or</span> <span class="n">asks</span> <span class="n">the</span> <span class="n">client</span> <span class="k">for</span> <span class="n">credentials</span><span class="p">.</span>
+ <span class="o">*</span> <span class="o">&lt;</span><span class="n">p</span><span class="o">&gt;</span>
+ <span class="o">*</span> <span class="n">Implementations</span> <span class="n">of</span> <span class="n">this</span> <span class="n">method</span> <span class="n">are</span> <span class="n">expected</span> <span class="n">to</span> <span class="n">respect</span> <span class="n">and</span> <span class="n">implement</span>
+ <span class="o">*</span> <span class="n">the</span> <span class="n">semantics</span> <span class="n">of</span> <span class="n">the</span> <span class="o">&lt;</span><span class="n">code</span><span class="o">&gt;</span><span class="n">HttpContext</span><span class="p">.</span><span class="n">handleSecurity</span><span class="o">&lt;/</span><span class="n">code</span><span class="o">&gt;</span> <span class="n">method</span>
+ <span class="o">*</span> <span class="n">as</span> <span class="n">specified</span> <span class="n">in</span> <span class="n">the</span> <span class="n">OSGi</span> <span class="n">HTTP</span> <span class="n">Service</span> <span class="n">specification</span><span class="p">.</span>
+ <span class="o">*</span> <span class="o">&lt;</span><span class="n">p</span><span class="o">&gt;</span>
+ <span class="o">*</span> <span class="n">If</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span> <span class="o">&lt;</span><span class="n">code</span><span class="o">&gt;</span><span class="n">true</span><span class="o">&lt;/</span><span class="n">code</span><span class="o">&gt;</span> <span class="n">it</span> <span class="n">is</span> <span class="n">assumed</span> <span class="n">the</span> <span class="n">request</span>
  <span class="o">*</span> <span class="n">provided</span> <span class="n">valid</span> <span class="n">credentials</span> <span class="n">identifying</span> <span class="n">the</span> <span class="n">user</span> <span class="n">as</span> <span class="n">accepted</span> <span class="n">to</span> <span class="n">access</span>
- <span class="o">*</span> <span class="n">the</span> <span class="n">web</span> <span class="n">console</span><span class="o">.</span> <span class="n">In</span> <span class="n">addition</span><span class="p">,</span> <span class="n">the</span> <span class="p">{</span><span class="nv">@link</span> <span class="c1">#USER_ATTRIBUTE} request</span>
- <span class="o">*</span> <span class="n">attribute</span> <span class="n">must</span> <span class="n">be</span> <span class="n">set</span> <span class="n">to</span> <span class="n">a</span> <span class="n">non</span><span class="o">-</span><span class="sr">&lt;code&gt;</span><span class="n">null</span><span class="sr">&lt;/code&gt;</span> <span class="n">object</span> <span class="n">reference</span>
- <span class="o">*</span> <span class="n">identifying</span> <span class="n">the</span> <span class="n">authenticated</span> <span class="n">user</span><span class="o">.</span>
- <span class="o">*</span> <span class="sr">&lt;p&gt;</span>
- <span class="o">*</span> <span class="n">If</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span> <span class="sr">&lt;code&gt;</span><span class="n">false</span><span class="sr">&lt;/code&gt;</span> <span class="n">the</span> <span class="n">request</span> <span class="n">to</span> <span class="n">the</span> <span class="n">web</span> <span class="n">console</span>
- <span class="o">*</span> <span class="n">is</span> <span class="n">terminated</span> <span class="n">without</span> <span class="n">any</span> <span class="n">more</span> <span class="n">response</span> <span class="n">sent</span> <span class="n">back</span> <span class="n">to</span> <span class="n">the</span> <span class="n">client</span><span class="o">.</span> <span class="n">That</span> <span class="n">is</span>
+ <span class="o">*</span> <span class="n">the</span> <span class="n">web</span> <span class="n">console</span><span class="p">.</span> <span class="n">In</span> <span class="n">addition</span><span class="p">,</span> <span class="n">the</span> <span class="p">{@</span><span class="n">link</span> #<span class="n">USER_ATTRIBUTE</span><span class="p">}</span> <span class="n">request</span>
+ <span class="o">*</span> <span class="n">attribute</span> <span class="n">must</span> <span class="n">be</span> <span class="n">set</span> <span class="n">to</span> <span class="n">a</span> <span class="n">non</span><span class="o">-&lt;</span><span class="n">code</span><span class="o">&gt;</span><span class="n">null</span><span class="o">&lt;/</span><span class="n">code</span><span class="o">&gt;</span> <span class="n">object</span> <span class="n">reference</span>
+ <span class="o">*</span> <span class="n">identifying</span> <span class="n">the</span> <span class="n">authenticated</span> <span class="n">user</span><span class="p">.</span>
+ <span class="o">*</span> <span class="o">&lt;</span><span class="n">p</span><span class="o">&gt;</span>
+ <span class="o">*</span> <span class="n">If</span> <span class="n">this</span> <span class="n">method</span> <span class="n">returns</span> <span class="o">&lt;</span><span class="n">code</span><span class="o">&gt;</span><span class="n">false</span><span class="o">&lt;/</span><span class="n">code</span><span class="o">&gt;</span> <span class="n">the</span> <span class="n">request</span> <span class="n">to</span> <span class="n">the</span> <span class="n">web</span> <span class="n">console</span>
+ <span class="o">*</span> <span class="n">is</span> <span class="n">terminated</span> <span class="n">without</span> <span class="n">any</span> <span class="n">more</span> <span class="n">response</span> <span class="n">sent</span> <span class="n">back</span> <span class="n">to</span> <span class="n">the</span> <span class="n">client</span><span class="p">.</span> <span class="n">That</span> <span class="n">is</span>
  <span class="o">*</span> <span class="n">the</span> <span class="n">implementation</span> <span class="n">is</span> <span class="n">expected</span> <span class="n">to</span> <span class="n">have</span> <span class="n">informed</span> <span class="n">the</span> <span class="n">client</span> <span class="n">in</span> <span class="k">case</span> <span class="n">of</span>
- <span class="o">*</span> <span class="n">non</span><span class="o">-</span><span class="n">granted</span> <span class="n">access</span><span class="o">.</span>
+ <span class="o">*</span> <span class="n">non</span><span class="o">-</span><span class="n">granted</span> <span class="n">access</span><span class="p">.</span>
  <span class="o">*</span>
- <span class="o">*</span> <span class="nv">@param</span> <span class="n">request</span> <span class="n">The</span> <span class="n">request</span> <span class="n">object</span>
- <span class="o">*</span> <span class="nv">@param</span> <span class="n">response</span> <span class="n">The</span> <span class="n">response</span> <span class="n">object</span>
- <span class="o">*</span> <span class="nv">@return</span> <span class="sr">&lt;code&gt;</span><span class="n">true</span><span class="sr">&lt;/code&gt;</span> <span class="n">If</span> <span class="n">the</span> <span class="n">request</span> <span class="n">provided</span> <span class="n">valid</span> <span class="n">credentials</span><span class="o">.</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">param</span> <span class="n">request</span> <span class="n">The</span> <span class="n">request</span> <span class="n">object</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">param</span> <span class="n">response</span> <span class="n">The</span> <span class="n">response</span> <span class="n">object</span>
+ <span class="o">*</span> <span class="p">@</span><span class="k">return</span> <span class="o">&lt;</span><span class="n">code</span><span class="o">&gt;</span><span class="n">true</span><span class="o">&lt;/</span><span class="n">code</span><span class="o">&gt;</span> <span class="n">If</span> <span class="n">the</span> <span class="n">request</span> <span class="n">provided</span> <span class="n">valid</span> <span class="n">credentials</span><span class="p">.</span>
  <span class="o">*/</span>
 <span class="n">public</span> <span class="n">boolean</span> <span class="n">authenticate</span><span class="p">(</span> <span class="n">HttpServletRequest</span> <span class="n">request</span><span class="p">,</span> <span class="n">HttpServletResponse</span> <span class="n">response</span> <span class="p">);</span>
 </pre></div>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework.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"
@@ -110,18 +109,18 @@ supervise a specific remote gateway.</p>
 <p>MOSGi installs JMX-MX4J agent at the gateways level. Any one can register an MBean to the JMX agent. The registration can be made in two ways. The direct code and the white board pattern.
 <em> In the direct code, one can register an MBean to the agent through the standard service interface : </em>javax.management.MBeanServer*</p>
 <p>Example:</p>
-<div class="codehilite"><pre><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">ServiceReference</span> <span class="n">sr</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="n">javax</span><span class="o">.</span><span class="n">management</span><span class="o">.</span><span class="n">MBeanServer</span><span class="o">.</span><span class="n">class</span><span class="o">.</span><span class="n">getName</span><span class="p">());</span>
-<span class="n">javax</span><span class="o">.</span><span class="n">management</span><span class="o">.</span><span class="n">MBeanServer</span> <span class="n">mbs</span><span class="o">=</span><span class="p">(</span><span class="n">javax</span><span class="o">.</span><span class="n">management</span><span class="o">.</span><span class="n">MBeanServer</span><span class="p">)</span><span class="n">context</span><span class="o">.</span><span class="n">getService</span><span class="p">(</span><span class="n">sr</span><span class="p">);</span>
-<span class="n">mbs</span><span class="o">.</span><span class="n">registerMBean</span><span class="p">(</span><span class="k">new</span> <span class="n">MBeanImpl</span><span class="p">(),</span> <span class="k">new</span> <span class="n">ObjectName</span><span class="p">(</span><span class="s">&quot;Foo:FooName&quot;</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">ServiceReference</span> <span class="n">sr</span> <span class="p">=</span> <span class="n">context</span><span class="p">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="n">javax</span><span class="p">.</span><span class="n">management</span><span class="p">.</span><span class="n">MBeanServer</span><span class="p">.</span><span class="n">class</span><span class="p">.</span><span class="n">getName</span><span class="p">());</span>
+<span class="n">javax</span><span class="p">.</span><span class="n">management</span><span class="p">.</span><span class="n">MBeanServer</span> <span class="n">mbs</span><span class="p">=(</span><span class="n">javax</span><span class="p">.</span><span class="n">management</span><span class="p">.</span><span class="n">MBeanServer</span><span class="p">)</span><span class="n">context</span><span class="p">.</span><span class="n">getService</span><span class="p">(</span><span class="n">sr</span><span class="p">);</span>
+<span class="n">mbs</span><span class="p">.</span><span class="n">registerMBean</span><span class="p">(</span><span class="n">new</span> <span class="n">MBeanImpl</span><span class="p">(),</span> <span class="n">new</span> <span class="n">ObjectName</span><span class="p">(</span>&quot;<span class="n">Foo</span><span class="p">:</span><span class="n">FooName</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p>Exemple of such code is uses in <em>mosgi.managedelements.bundlesprobes</em> code in felix repository
 <em> In the whiteboard pattern, one can register an MBean through registering its interface to the framework as a service. If the interface name ends with MBean or if the interface is </em>javax.management.DynamicMBean<em>, the agent will automatically register the implementation as a standard MBean. The objectName of the MBean can either be defined at registration time with the </em>org.apache.felix.mosgi.jmx.agent.Constants.OBJECTNAME* property name or automatically build through introspection.</p>
 <p>Example:</p>
-<div class="codehilite"><pre><span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Properties</span> <span class="n">prop</span><span class="o">=</span><span class="k">new</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Properties</span><span class="p">();</span>
-<span class="n">prop</span><span class="o">.</span><span class="n">add</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">felix</span><span class="o">.</span><span class="n">mosgi</span><span class="o">.</span><span class="n">jmx</span><span class="o">.</span><span class="n">agent</span><span class="o">.</span><span class="n">Constants</span><span class="o">.</span><span class="n">OBJECTNAME</span><span class="p">,</span> <span class="s">&quot;Foo:FooName&quot;</span><span class="p">);</span>
-<span class="n">context</span><span class="o">.</span><span class="n">registerService</span><span class="p">(</span><span class="n">test</span><span class="o">.</span><span class="n">FooMBean</span><span class="o">.</span><span class="n">class</span><span class="o">.</span><span class="n">getName</span><span class="p">(),</span> <span class="k">new</span> <span class="n">test</span><span class="o">.</span><span class="n">Foo</span><span class="p">(),</span> <span class="n">prop</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Properties</span> <span class="n">prop</span><span class="p">=</span><span class="n">new</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Properties</span><span class="p">();</span>
+<span class="n">prop</span><span class="p">.</span><span class="n">add</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">felix</span><span class="p">.</span><span class="n">mosgi</span><span class="p">.</span><span class="n">jmx</span><span class="p">.</span><span class="n">agent</span><span class="p">.</span><span class="n">Constants</span><span class="p">.</span><span class="n">OBJECTNAME</span><span class="p">,</span> &quot;<span class="n">Foo</span><span class="p">:</span><span class="n">FooName</span>&quot;<span class="p">);</span>
+<span class="n">context</span><span class="p">.</span><span class="n">registerService</span><span class="p">(</span><span class="n">test</span><span class="p">.</span><span class="n">FooMBean</span><span class="p">.</span><span class="n">class</span><span class="p">.</span><span class="n">getName</span><span class="p">(),</span> <span class="n">new</span> <span class="n">test</span><span class="p">.</span><span class="n">Foo</span><span class="p">(),</span> <span class="n">prop</span><span class="p">);</span>
 </pre></div>
 
 

Modified: websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework/probeguide.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework/probeguide.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/mosgi-managed-osgi-framework/probeguide.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"
@@ -104,44 +103,44 @@ MOSGi is a management infrastructure for
 <p>The following picture illustrates relations between these elements.</p>
 <p>!MOSGiProbeClasses.png!</p>
 <p>For instance a Probe that declares a single management function <em>int getValue()</em>;should provide the following interface:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">foo</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">insa</span><span class="o">.</span><span class="n">jmxconsole</span><span class="o">.</span><span class="n">gui</span><span class="o">.</span><span class="n">service</span><span class="o">.</span><span class="n">TabIfc</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">foo</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">insa</span><span class="p">.</span><span class="n">jmxconsole</span><span class="p">.</span><span class="n">gui</span><span class="p">.</span><span class="n">service</span><span class="p">.</span><span class="n">TabIfc</span><span class="p">;</span>
 <span class="n">public</span> <span class="n">interface</span> <span class="n">ProbeMBean</span> <span class="n">extends</span> <span class="n">TabIfc</span> <span class="p">{</span>
-  <span class="n">public</span> <span class="nb">int</span> <span class="n">getValue</span><span class="p">();</span>
+  <span class="n">public</span> <span class="n">int</span> <span class="n">getValue</span><span class="p">();</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>And the following class:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">foo</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">BundleActivator</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">BundleContext</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">framework</span><span class="o">.</span><span class="n">ServiceReference</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">insa</span><span class="o">.</span><span class="n">jmxconsole</span><span class="o">.</span><span class="n">gui</span><span class="o">.</span><span class="n">service</span><span class="o">.</span><span class="n">TabIfc</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">javax</span><span class="o">.</span><span class="n">management</span><span class="o">.</span><span class="n">MBeanServer</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">foo</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">BundleActivator</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">BundleContext</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">framework</span><span class="p">.</span><span class="n">ServiceReference</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">insa</span><span class="p">.</span><span class="n">jmxconsole</span><span class="p">.</span><span class="n">gui</span><span class="p">.</span><span class="n">service</span><span class="p">.</span><span class="n">TabIfc</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">javax</span><span class="p">.</span><span class="n">management</span><span class="p">.</span><span class="n">MBeanServer</span><span class="p">;</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">Probe</span> <span class="n">implements</span> <span class="n">BundleActivator</span><span class="p">,</span><span class="n">ProbeMBean</span><span class="p">{</span>
-  <span class="sr">//////////////////////////////////////////</span>
-  <span class="sr">//</span>   <span class="n">BundleActivator</span> <span class="n">Interface</span>          <span class="sr">//</span>
-  <span class="sr">//////////////////////////////////////////</span>
-  <span class="sr">/* The probe lifecycle is linked to the bundle lifecycle */</span>
+  <span class="o">//////////////////////////////////////////</span>
+  <span class="o">//</span>   <span class="n">BundleActivator</span> <span class="n">Interface</span>          <span class="o">//</span>
+  <span class="o">//////////////////////////////////////////</span>
+  <span class="o">/*</span> <span class="n">The</span> <span class="n">probe</span> <span class="n">lifecycle</span> <span class="n">is</span> <span class="n">linked</span> <span class="n">to</span> <span class="n">the</span> <span class="n">bundle</span> <span class="n">lifecycle</span> <span class="o">*/</span>
   <span class="n">public</span> <span class="n">void</span> <span class="n">start</span><span class="p">(</span><span class="n">BundleContext</span> <span class="n">bc</span><span class="p">){</span>
-    <span class="sr">/* Here we register the Mbean within the agent */</span>
-    <span class="n">ServiceReference</span> <span class="n">sr</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="n">MBeanServer</span><span class="o">.</span><span class="n">class</span><span class="o">.</span><span class="n">getName</span><span class="p">());</span>
-    <span class="k">if</span> <span class="p">(</span><span class="n">sr</span><span class="o">!=</span><span class="n">null</span><span class="p">){</span>
-      <span class="n">MBeanServer</span> <span class="n">server</span> <span class="o">=</span> <span class="p">(</span><span class="n">MbeanServer</span><span class="p">)</span><span class="n">this</span><span class="o">.</span><span class="n">bc</span><span class="o">.</span><span class="n">getService</span><span class="p">(</span><span class="n">sr</span><span class="p">);</span>
-      <span class="n">server</span><span class="o">.</span><span class="n">registerMBean</span><span class="p">(</span><span class="n">this</span><span class="p">,</span>  <span class="k">new</span> <span class="n">ObjectName</span><span class="p">(</span><span class="s">&quot;TabUI:name=Probe&quot;</span><span class="p">);</span>
+    <span class="o">/*</span> <span class="n">Here</span> <span class="n">we</span> <span class="n">register</span> <span class="n">the</span> <span class="n">Mbean</span> <span class="n">within</span> <span class="n">the</span> <span class="n">agent</span> <span class="o">*/</span>
+    <span class="n">ServiceReference</span> <span class="n">sr</span> <span class="p">=</span> <span class="n">context</span><span class="p">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="n">MBeanServer</span><span class="p">.</span><span class="n">class</span><span class="p">.</span><span class="n">getName</span><span class="p">());</span>
+    <span class="k">if</span> <span class="p">(</span><span class="n">sr</span>!<span class="p">=</span><span class="n">null</span><span class="p">){</span>
+      <span class="n">MBeanServer</span> <span class="n">server</span> <span class="p">=</span> <span class="p">(</span><span class="n">MbeanServer</span><span class="p">)</span><span class="n">this</span><span class="p">.</span><span class="n">bc</span><span class="p">.</span><span class="n">getService</span><span class="p">(</span><span class="n">sr</span><span class="p">);</span>
+      <span class="n">server</span><span class="p">.</span><span class="n">registerMBean</span><span class="p">(</span><span class="n">this</span><span class="p">,</span>  <span class="n">new</span> <span class="n">ObjectName</span><span class="p">(</span>&quot;<span class="n">TabUI</span><span class="p">:</span><span class="n">name</span><span class="p">=</span><span class="n">Probe</span>&quot;<span class="p">);</span>
     <span class="p">}</span>
   <span class="p">}</span>
-  <span class="n">public</span> <span class="n">void</span> <span class="n">stop</span><span class="p">(</span><span class="n">BundleContext</span> <span class="n">bc</span><span class="p">){</span><span class="o">...</span><span class="p">}</span>
-  <span class="sr">//////////////////////////</span><span class="o">/</span>
-  <span class="sr">//</span> <span class="n">Management</span> <span class="n">interface</span>  <span class="sr">//</span>
-  <span class="sr">//////////////////////////</span><span class="o">/</span>
-  <span class="n">public</span> <span class="nb">int</span> <span class="n">getValue</span><span class="p">(){</span><span class="k">return</span> <span class="mi">10</span><span class="p">;}</span>
+  <span class="n">public</span> <span class="n">void</span> <span class="n">stop</span><span class="p">(</span><span class="n">BundleContext</span> <span class="n">bc</span><span class="p">){...}</span>
+  <span class="o">///////////////////////////</span>
+  <span class="o">//</span> <span class="n">Management</span> <span class="n">interface</span>  <span class="o">//</span>
+  <span class="o">///////////////////////////</span>
+  <span class="n">public</span> <span class="n">int</span> <span class="n">getValue</span><span class="p">(){</span><span class="k">return</span> 10<span class="p">;}</span>
 
-  <span class="o">/*</span> <span class="n">A</span> <span class="n">getIfc</span> <span class="n">function</span> <span class="n">comes</span> <span class="n">from</span> <span class="n">RemoteIfc</span> <span class="n">interface</span> <span class="n">that</span> <span class="n">enable</span> <span class="n">the</span> <span class="n">manager</span> <span class="p">(</span><span class="n">remote</span> <span class="n">console</span><span class="p">)</span> <span class="n">to</span>
+  <span class="o">/*</span> <span class="n">A</span> <span class="n">getIfc</span> <span class="k">function</span> <span class="n">comes</span> <span class="n">from</span> <span class="n">RemoteIfc</span> <span class="n">interface</span> <span class="n">that</span> <span class="n">enable</span> <span class="n">the</span> <span class="n">manager</span> <span class="p">(</span><span class="n">remote</span> <span class="n">console</span><span class="p">)</span> <span class="n">to</span>
   <span class="n">a</span> <span class="n">bundle</span> <span class="n">that</span> <span class="n">can</span> <span class="n">communicate</span> <span class="n">whith</span> <span class="n">this</span> <span class="n">probe</span> <span class="n">from</span> <span class="n">a</span> <span class="n">remote</span> <span class="n">URL</span> <span class="o">*/</span>
   <span class="n">public</span> <span class="n">String</span> <span class="n">getBundleName</span><span class="p">(){</span>
-   <span class="k">return</span> <span class="s">&quot;http://somewhere/agraphicaltab.jar&quot;</span>
+   <span class="k">return</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">somewhere</span><span class="o">/</span><span class="n">agraphicaltab</span><span class="p">.</span><span class="n">jar</span>&quot;
   <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -167,24 +166,24 @@ When the user selects a gateway (green f
 </em> It should implement Plugin interface with is the jmxconsole   container interface specification.</p>
 <p>The plugin is mainly conform to the java beans specification development. The jmxconsole acts as a bean container and each tab is a bean in this infrastructure. This is the general architecture of a Tab class.!MOSGiConsoleTabClasses.png!</p>
 <p>The plugin interface has the following structure:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">insa</span><span class="o">.</span><span class="n">jmxconsole</span><span class="o">.</span><span class="n">gui</span><span class="o">.</span><span class="n">service</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">awt</span><span class="o">.</span><span class="n">Component</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">beans</span><span class="o">.</span><span class="n">PropertyChangeListener</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">insa</span><span class="p">.</span><span class="n">jmxconsole</span><span class="p">.</span><span class="n">gui</span><span class="p">.</span><span class="n">service</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">awt</span><span class="p">.</span><span class="n">Component</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">beans</span><span class="p">.</span><span class="n">PropertyChangeListener</span><span class="p">;</span>
 <span class="n">public</span> <span class="n">interface</span> <span class="n">Plugin</span> <span class="n">extends</span> <span class="n">PropertyChangeListener</span><span class="p">{</span>
-  <span class="n">public</span> <span class="n">String</span> <span class="n">getName</span><span class="p">();</span> <span class="sr">/* The name of the tab */</span>
-  <span class="n">public</span> <span class="n">Component</span> <span class="n">getGUI</span><span class="p">();</span> <span class="sr">/* This is called by the container to get the graphical component */</span>
-  <span class="n">public</span> <span class="n">void</span> <span class="n">registerServicePlugin</span><span class="p">();</span> <span class="sr">/* This is called by the framework when a new gateway is selected */</span>
+  <span class="n">public</span> <span class="n">String</span> <span class="n">getName</span><span class="p">();</span> <span class="o">/*</span> <span class="n">The</span> <span class="n">name</span> <span class="n">of</span> <span class="n">the</span> <span class="n">tab</span> <span class="o">*/</span>
+  <span class="n">public</span> <span class="n">Component</span> <span class="n">getGUI</span><span class="p">();</span> <span class="o">/*</span> <span class="n">This</span> <span class="n">is</span> <span class="n">called</span> <span class="n">by</span> <span class="n">the</span> <span class="n">container</span> <span class="n">to</span> <span class="n">get</span> <span class="n">the</span> <span class="n">graphical</span> <span class="n">component</span> <span class="o">*/</span>
+  <span class="n">public</span> <span class="n">void</span> <span class="n">registerServicePlugin</span><span class="p">();</span> <span class="o">/*</span> <span class="n">This</span> <span class="n">is</span> <span class="n">called</span> <span class="n">by</span> <span class="n">the</span> <span class="n">framework</span> <span class="n">when</span> <span class="n">a</span> <span class="n">new</span> <span class="n">gateway</span> <span class="n">is</span> <span class="n">selected</span> <span class="o">*/</span>
   <span class="n">public</span> <span class="n">void</span> <span class="n">unregisterServicePlugin</span><span class="p">();</span>
-  <span class="sr">/* see before */</span>
-  <span class="n">public</span> <span class="n">String</span> <span class="n">pluginLocation</span><span class="p">();</span> <span class="sr">/* This a unique identifier of the plugin */</span>
-    <span class="o">/*</span> <span class="n">These</span> <span class="n">are</span> <span class="n">constants</span> <span class="n">that</span> <span class="n">enable</span> <span class="n">communication</span> <span class="n">between</span> <span class="n">container</span> <span class="ow">and</span> <span class="n">plugins</span><span class="o">.</span> <span class="n">They</span> <span class="n">are</span> <span class="n">treated</span> <span class="n">in</span> <span class="n">the</span>
-  <span class="n">propertyChange</span> <span class="n">function</span> <span class="n">brought</span> <span class="n">by</span> <span class="n">the</span> <span class="n">javabean</span> <span class="n">API</span> <span class="o">*/</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_SELECTED</span><span class="o">=</span><span class="s">&quot;newNodeSelected&quot;</span><span class="p">;</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_READY</span><span class="o">=</span><span class="s">&quot;newNodeReady&quot;</span><span class="p">;</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_CONNECTION</span><span class="o">=</span><span class="s">&quot;newNodeConnection&quot;</span><span class="p">;</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">EMPTY_NODE</span><span class="o">=</span><span class="s">&quot;emptyNode&quot;</span><span class="p">;</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">PLUGIN_ADDED</span><span class="o">=</span><span class="s">&quot;pluggin_added&quot;</span><span class="p">;</span>
-  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">PLUGIN_REMOVED</span><span class="o">=</span><span class="s">&quot;pluggin_removed&quot;</span><span class="p">;</span>
+  <span class="o">/*</span> <span class="n">see</span> <span class="n">before</span> <span class="o">*/</span>
+  <span class="n">public</span> <span class="n">String</span> <span class="n">pluginLocation</span><span class="p">();</span> <span class="o">/*</span> <span class="n">This</span> <span class="n">a</span> <span class="n">unique</span> <span class="n">identifier</span> <span class="n">of</span> <span class="n">the</span> <span class="n">plugin</span> <span class="o">*/</span>
+    <span class="o">/*</span> <span class="n">These</span> <span class="n">are</span> <span class="n">constants</span> <span class="n">that</span> <span class="n">enable</span> <span class="n">communication</span> <span class="n">between</span> <span class="n">container</span> <span class="n">and</span> <span class="n">plugins</span><span class="p">.</span> <span class="n">They</span> <span class="n">are</span> <span class="n">treated</span> <span class="n">in</span> <span class="n">the</span>
+  <span class="n">propertyChange</span> <span class="k">function</span> <span class="n">brought</span> <span class="n">by</span> <span class="n">the</span> <span class="n">javabean</span> <span class="n">API</span> <span class="o">*/</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_SELECTED</span><span class="p">=</span>&quot;<span class="n">newNodeSelected</span>&quot;<span class="p">;</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_READY</span><span class="p">=</span>&quot;<span class="n">newNodeReady</span>&quot;<span class="p">;</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">NEW_NODE_CONNECTION</span><span class="p">=</span>&quot;<span class="n">newNodeConnection</span>&quot;<span class="p">;</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">EMPTY_NODE</span><span class="p">=</span>&quot;<span class="n">emptyNode</span>&quot;<span class="p">;</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">PLUGIN_ADDED</span><span class="p">=</span>&quot;<span class="n">pluggin_added</span>&quot;<span class="p">;</span>
+  <span class="n">public</span> <span class="n">static</span> <span class="n">final</span> <span class="n">String</span> <span class="n">PLUGIN_REMOVED</span><span class="p">=</span>&quot;<span class="n">pluggin_removed</span>&quot;<span class="p">;</span>
 <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.html (original)
+++ websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations.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/tutorials-examples-and-presentations/apache-felix-application-demonstration.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.html (original)
+++ websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.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"
@@ -98,20 +97,20 @@
 <p>!example-application.png|align=center!</p>
 <h2 id="getting-the-source-code">Getting the source code</h2>
 <p>Currently, the example application is only available in our source control repositories. We have created two applications, one for the service-based and one for the extender-based approach. Both examples can be run as a bundled application on top of any OSGi implementation or by hosting an embedded framework. Assuming you are using svn to get the source code, you can find the source at the following locations:</p>
-<div class="codehilite"><pre><span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">host</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">circle</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">square</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">triangle</span>
-
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">host</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">circle</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">square</span>
-<span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">triangle</span>
+<div class="codehilite"><pre><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">host</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">circle</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">square</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">triangle</span>
+
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">host</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">square</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">triangle</span>
 </pre></div>
 
 
 <p>Check out each project using an appropriate SVN command, such as:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/felix/</span><span class="n">trunk</span><span class="sr">/examples/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">host</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</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">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">felix</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">examples</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">host</span>
 </pre></div>
 
 
@@ -123,12 +122,12 @@
 
 <p>After you have built the projects, start the Felix framework and install/start the resulting bundle in the <code>target/</code> directory of each sub-project for either the service-based or extender-based example.</p>
 <p>To start the examples using an embedded framework, copy the JAR files you just build to a folder in your file system. Then execute the host.jar, passing it the names of all services/extensions as parameters; for example:</p>
-<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">servicebased</span><span class="o">.</span><span class="n">host</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">.</span><span class="n">jar</span> <span class="n">file:</span><span class="sr">/servicebased.circle-1.0.0.jar file:/s</span><span class="n">ervicebased</span><span class="o">.</span><span class="n">square</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">.</span><span class="n">jar</span> <span class="n">file:</span><span class="o">/</span><span class="n">servicebased</span><span class="o">.</span><span class="n">triangle</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">.</span><span class="n">jar</span>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">servicebased</span><span class="p">.</span><span class="n">host</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">file</span><span class="p">:</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">circle</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">file</span><span class="p">:</span><span class="o">/</span><span class="n">servicebased</span><span class="p">.</span><span class="n">square</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">file</span><span class="p">:</span><span class="o">/</span><span class="n">
 servicebased</span><span class="p">.</span><span class="n">triangle</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
 <p>If you are using an IDE like Eclipse, you can run an embedded framework using a custom run configuration. In Eclipse click <em>Run</em> -&gt; <em>Run Configurations...</em> and create a new <em>Java Application</em> run configuration. Select the host project you want to start (servicebased.host or extenderbased.host) and chose the <code>Application</code> class as <em>Main class</em> from the org.apache.felix.example.servicebased/extenderbased.host.launch package. Switch to the <em>Arguments</em> tab and fill in the following <em>Program arguments</em> (assuming you want to run the extender-based example):</p>
-<div class="codehilite"><pre><span class="n">file:</span><span class="o">..</span><span class="sr">/extenderbased.circle/</span><span class="n">target</span><span class="sr">/extenderbased.circle-1.0.0.jar file:../</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">square</span><span class="sr">/target/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">square</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">.</span><span class="n">jar</span> <span class="n">file:</span><span class="o">..</span><span class="sr">/extenderbased.triangle/</span><span class="n">target</span><span class="o">/</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">triangle</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">.</span><span class="n">jar</span>
+<div class="codehilite"><pre><span class="n">file</span><span class="p">:.</span><span class="o">./</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">file</span><span class="p">:.</span><span class="o">./</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">square</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">square</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">file</span><span class="p">:
 .</span><span class="o">./</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">triangle</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">triangle</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
@@ -137,10 +136,10 @@
 <p>The service-based application uses the OSGi service concept and the service registry as the extensibility mechanism. Therefore the host bundle contains a service interface located at <code>org.apache.felix.example.servicebased.host.service.SimpleShape</code>. The SimpleShape service has two properties: a name and an icon. Besides that it defines one operation: <code>draw(Graphics2D g2, Point p)</code>.</p>
 <h3 id="defining-shapes-as-services">Defining shapes as services</h3>
 <p>Bundles that want to contribute a shape service have to implement the <code>SimpleShape</code> interface. Take a look at the circle bundle for example. The circle bundle only contains one class, the <code>Activator</code>. A <code>[BundleActivator](http://www.osgi.org/javadoc/r4v43/org/osgi/framework/BundleActivator.html)</code> is responsible for starting up a bundle. Therefore it gets passed in a <code>[BundleContext|http://www.osgi.org/javadoc/r4v43/org/osgi/framework/BundleContext.html]</code>, that can be used to perform registration of services within the framework. The <code>Activator</code> also contains an inner class that implements the <code>SimpleShape</code> interface and therefore represents the <code>SimpleShape</code> implementation of a circle. The <code>start(BundleContext context</code> method is used to register the circle implementation as a service:</p>
-<div class="codehilite"><pre><span class="n">Dictionary</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Object</span><span class="o">&gt;</span> <span class="n">dict</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Hashtable</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Object</span><span class="o">&gt;</span><span class="p">();</span>
-<span class="n">dict</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="n">SimpleShape</span><span class="o">.</span><span class="n">NAME_PROPERTY</span><span class="p">,</span> <span class="s">&quot;Circle&quot;</span><span class="p">);</span>
-<span class="n">dict</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="n">SimpleShape</span><span class="o">.</span><span class="n">ICON_PROPERTY</span><span class="p">,</span> <span class="k">new</span> <span class="n">ImageIcon</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">getClass</span><span class="p">()</span><span class="o">.</span><span class="n">getResource</span><span class="p">(</span><span class="s">&quot;circle.png&quot;</span><span class="p">)));</span>
-<span class="n">m_context</span><span class="o">.</span><span class="n">registerService</span><span class="p">(</span><span class="n">SimpleShape</span><span class="o">.</span><span class="n">class</span><span class="o">.</span><span class="n">getName</span><span class="p">(),</span> <span class="k">new</span> <span class="n">Circle</span><span class="p">(),</span> <span class="n">dict</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">Dictionary</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Object</span><span class="o">&gt;</span> <span class="n">dict</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Hashtable</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Object</span><span class="o">&gt;</span><span class="p">();</span>
+<span class="n">dict</span><span class="p">.</span><span class="n">put</span><span class="p">(</span><span class="n">SimpleShape</span><span class="p">.</span><span class="n">NAME_PROPERTY</span><span class="p">,</span> &quot;<span class="n">Circle</span>&quot;<span class="p">);</span>
+<span class="n">dict</span><span class="p">.</span><span class="n">put</span><span class="p">(</span><span class="n">SimpleShape</span><span class="p">.</span><span class="n">ICON_PROPERTY</span><span class="p">,</span> <span class="n">new</span> <span class="n">ImageIcon</span><span class="p">(</span><span class="n">this</span><span class="p">.</span><span class="n">getClass</span><span class="p">().</span><span class="n">getResource</span><span class="p">(</span>&quot;<span class="n">circle</span><span class="p">.</span><span class="n">png</span>&quot;<span class="p">)));</span>
+<span class="n">m_context</span><span class="p">.</span><span class="n">registerService</span><span class="p">(</span><span class="n">SimpleShape</span><span class="p">.</span><span class="n">class</span><span class="p">.</span><span class="n">getName</span><span class="p">(),</span> <span class="n">new</span> <span class="n">Circle</span><span class="p">(),</span> <span class="n">dict</span><span class="p">);</span>
 </pre></div>
 
 
@@ -151,25 +150,25 @@
 <p>In contrast to the service-based example, the extender-based example uses bundles as it's primary extensibility mechanism. The host bundle contains a <code>SimpleShape</code> interface that is much like the one from the service based example. It also contains a <code>draw(Graphics2D g2, Point p)</code> method and defines a set of properties. This time the properties are not used as properties for registering a service, but for defining bundle header properties in the bundle's <code>MANIFEST.MF</code> file.</p>
 <h3 id="defining-shapes-as-extensions">Defining shapes as extensions</h3>
 <p>Bundles that want to contribute a <code>SimpleShape</code> extension have to implement the <code>SimpleShape</code> interface. Have a look at the extender-based circle implementation, for example. It only contains one class, <code>Circle</code>, that implements <code>SimpleShape</code>. Note, that in contrast to the service-based example there is no need to define a <code>[BundleActivator](http://www.osgi.org/javadoc/r4v43/org/osgi/framework/BundleActivator.html)</code>. This is because, there is no need to register a service within the framework. Information about the provided shape implementation is located in the bundle headers instead. Have a look at the circle's <code>MANIFEST.MF</code> file:</p>
-<div class="codehilite"><pre><span class="n">Manifest</span><span class="o">-</span><span class="n">Version:</span> <span class="mf">1.0</span>
-<span class="n">Private</span><span class="o">-</span><span class="n">Package:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">circle</span>
-<span class="n">Tool:</span> <span class="n">Bnd</span><span class="o">-</span><span class="mf">0.0.238</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">Name:</span> <span class="n">Apache</span> <span class="n">Felix</span> <span class="n">Circle</span> <span class="n">Extension</span>
-<span class="n">Created</span><span class="o">-</span><span class="n">By:</span> <span class="n">Apache</span> <span class="n">Maven</span> <span class="n">Bundle</span> <span class="n">Plugin</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">Vendor:</span> <span class="n">The</span> <span class="n">Apache</span> <span class="n">Software</span> <span class="n">Foundation</span>
-<span class="n">Build</span><span class="o">-</span><span class="n">Jdk:</span> <span class="mf">1.7.0_01</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">Version:</span> <span class="mf">1.0.0</span>
-<span class="n">Extension</span><span class="o">-</span><span class="n">Class:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">circle</span><span class="o">.</span><span class="n">Circle</span>
-<span class="n">Bnd</span><span class="o">-</span><span class="n">LastModified:</span> <span class="mi">1331062969798</span>
-<span class="n">Extension</span><span class="o">-</span><span class="n">Icon:</span> <span class="n">org</span><span class="sr">/apache/</span><span class="n">felix</span><span class="sr">/example/</span><span class="n">extenderbased</span><span class="sr">/circle/ci</span><span class="n">rcle</span><span class="o">.</span><span class="n">p</span>
+<div class="codehilite"><pre><span class="n">Manifest</span><span class="o">-</span><span class="n">Version</span><span class="p">:</span> 1<span class="p">.</span>0
+<span class="n">Private</span><span class="o">-</span><span class="n">Package</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">felix</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span>
+<span class="n">Tool</span><span class="p">:</span> <span class="n">Bnd</span><span class="o">-</span>0<span class="p">.</span>0<span class="p">.</span>238
+<span class="n">Bundle</span><span class="o">-</span><span class="n">Name</span><span class="p">:</span> <span class="n">Apache</span> <span class="n">Felix</span> <span class="n">Circle</span> <span class="n">Extension</span>
+<span class="n">Created</span><span class="o">-</span><span class="n">By</span><span class="p">:</span> <span class="n">Apache</span> <span class="n">Maven</span> <span class="n">Bundle</span> <span class="n">Plugin</span>
+<span class="n">Bundle</span><span class="o">-</span><span class="n">Vendor</span><span class="p">:</span> <span class="n">The</span> <span class="n">Apache</span> <span class="n">Software</span> <span class="n">Foundation</span>
+<span class="n">Build</span><span class="o">-</span><span class="n">Jdk</span><span class="p">:</span> 1<span class="p">.</span>7<span class="p">.</span>0<span class="n">_01</span>
+<span class="n">Bundle</span><span class="o">-</span><span class="n">Version</span><span class="p">:</span> 1<span class="p">.</span>0<span class="p">.</span>0
+<span class="n">Extension</span><span class="o">-</span><span class="n">Class</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">felix</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span><span class="p">.</span><span class="n">Circle</span>
+<span class="n">Bnd</span><span class="o">-</span><span class="n">LastModified</span><span class="p">:</span> 1331062969798
+<span class="n">Extension</span><span class="o">-</span><span class="n">Icon</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">felix</span><span class="o">/</span><span class="n">example</span><span class="o">/</span><span class="n">extenderbased</span><span class="o">/</span><span class="n">circle</span><span class="o">/</span><span class="n">circle</span><span class="p">.</span><span class="n">p</span>
  <span class="n">ng</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">ManifestVersion:</span> <span class="mi">2</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">Description:</span> <span class="n">A</span> <span class="n">simple</span> <span class="n">extension</span> <span class="k">for</span> <span class="n">drawing</span> <span class="n">circles</span><span class="o">.</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">License:</span> <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span><span class="n">LICENSE</span><span class="o">-</span><span class="mf">2.0</span><span class="o">.</span><span class="n">txt</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">DocURL:</span> <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="o">/</span>
-<span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">circle</span>
-<span class="n">Import</span><span class="o">-</span><span class="n">Package:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">felix</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">extenderbased</span><span class="o">.</span><span class="n">host</span><span class="o">.</span><span class="n">extension</span>
-<span class="n">Extension</span><span class="o">-</span><span class="n">Name:</span> <span class="n">Circle</span>
+<span class="n">Bundle</span><span class="o">-</span><span class="n">ManifestVersion</span><span class="p">:</span> 2
+<span class="n">Bundle</span><span class="o">-</span><span class="n">Description</span><span class="p">:</span> <span class="n">A</span> <span class="n">simple</span> <span class="n">extension</span> <span class="k">for</span> <span class="n">drawing</span> <span class="n">circles</span><span class="p">.</span>
+<span class="n">Bundle</span><span class="o">-</span><span class="n">License</span><span class="p">:</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</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">licenses</span><span class="o">/</span><span class="n">LICENSE</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span><span class="n">txt</span>
+<span class="n">Bundle</span><span class="o">-</span><span class="n">DocURL</span><span class="p">:</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</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">Bundle</span><span class="o">-</span><span class="n">SymbolicName</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">felix</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">circle</span>
+<span class="n">Import</span><span class="o">-</span><span class="n">Package</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">felix</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">extenderbased</span><span class="p">.</span><span class="n">host</span><span class="p">.</span><span class="n">extension</span>
+<span class="n">Extension</span><span class="o">-</span><span class="n">Name</span><span class="p">:</span> <span class="n">Circle</span>
 </pre></div>
 
 

Modified: websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html (original)
+++ websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.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/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html (original)
+++ websites/staging/felix/trunk/content/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.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