You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bu...@apache.org on 2013/04/12 15:43:21 UTC

svn commit: r858231 [3/5] - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/ documentation/subprojects/apache-felix-ipojo/ documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/ documentation/subprojects/apache...

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/providing-osgi-services.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/providing-osgi-services.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/providing-osgi-services.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/service-requirement-handler.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/service-requirement-handler.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/service-requirement-handler.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>
@@ -166,24 +169,24 @@
 
 
 <p>The specified method must be a <em>static</em> method of the implementation class returning an <em>instance of this implementation class</em>. The following code shows an example of usage:</p>
-<div class="codehilite"><pre>    <span class="n">public</span> <span class="n">static</span> <span class="n">FooProvider</span> <span class="n">createProvider</span><span class="p">()</span> <span class="p">{</span>
-        <span class="k">if</span> <span class="p">(</span><span class="n">singleton</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">singleton</span> <span class="o">=</span> <span class="k">new</span> <span class="n">FooProvider</span><span class="p">();</span>
-        <span class="p">}</span>
-        <span class="k">return</span> <span class="n">singleton</span><span class="p">;</span>
-    <span class="p">}</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">static</span> <span class="n">FooProvider</span> <span class="nf">createProvider</span><span class="o">()</span> <span class="o">{</span>
+    <span class="k">if</span> <span class="o">(</span><span class="n">singleton</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
+        <span class="n">singleton</span> <span class="o">=</span> <span class="k">new</span> <span class="n">FooProvider</span><span class="o">();</span>
+    <span class="o">}</span>
+    <span class="k">return</span> <span class="n">singleton</span><span class="o">;</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <p>This method must then call any valid constructor (potentially private) of the implementation class. </p>
 <p>However, be aware that if you create an instance by using a <code>factory-method</code>, the called constructor hasn't access to values injected by the iPOJO container. So, the called constructor must not try accessing to services, properties... These objects will be accessible when the constructor returns.</p>
 <p>As for "normal" constructor, the method-factory can receive the bundle context in argument, such as in:</p>
-<div class="codehilite"><pre>    <span class="n">public</span> <span class="n">static</span> <span class="n">FooProvider</span> <span class="n">createProvider</span> <span class="p">(</span><span class="n">BundleContext</span> <span class="n">bc</span><span class="p">)</span> <span class="p">{</span>
-        <span class="k">if</span> <span class="p">(</span><span class="n">singleton</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">singleton</span> <span class="o">=</span> <span class="k">new</span> <span class="n">FooProvider</span><span class="p">(</span><span class="n">bc</span><span class="p">);</span>
-        <span class="p">}</span>
-        <span class="k">return</span> <span class="n">singleton</span><span class="p">;</span>
-    <span class="p">}</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">static</span> <span class="n">FooProvider</span> <span class="nf">createProvider</span> <span class="o">(</span><span class="n">BundleContext</span> <span class="n">bc</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">if</span> <span class="o">(</span><span class="n">singleton</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
+        <span class="n">singleton</span> <span class="o">=</span> <span class="k">new</span> <span class="n">FooProvider</span><span class="o">(</span><span class="n">bc</span><span class="o">);</span>
+    <span class="o">}</span>
+    <span class="k">return</span> <span class="n">singleton</span><span class="o">;</span>
+<span class="o">}</span>
 </pre></div>
         </div>
     </div>
@@ -199,7 +202,7 @@
                 may be trademarks or registered trademarks of their respective owners.
                 </div>
                 <div class="timestamp span3 offset2">
-                Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
+                Rev. 1467268 by clement on Fri, 12 Apr 2013 13:42:34 +0000
                 </div>
             </div>
         </footer>           

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>
@@ -154,13 +157,31 @@
         <div class="content">
             <h1 id="ipojo-factories-principles">iPOJO Factories Principles</h1>
 <p><em>iPOJO defines a factory for each declared component type. These factories are used to create component instances. This document presents how to declare instances and configure them. The API to create, dispose and reconfigure instances is also explained.</em></p>
-<p>{div:class=toc}
-[TOC]
-{div}</p>
+<div class="toc">
+<ul>
+<li><a href="#ipojo-factories-principles">iPOJO Factories Principles</a><ul>
+<li><a href="#preliminary-concepts">Preliminary Concepts</a><ul>
+<li><a href="#component-type">Component Type</a></li>
+<li><a href="#component-instance">Component Instance</a></li>
+</ul>
+</li>
+<li><a href="#how-to-declare-instances-inside-metadata-files">How-to declare instances inside metadata files</a></li>
+<li><a href="#creating-disposing-and-reconfiguring-instances-with-the-api">Creating, disposing and reconfiguring instances with the API</a><ul>
+<li><a href="#creating-instances">Creating instances</a></li>
+<li><a href="#disposing-created-instance">Disposing created instance</a></li>
+<li><a href="#reconfiguring-instance">Reconfiguring instance</a></li>
+<li><a href="#accessing-services-exposed-by-created-instances">Accessing services exposed by created instances</a></li>
+</ul>
+</li>
+<li><a href="#how-to-use-the-managedservicefactory-to-create-disposed-and-reconfigure-instances">How to use the ManagedServiceFactory to create, disposed and reconfigure instances</a></li>
+</ul>
+</li>
+</ul>
+</div>
 <h2 id="preliminary-concepts">Preliminary Concepts</h2>
 <h3 id="component-type">Component Type</h3>
 <p>A component type is a kind of instance template. If we compare component concepts with object oriented programming, component types are classes and component instances are objects. A component type is declared inside a metadata file (generally named 'metadata.xml'). The next snippet shows you a component type declaration: </p>
-<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">className=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;MyFactory&quot;</span><span class="nt">&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">classname=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;MyFactory&quot;</span><span class="nt">&gt;</span>
     ...
     <span class="c">&lt;!--component type configuration --&gt;</span>
     ...
@@ -168,13 +189,15 @@
 </pre></div>
 
 
-<p>A component type declaration begins generally by '<component>' and is composed by:
-<em> An implementation class ('className', mandatory). The 'className' attribute indicates the qualified name of the class implementing the component.
-</em> A name ('name')
-* Handler configuration (see handler guide)</p>
-<p>The 'name' attribute contains the factory name. If not specified, the 'className' attribute is used as the factory name. This factory name is used to refer to the factory (and consequently to the component type). 
+<p>A component type declaration begins generally by <code>&lt;component&gt;</code> and is composed by:</p>
+<ul>
+<li>An implementation class (<code>classname</code>, mandatory). The <code>classname</code> attribute indicates the qualified name of the class implementing the component.</li>
+<li>A name ('name')</li>
+<li>Handler configuration (see handler guide)</li>
+</ul>
+<p>The <code>name</code> attribute contains the factory name. If not specified, the <code>classname</code> attribute is used as the factory name. This factory name is used to refer to the factory (and consequently to the component type). 
 A factory can be public or private. A public factory allows creating instances dynamically and from other bundles. A private factory can only be used to create instances by declaring them in the same metadata.xml file that defines the instances' component type (i.e. in the same bundle). By default, factories are public. To set the factory to private add the 'public="false"'' attribute in the '<component>' element, such as: </p>
-<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">className=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;MyPrivateFactory&quot;</span> <span class="na">public=</span><span class="s">&quot;false&quot;</span><span class="nt">&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">classname=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;MyPrivateFactory&quot;</span> <span class="na">public=</span><span class="s">&quot;false&quot;</span><span class="nt">&gt;</span>
     ...
     <span class="c">&lt;!--component type configuration --&gt;</span>
     ...
@@ -182,28 +205,36 @@ A factory can be public or private. A pu
 </pre></div>
 
 
-<p>Public factories offer different ways to create instances:
-<em> Instances can be declared in iPOJO descriptor in any bundle (i.e. from any metadata.xml file)
-</em> Instances can be created dynamically by using the API. Two APIs are provided the iPOJO Factory API and the OSGi Configuration Admin API</p>
-<p>Indeed, iPOJO will publish two services to access the factory through the API:
-<em> org.apache.felix.ipojo.Factory : iPOJO Factory Interface
-</em> org.osgi.service.cm.ManagedServiceFactory : Config Admin Interface</p>
-<p>The factory name will be used as the <code>service.pid</code> property for those services. The <code>service.pid</code> is unique and persists between framework restarts. The service.pid of the factory equals the factory name. This allows identifying factories exposed in the service registry.
+<p>Public factories offer different ways to create instances:</p>
+<ul>
+<li>Instances can be declared in iPOJO descriptor in any bundle (i.e. from any metadata.xml file)</li>
+<li>Instances can be created dynamically by using the API. Two APIs are provided the iPOJO Factory API and the OSGi Configuration Admin API</li>
+</ul>
+<p>Indeed, iPOJO will publish two services to access the factory through the API:</p>
+<ul>
+<li><code>org.apache.felix.ipojo.Factory</code> : iPOJO Factory Interface</li>
+<li><code>org.osgi.service.cm.ManagedServiceFactory</code> : Config Admin Interface</li>
+</ul>
+<p>The factory name will be used as the <code>service.pid</code> property for those services. The <code>service.pid</code> is unique and persists between framework restarts. The <code>service.pid</code> of the factory equals the factory name. This allows identifying factories exposed in the service registry.
 Factories are either valid or invalid. You can't create instances until a factory becomes valid. A factory is invalid if required handlers are missing. This issue occurs only if the component type uses external handlers.</p>
 <h3 id="component-instance">Component Instance</h3>
-<p>A component instance is an instance of a component type. For example, if a component type declares 'providing' and 'requiring' services, then the component instances will actually expose and require those services. Several instances can be created from one factory, but all these instances will be managed as different entities, and so are independent. A component instance is characterized by:
-<em> a component type (the factory name)
-</em> an instance name (used to identify the instance, is unique)
-* a configuration : a set of <key, value> couple</p>
+<p>A component instance is an instance of a component type. For example, if a component type declares 'providing' and 'requiring' services, then the component instances will actually expose and require those services. Several instances can be created from one factory, but all these instances will be managed as different entities, and so are independent. A component instance is characterized by:</p>
+<ul>
+<li>a component type (the factory name)</li>
+<li>an instance name (used to identify the instance, is unique)</li>
+<li>a configuration : a set of <key, value> couple</li>
+</ul>
 <p>A factory keeps a reference to each created instance. If the factory stops, goes away, or becomes invalid, all created instances are stopped and are destroyed.
-To create an instance, the creation request (describing the instance to create) must refer to the factory (by using the factory name), and provide the instance configuration. This configuration can specify the instance name ('instance.name' property). Be aware that this name must be unique. If not specified, iPOJO will generate a unique name.
-A factory can refuse the creation if the configuration is not acceptable or if the factory is invalid. An unacceptable configuration is a not suitable configuration in regard to component type. Reasons for unacceptable configuration are: 
-<em> The instance name is not set or not unique
-</em> A property required by the component type is missing inside the configuration
-* A pushed property has a wrong type</p>
+To create an instance, the creation request (describing the instance to create) must refer to the factory (by using the factory name), and provide the instance configuration. This configuration can specify the instance name (<code>instance.name</code> property). Be aware that this name must be unique. If not specified, iPOJO will generate a unique name.
+A factory can refuse the creation if the configuration is not acceptable or if the factory is invalid. An unacceptable configuration is a not suitable configuration in regard to component type. Reasons for unacceptable configuration are: </p>
+<ul>
+<li>The instance name is not set or not unique</li>
+<li>A property required by the component type is missing inside the configuration</li>
+<li>A pushed property has a wrong type</li>
+</ul>
 <h2 id="how-to-declare-instances-inside-metadata-files">How-to declare instances inside metadata files</h2>
-<p>The main way to create instances is to declare those instances inside the iPOJO descriptor file (i.e. 'metadata.xml'). Those declarations can use either public factories from any bundle, or private factories from the same bundle. Private factories are generally used to guaranty singleton instance as instances can only be created inside the same bundle. 
-When a instance declaration targets an external public factory, it will wait until the factory becomes available. So, the instance will be created only when the factory appears and is valid. If the factory disappears after the instance creation, the instance is disposed and will be recreated as soon as the factory comes back.
+<p>The main way to create instances is to declare those instances inside the iPOJO descriptor file (i.e. 'metadata.xml'). Those declarations can use either public factories from any bundle, or private factories from the same bundle. Private factories are generally used to guaranty singleton instance as instances can only be created inside the same bundle. </p>
+<p>When a instance declaration targets an external public factory, it will wait until the factory becomes available. So, the instance will be created only when the factory appears and is valid. If the factory disappears after the instance creation, the instance is disposed and will be recreated as soon as the factory comes back.
 The next snippet shows how to declare an instance in the metadata:</p>
 <div class="codehilite"><pre><span class="nt">&lt;instance</span> <span class="na">component=</span><span class="s">&quot;component factory name&quot;</span> <span class="na">name =</span> <span class="s">&quot;instance name&quot;</span> <span class="nt">&gt;</span>
    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;a property name&quot;</span> <span class="na">value=</span><span class="s">&quot;a string form of the value&quot;</span><span class="nt">/&gt;</span>
@@ -213,7 +244,7 @@ The next snippet shows how to declare an
 
 
 <p>An instance declaration must contain the 'component' attribute. This attribute specifies the factory name (i.e. the component type). It can use either the factory name or the class name. The 'name' attribute allows setting the instance name. If not set, iPOJO will generate a unique name for you. Then, instances can declare properties. Those property are mostly key-value pair.  The key refer to a property name from the component type declaration such as in:</p>
-<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">className=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;my-factory&quot;</span><span class="nt">&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">classname=</span><span class="s">&quot;...&quot;</span> <span class="na">name=</span><span class="s">&quot;my-factory&quot;</span><span class="nt">&gt;</span>
     <span class="nt">&lt;properties&gt;</span>
         <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;foo&quot;</span> <span class="na">field=</span><span class="s">&quot;m_foo&quot;</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;/properties&gt;</span>
@@ -226,55 +257,55 @@ The next snippet shows how to declare an
 
 <p>The string-form of the property value will be use to create the real object at runtime. If an unacceptable configuration is set, the instance is not created, and an error message appears to the console (and in the Log Service if present).
 Instance declaration properties can be more complex than only 'key-value'. It can contains structure like list, map, dictionary and arrays such as in:</p>
-<div class="codehilite"><pre><span class="o">&lt;</span><span class="s-Atom">instance</span> <span class="s-Atom">component=</span><span class="s2">&quot;a.factory&quot;</span> <span class="s-Atom">name=</span><span class="s2">&quot;complex-props&quot;</span><span class="o">&gt;</span>
-        <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">Creates</span> <span class="s-Atom">a</span> <span class="s-Atom">string</span> <span class="nf">array</span><span class="o">--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;array&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;array&quot;</span><span class="o">&gt;</span> 
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;a&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;b&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-        <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">Creates</span> <span class="s-Atom">a</span> <span class="s-Atom">list</span> <span class="s-Atom">containing</span> <span class="nf">string</span><span class="o">--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;list&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;list&quot;</span><span class="o">&gt;</span> 
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;a&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;b&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-        <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">Creates</span> <span class="s-Atom">a</span> <span class="s-Atom">dictionary</span> <span class="s-Atom">containing</span> <span class="nf">string</span><span class="o">--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;dict&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;dictionary&quot;</span><span class="o">&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;a&quot;</span> <span class="s-Atom">value=</span><span class="s2">&quot;a&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;b&quot;</span> <span class="s-Atom">value=</span><span class="s2">&quot;b&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-        <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">Creates</span> <span class="s-Atom">a</span> <span class="s-Atom">map</span> <span class="s-Atom">containing</span> <span class="nf">string</span><span class="o">--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;map&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;map&quot;</span><span class="o">&gt;</span> 
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;a&quot;</span> <span class="s-Atom">value=</span><span class="s2">&quot;a&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;b&quot;</span> <span class="s-Atom">value=</span><span class="s2">&quot;b&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-<span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">A</span> <span class="s-Atom">complex</span> <span class="s-Atom">type</span> <span class="s-Atom">can</span> <span class="s-Atom">contains</span> <span class="s-Atom">any</span> <span class="s-Atom">other</span> <span class="s-Atom">complex</span> <span class="nn">objects</span><span class="p">:--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;complex-array&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;array&quot;</span><span class="o">&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">type=</span><span class="s2">&quot;list&quot;</span><span class="o">&gt;</span>
-            <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;a&quot;</span><span class="s-Atom">/&gt;</span>
-            <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;b&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-        <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">type=</span><span class="s2">&quot;list&quot;</span><span class="o">&gt;</span>
-            <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;c&quot;</span><span class="s-Atom">/&gt;</span>
-            <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">value=</span><span class="s2">&quot;d&quot;</span><span class="s-Atom">/&gt;</span>
-        <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-    <span class="s-Atom">&lt;/property</span><span class="o">&gt;</span>
-    <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span><span class="nv">Empty</span> <span class="s-Atom">structures</span> <span class="s-Atom">will</span> <span class="s-Atom">create</span> <span class="s-Atom">empty</span> <span class="nf">objects</span><span class="o">--&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;empty-array&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;array&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;empty-list&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;list&quot;</span><span class="s-Atom">/&gt;</span>
-    <span class="o">&lt;</span><span class="s-Atom">property</span> <span class="s-Atom">name=</span><span class="s2">&quot;empty-map&quot;</span> <span class="s-Atom">type=</span><span class="s2">&quot;map&quot;</span><span class="s-Atom">/&gt;</span>
-<span class="s-Atom">&lt;/instance</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;instance</span> <span class="na">component=</span><span class="s">&quot;a.factory&quot;</span> <span class="na">name=</span><span class="s">&quot;complex-props&quot;</span><span class="nt">&gt;</span>
+        <span class="c">&lt;!--Creates a string array--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;array&quot;</span> <span class="na">type=</span><span class="s">&quot;array&quot;</span><span class="nt">&gt;</span> 
+        <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;a&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;b&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/property&gt;</span>
+        <span class="c">&lt;!--Creates a list containing string--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;list&quot;</span> <span class="na">type=</span><span class="s">&quot;list&quot;</span><span class="nt">&gt;</span> 
+        <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;a&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;b&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/property&gt;</span>
+        <span class="c">&lt;!--Creates a dictionary containing string--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;dict&quot;</span> <span class="na">type=</span><span class="s">&quot;dictionary&quot;</span><span class="nt">&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;a&quot;</span> <span class="na">value=</span><span class="s">&quot;a&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;b&quot;</span> <span class="na">value=</span><span class="s">&quot;b&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/property&gt;</span>
+        <span class="c">&lt;!--Creates a map containing string--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;map&quot;</span> <span class="na">type=</span><span class="s">&quot;map&quot;</span><span class="nt">&gt;</span> 
+        <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;a&quot;</span> <span class="na">value=</span><span class="s">&quot;a&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;b&quot;</span> <span class="na">value=</span><span class="s">&quot;b&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/property&gt;</span>
+    <span class="c">&lt;!--A complex type can contains any other complex objects:--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;complex-array&quot;</span> <span class="na">type=</span><span class="s">&quot;array&quot;</span><span class="nt">&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">type=</span><span class="s">&quot;list&quot;</span><span class="nt">&gt;</span>
+            <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;a&quot;</span><span class="nt">/&gt;</span>
+            <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;b&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;/property&gt;</span>
+        <span class="nt">&lt;property</span> <span class="na">type=</span><span class="s">&quot;list&quot;</span><span class="nt">&gt;</span>
+            <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;c&quot;</span><span class="nt">/&gt;</span>
+            <span class="nt">&lt;property</span> <span class="na">value=</span><span class="s">&quot;d&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;/property&gt;</span>
+    <span class="nt">&lt;/property&gt;</span>
+    <span class="c">&lt;!--Empty structures will create empty objects--&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;empty-array&quot;</span> <span class="na">type=</span><span class="s">&quot;array&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;empty-list&quot;</span> <span class="na">type=</span><span class="s">&quot;list&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;empty-map&quot;</span> <span class="na">type=</span><span class="s">&quot;map&quot;</span><span class="nt">/&gt;</span>
+<span class="nt">&lt;/instance&gt;</span>
 </pre></div>
 
 
-<div class="info" markdown="1">
-**Instance name and factory name**
-The `instance.name` and `factory.name` property should not be set directly. iPOJO will manage those properties. The `instance.name` is simply created from the `instance.name` attribute of the instance declaration or from the `factory-name`-X where X is an integer.
+<div class="alert alert-info" markdown="1">
+<h4>Instance name and factory name</h4>
+The <code>instance.name</code> and <code>factory.name</code> property should not be set directly. iPOJO manages those properties.
 </div>
 
 <h2 id="creating-disposing-and-reconfiguring-instances-with-the-api">Creating, disposing and reconfiguring instances with the API</h2>
-<p>A public factory is accessible through an exposed service (<a href="http://felix.apache.org/ipojo/api/1.2.0/org/apache/felix/ipojo/Factory.html">org.apache.felix.ipojo.Factory </a>). This service is accessible as any other OSGi service, and could be an iPOJO dependency using a LDAP filter or the 'from' attribute such as in:</p>
+<p>A public factory is accessible through an exposed service (<a href="http://felix.apache.org/ipojo/api/1.2.0/org/apache/felix/ipojo/Factory.html">org.apache.felix.ipojo.Factory</a>). This service is accessible as any other OSGi service, and could be an iPOJO dependency using a LDAP filter or the 'from' attribute such as in:</p>
 <div class="codehilite"><pre><span class="nt">&lt;component</span> <span class="na">classname=</span><span class="s">&quot;...&quot;</span><span class="nt">&gt;</span>
-        <span class="c">&lt;!-- These two requirement descriptions are equivalent --&gt;</span>
+    <span class="c">&lt;!-- These two requirement descriptions are equivalent --&gt;</span>
     <span class="nt">&lt;requires</span> <span class="na">field=</span><span class="s">&quot;a_field&quot;</span> <span class="na">filter=</span><span class="s">&quot;(factory.name=factory-name)&quot;</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;requires</span> <span class="na">field=</span><span class="s">&quot;another_field&quot;</span> <span class="na">from=</span><span class="s">&quot;another-factory&quot;</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/component&gt;</span>
@@ -283,85 +314,88 @@ The `instance.name` and `factory.name` p
 
 <h3 id="creating-instances">Creating instances</h3>
 <p>Once you have a reference on the factory you can create instance with the 'createComponentInstance' method.</p>
-<div class="codehilite"><pre><span class="n">ComponentInstance</span> <span class="n">createComponentInstance</span><span class="p">(</span><span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Dictionary</span> <span class="n">configuration</span><span class="p">)</span>
-                                          <span class="n">throws</span> <span class="n">UnacceptableConfiguration</span><span class="p">,</span>
-                                                 <span class="n">MissingHandlerException</span><span class="p">,</span>
-                                                 <span class="n">ConfigurationException</span>
+<div class="codehilite"><pre>ComponentInstance createComponentInstance(java.util.Dictionary configuration)
+                                          throws UnacceptableConfiguration,
+                                                 MissingHandlerException,
+                                                 ConfigurationException
 </pre></div>
 
 
 <p>This method returns a reference on the created instance. As you see, the method receives a dictionary containing the instance configuration. This configuration contains key-value pairs. However, values are either object (of the adequate type) of String used to create objects. This configuration can be 'null' if no properties have to be pushed.</p>
 <div class="info" markdown="1">
-**Instance Name**
-The 'instance.name' property can be used to specify the instance name.
+<h4>Instance Name</h4>
+The `instance.name` property can be used to specify the instance name.
 </div>
 
 <p>Instances are automatically started when created. However, the instance can be invalid, if at least one handler is not valid). 
-The instance creation process can fail. Three exceptions can be thrown during the creation:
-<em> UnacceptableConfiguration means that mandatory properties are missing in the instance configuration
-</em> MissingHandlerException means that the factory is not valid (i.e. an external handler is missing)
-* ConfigurationException means that the instance configuration has failed. The cause can be either an issue in the component type description or an invalid property type.</p>
+The instance creation process can fail. Three exceptions can be thrown during the creation:</p>
+<ul>
+<li>UnacceptableConfiguration means that mandatory properties are missing in the instance configuration</li>
+<li>MissingHandlerException means that the factory is not valid (i.e. an external handler is missing)</li>
+<li>ConfigurationException means that the instance configuration has failed. The cause can be either an issue in the component type description or an invalid property type.</li>
+</ul>
 <p>If an error occurs, a comprehensive message is reported in order to solve the issue.
 The next snippet shows an example of instance creation:</p>
-<div class="codehilite"><pre>    <span class="sr">//</span> <span class="n">Assume</span> <span class="n">we</span> <span class="n">get</span> <span class="n">a</span> <span class="n">Factory</span> <span class="n">in</span> <span class="n">the</span> <span class="n">fact</span> <span class="n">field</span>
-        <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
-        <span class="n">props</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="s">&quot;instance.name&quot;</span><span class="p">,</span><span class="s">&quot;instance-name&quot;</span><span class="p">);</span>
-        <span class="n">props</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="s">&quot;foo&quot;</span><span class="p">,</span> <span class="s">&quot;blablabla&quot;</span><span class="p">);</span>
-        <span class="n">try</span> <span class="p">{</span>
-            <span class="n">instance</span> <span class="o">=</span> <span class="n">fact</span><span class="o">.</span><span class="n">createComponentInstance</span><span class="p">(</span><span class="n">props</span><span class="p">);</span>
-        <span class="p">}</span> <span class="n">catch</span><span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-           <span class="n">fail</span><span class="p">(</span><span class="s">&quot;Cannot create the instance : &quot;</span> <span class="o">+</span> <span class="n">e</span><span class="o">.</span><span class="n">getMessage</span><span class="p">());</span>
-        <span class="p">}</span>
+<div class="codehilite"><pre><span class="c1">// Assume we get a Factory in the fact field</span>
+<span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
+<span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">&quot;instance.name&quot;</span><span class="o">,</span><span class="s">&quot;instance-name&quot;</span><span class="o">);</span>
+<span class="n">props</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">&quot;foo&quot;</span><span class="o">,</span> <span class="s">&quot;blablabla&quot;</span><span class="o">);</span>
+<span class="k">try</span> <span class="o">{</span>
+    <span class="n">instance</span> <span class="o">=</span> <span class="n">fact</span><span class="o">.</span><span class="na">createComponentInstance</span><span class="o">(</span><span class="n">props</span><span class="o">);</span>
+<span class="o">}</span> <span class="k">catch</span><span class="o">(</span><span class="n">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+   <span class="n">fail</span><span class="o">(</span><span class="s">&quot;Cannot create the instance : &quot;</span> <span class="o">+</span> <span class="n">e</span><span class="o">.</span><span class="na">getMessage</span><span class="o">());</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <h3 id="disposing-created-instance">Disposing created instance</h3>
 <p>You can only disposed instances that you created. To dispose an instance, just call the 'dispose' method on the ComponentInstance object (returned by the createComponentInstance method).</p>
-<div class="codehilite"><pre><span class="n">instance</span><span class="o">.</span><span class="n">dispose</span><span class="p">();</span>
+<div class="codehilite"><pre><span class="n">instance</span><span class="o">.</span><span class="na">dispose</span><span class="o">();</span>
 </pre></div>
 
 
 <h3 id="reconfiguring-instance">Reconfiguring instance</h3>
-<p>To reconfigure an instance, call the 'reconfigure' method on the ComponentInstance object. This method receives the new set of properties. Be aware that the 'instance.name' property cannot be changed.</p>
-<div class="codehilite"><pre><span class="n">Properties</span> <span class="n">props2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
-<span class="n">props2</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="s">&quot;foo&quot;</span><span class="p">,</span> <span class="s">&quot;abc&quot;</span><span class="p">);</span>
-<span class="n">instance</span><span class="o">.</span><span class="n">reconfigure</span><span class="p">(</span><span class="n">props2</span><span class="p">);</span>
+<p>To reconfigure an instance, call the <code>reconfigure</code> method on the ComponentInstance object. This method receives the new set of properties. Be aware that the <code>instance.name</code> property cannot be changed.</p>
+<div class="codehilite"><pre><span class="n">Properties</span> <span class="n">props2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
+<span class="n">props2</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">&quot;foo&quot;</span><span class="o">,</span> <span class="s">&quot;abc&quot;</span><span class="o">);</span>
+<span class="n">instance</span><span class="o">.</span><span class="na">reconfigure</span><span class="o">(</span><span class="n">props2</span><span class="o">);</span>
 </pre></div>
 
 
 <h3 id="accessing-services-exposed-by-created-instances">Accessing services exposed by created instances</h3>
 <p>You can obviously access services exposed by an instance that you create. 
 To do this just use the OSGi API and the bundle context in order to query service references in the service registry such as in</p>
-<div class="codehilite"><pre>    <span class="n">ComponentInstance</span> <span class="n">instance</span> <span class="o">=</span> <span class="o">...</span>
-    <span class="sr">//</span> <span class="o">...</span> 
-    <span class="n">try</span> <span class="p">{</span>
-        <span class="n">ServiceReference</span><span class="o">[]</span> <span class="n">refs</span> <span class="o">=</span> 
-              <span class="n">context</span><span class="o">.</span><span class="n">getServiceReferences</span><span class="p">(</span><span class="n">YourServiceInterface</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="s">&quot;(instance.name=&quot;</span> <span class="o">+</span> <span class="n">instance</span><span class="o">.</span><span class="n">getInstanceName</span><span class="p">()</span> <span class="o">+</span><span class="s">&quot;)&quot;</span><span class="p">);</span>
-        <span class="k">if</span> <span class="p">(</span><span class="n">refs</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">Foo</span> <span class="n">your_object</span> <span class="o">=</span> <span class="p">(</span><span class="n">Foo</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">refs</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
-        <span class="p">}</span>
-    <span class="p">}</span> <span class="n">catch</span> <span class="p">(</span><span class="n">InvalidSyntaxException</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-        <span class="sr">//</span> <span class="n">Should</span> <span class="ow">not</span> <span class="n">happen</span>
-    <span class="p">}</span>
+<div class="codehilite"><pre><span class="n">ComponentInstance</span> <span class="n">instance</span> <span class="o">=</span> <span class="o">...</span>
+<span class="c1">// ... </span>
+<span class="k">try</span> <span class="o">{</span>
+    <span class="n">ServiceReference</span><span class="o">[]</span> <span class="n">refs</span> <span class="o">=</span> 
+          <span class="n">context</span><span class="o">.</span><span class="na">getServiceReferences</span><span class="o">(</span><span class="n">YourServiceInterface</span><span class="o">.</span><span class="na">class</span><span class="o">.</span><span class="na">getName</span><span class="o">(),</span> 
+          <span class="s">&quot;(instance.name=&quot;</span> <span class="o">+</span> <span class="n">instance</span><span class="o">.</span><span class="na">getInstanceName</span><span class="o">()</span> <span class="o">+</span><span class="s">&quot;)&quot;</span><span class="o">);</span>
+    <span class="k">if</span> <span class="o">(</span><span class="n">refs</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
+        <span class="n">Foo</span> <span class="n">your_object</span> <span class="o">=</span> <span class="o">(</span><span class="n">Foo</span><span class="o">)</span> <span class="n">context</span><span class="o">.</span><span class="na">getService</span><span class="o">(</span><span class="n">refs</span><span class="o">[</span><span class="mi">0</span><span class="o">]);</span>
+    <span class="o">}</span>
+<span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">InvalidSyntaxException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+    <span class="c1">// Should not happen</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <p>The LDAP filter allows selecting the service provided by your instance. Be care that this service can be not accessible if the instance is not valid. Once you get the service reference, you can ask the service registry to get the service object (i.e. the object contained in your instance). </p>
 <p>If your instance does not provide services, you can access to the instance by following principles illustrated in the next snippet:</p>
-<div class="codehilite"><pre>    <span class="k">if</span> <span class="p">(</span><span class="n">instance</span><span class="o">.</span><span class="n">getState</span><span class="p">()</span> <span class="o">==</span> <span class="n">ComponentInstance</span><span class="o">.</span><span class="n">VALID</span><span class="p">)</span> <span class="p">{</span>
-       <span class="n">ImplementationClass</span> <span class="n">object</span> <span class="o">=</span> 
-          <span class="p">(</span><span class="n">ImplementationClass</span><span class="p">)</span> <span class="p">((</span><span class="n">InstanceManager</span><span class="p">)</span> <span class="n">instance</span><span class="p">)</span><span class="o">.</span><span class="n">getPojoObject</span><span class="p">();</span>
-    <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-       <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;Cannot get an implementation object from an invalid instance&quot;</span><span class="p">);</span>
-    <span class="p">}</span>
+<div class="codehilite"><pre><span class="k">if</span> <span class="o">(</span><span class="n">instance</span><span class="o">.</span><span class="na">getState</span><span class="o">()</span> <span class="o">==</span> <span class="n">ComponentInstance</span><span class="o">.</span><span class="na">VALID</span><span class="o">)</span> <span class="o">{</span>
+   <span class="n">ImplementationClass</span> <span class="n">object</span> <span class="o">=</span> 
+      <span class="o">(</span><span class="n">ImplementationClass</span><span class="o">)</span> <span class="o">((</span><span class="n">InstanceManager</span><span class="o">)</span> <span class="n">instance</span><span class="o">).</span><span class="na">getPojoObject</span><span class="o">();</span>
+<span class="o">}</span> <span class="k">else</span> <span class="o">{</span>
+   <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">&quot;Cannot get an implementation object from an invalid instance&quot;</span><span class="o">);</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <p>Take care to check the instance state before accessing the object. Indeed, the behavior of an invalid instance is not guaranty. The 'getPojoObject' method will return an already created implementation (pojo) object or create a new one (if none already created).</p>
 <h2 id="how-to-use-the-managedservicefactory-to-create-disposed-and-reconfigure-instances">How to use the ManagedServiceFactory to create, disposed and reconfigure instances</h2>
-<p>The principle of the ManagedServiceFactory is the same as the iPOJO Factory Service. So, you can create, dispose and reconfigure instances with the Configuration Admin. For further information, read the OSGi R4.x Compendium - Configuration Admin chapter.
-Be aware that the <code>updated</code> method is used both for instance creation (if the given configuration is new) and to reconfigure an existing instance. The <code>deleted</code> method is used to dispose instances.</p>
+<p>The principle of the ManagedServiceFactory is the same as the iPOJO Factory Service. So, you can create, dispose and reconfigure instances with the Configuration Admin.
+For further information, read the OSGi R4.x Compendium - Configuration Admin chapter.</p>
+<p>Be aware that the <code>updated</code> method is used both for instance creation (if the given configuration is new) and to reconfigure an existing instance. The <code>deleted</code> method is used to dispose instances.</p>
         </div>
     </div>
 
@@ -376,7 +410,7 @@ Be aware that the <code>updated</code> m
                 may be trademarks or registered trademarks of their respective owners.
                 </div>
                 <div class="timestamp span3 offset2">
-                Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
+                Rev. 1467268 by clement on Fri, 12 Apr 2013 13:42:34 +0000
                 </div>
             </div>
         </footer>           

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-hierarchical-composition-overview.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-hierarchical-composition-overview.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-hierarchical-composition-overview.html Fri Apr 12 13:43:19 2013
@@ -96,11 +96,13 @@
                                     <a tabindex="-1" href="#">Advanced topics</a>
                                     <ul class="dropdown-menu">
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
-                                        <li><a href="">Factories and Instances</a></li>
-                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">Factories and Instances</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html">XML Schemas</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
-                                        <li><a href="">Testing components</a></li>
-                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.html">Constructing service objects with factory methods</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.html">Using the introspection API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.html">Testing components</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
@@ -138,7 +140,8 @@
                             <ul class="dropdown-menu" id="swatch-menu">
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.html">Supported JVMs</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.html">Supported OSGi Implementations</a></li>
-                                <li><a href="">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html">Article & Presentations</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html">Developping Camel mediators with iPOJO</a></li>
                             </ul>
                         </li>
                     </ul>