felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r849584 [14/18] - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/ documentation/subprojects/apache-felix-ipojo/ documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/ documentation/subprojects/apac...
Date Wed, 06 Feb 2013 16:23:23 GMT
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 Wed Feb  6 16:23:22 2013
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -17,200 +16,142 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <head>
+
+<head>
     <title>Apache Felix - Combining iPOJO and Configuration Admin</title>
     <link rel="icon" href="/res/favicon.ico">
-    <link rel="stylesheet" href="/site/media.data/site.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/superfish.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/style.css" type="text/css" media="all">
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     
-    <!--
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shCore.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushCSharp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPhp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJScript.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushVb.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushSql.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushXml.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushShell.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushDelphi.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPython.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJava.js"></script>
-    -->
-    
-    <script type="text/javascript" src="/ipojo/site/jquery-1.js"></script>
-    <script type="text/javascript" src="/ipojo/site/hoverIntent.js"></script>
-    <script type="text/javascript" src="/ipojo/site/superfish.js"></script> 
-    <script type="text/javascript" src="/ipojo/site/supersubs.js"></script> 
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="The most powerful component model for OSGi">
+
     
-    <script type="text/javascript"> 
-     
-        $(document).ready(function(){ 
-            $("ul.sf-menu").supersubs({ 
-                minWidth:    14,   // minimum width of sub-menus in em units 
-                maxWidth:    30,   // maximum width of sub-menus in em units 
-                extraWidth:  1     // extra width can ensure lines don't sometimes turn over 
-                                   // due to slight rounding differences and font-family 
-            }).superfish();  // call supersubs first, then superfish, so that subs are 
-                             // not display:none when measuring. Call before initialising 
-                             // containing tabs for same reason. 
-        }); 
-     
-    </script>
+    <link href="/ipojo/web/bootstrap/css/bootstrap-cerulean.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/ipojo/web/style.css" rel="stylesheet">
+
+
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="/ipojo/web/bootstrap/js/bootstrap.min.js"></script>
     
-  </head>
-  <body>
-    <div class="title">
-      <div class="logo">
-        <a href="http://felix.apache.org/">
-          <img border="0" alt="Apache Felix" src="/res/logo.png">
-        </a>
-      </div>
-      <div class="header">
-        <a href="http://www.apache.org/">
-          <img border="0" alt="Apache" src="/res/apache.png">
-        </a>
-      </div>
+</head>
+
+<body data-spy="scroll" data-target=".subnav">
+    <div class="navbar navbar-fixed-top navbar-inverse">
+        <div class="navbar-inner">
+            <div class="container">
+               <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                </a>
+                <a class="brand" href="#">Apache Felix iPOJO</a>
+         
+                 <div class="nav-collapse" id="main-menu">
+                    <ul class="nav" id="main-menu-left">
+                        <li><a href="news.html">News</a></li>
+                        <li><a href="/downloads.cgi">Download</a></li>
+                    
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tutorials <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Why choose iPOJO</a></li>
+                                <li><a href="">Success stories</a></li>
+                                <li><a href="">Features</a></li>
+                                <li class="divider"></li>
+                                <li><a href="">iPOJO in 10 minutes</a></li>
+                                <li><a href="">Using Annotations</a></li>
+                                <li><a href="">Maven tutorial</a></li>
+                                <li><a href="">Advanced tutorial</a></li>
+                                <li><a href="">Using Distributed OSGi</a></li>
+                                <li><a href="">Application Composition</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Requiring a service</a></li>
+                                <li><a href="">Providing a service</a></li>
+                                <li><a href="">Lifecycle management</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/configuration-handler.html">Configuration</a></li>
+                                <li><a href="">Introspection</a></li>
+                                <li><a href="">Impacting the lifecycle</a></li>
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">External <em>handlers</em></a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">Asynchronous communication</a></li>
+                                        <li><a href="">JMX management</a></li>
+                                        <li><a href="">Extender pattern</a></li>
+                                        <li><a href="">Whiteboard pattern</a></li>
+                                        <li><a href="">Temporal dependencies</a></li>
+                                    </ul>
+                                </li>                                            
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Advanced topics</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">iPOJO and config admin</a></li>
+                                        <li><a href="">Factories and Instances</a></li>
+                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="">API</a></li>
+                                        <li><a href="">Testing components</a></li>
+                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="">Reference Card</a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="">Handler development</a></li>
+                                        <li><a href="">Manipulation Metadata </a></li>
+                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="tools-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Ant Task</a></li>
+                                <li><a href="">Eclipse Plugin</a></li>
+                                <li><a href="">Maven Plugin</a></li>
+                                <li><a href="">`arch` shell command</a></li>
+                                <li><a href="">Online Manipulator</a></li>
+                                <li><a href="">Webconsole plugin</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="community-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Support</a></li>
+                                <li><a href="http://www.apache.org/">ASF</a></li>
+                                <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                                <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="misc-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Misc <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Supported JVMs</a></li>
+                                <li><a href="">Supported OSGi Implementations</a></li>
+                                <li><a href="">Article & Presentations</a></li>
+                            </ul>
+                        </li>
+                    </ul>
+                    <ul class="nav pull-right" id="main-menu-right">
+                        <li><a rel="tooltip" target="_blank" href="http://felix.apache.org">Apache Felix <i class="icon-share-alt"></i></a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>    
     </div>
-  
-    <div class="main">
-    <div class="main">
-    <div class="page-header">
-    <img src="/ipojo/site/header.png" class="header">
-    <a href="http://ipojo.org"><img src="/ipojo/site/ipojo.png" width="225" class="header-logo"></a>
-    <ul class="sf-menu sf-js-enabled sf-shadow" id="ipojo-menu">
-    <li class="current">
-    <!-- Menu Overview -->
-    <a href="#" class="sf-with-ul">Overview<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <li>
-        <a href="">Home</a>                          
-        </li>
-        <li>
-        <a href="">Why choose iPOJO</a>
-        </li>
-        <li>
-        <a href="">Success stories</a>
-        </li>
-        <li>
-        <a href="">Features</a>
-        </li>
-    </ul>
-    </li>   
-    
-    <li class="">           
-    <!-- Menu download -->
-    <li>
-    <a href="/downloads.cgi">Download </a>
-    </li>
-    
-    <li class="">                   
-    <!-- Menu Documentation -->
-    <a href="#" class="sf-with-ul">Documentation<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <!-- sub-menu : getting started -->
-        <li class="">
-        <a href="#" class="sf-with-ul">Getting Started<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-        <ul>
-         <li><a href="">iPOJO in 10 minutes</a></li>
-         <li><a href="">Using Annotations</a></li>
-         <li><a href="">Maven tutorial</a></li>
-         <li><a href="">Advanced tutorial</a></li>
-         <li><a href="">Using Distributed OSGi</a></li>
-         <li><a href="">Application Composition</a></li>
-        </ul>
-        </li> <!-- end of getting started -->
-        <!-- sub menu : Describing Components -->
-         <li class="">
-            <a href="" class="sf-with-ul">Describing components<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">Requiring a service</a></li>
-            <li><a href="">Providing a service</a></li>
-            <li><a href="">Lifecycle management</a></li>
-            <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/configuration-handler.html">Configuration</a></li>
-            <li><a href="">Introspection</a></li>
-            <li><a href="">Impacting the lifecycle</a></li>
-            <li><a href="">Asynchronous communication</a></li>
-            <li><a href="">JMX management</a></li>
-            <li><a href="">Extender pattern</a></li>
-            <li><a href="">Whiteboard pattern</a></li>
-            <li><a href="">Temporal dependencies</a></li>
-            </ul>
-         </li> <!-- End of describing components -->
-        <!-- sub-menu : User Guide -->
-        <li class="">
-        <a href="" class="sf-with-ul">User Guide<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">iPOJO and config admin</a></li>
-            <li><a href="">Factories and Instances</a></li>
-            <li><a href="">XML Schemas</a></li>
-            <li><a href="">API</a></li>
-            <li><a href="">Testing components</a></li>
-            <li><a href="">Eclipse Integration</a></li>
-            <li><a href="">FAQ</a></li>
-            <li><a href="">Reference Card</a></li>
-            </ul>
-        </li> <!-- end of user guide -->
-        <!-- sub-menu : Dev Guide -->
-        <li> 
-        <a href="#" class="sf-with-ul">Advanced Topics<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-           <ul>
-            <li><a href="http://felix.apache.org/ipojo/api/1.6.0">Javadoc</a></li>
-            <li><a href="">Handler development</a></li>
-            <li><a href="">Manipulation Metadata </a></li>
-            <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
-           </ul>
-        </li> <!-- End of Dev guide -->
-    </ul> 
-    </li> <!-- End of doc -->
-    <!-- Menu 4 : Tools -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Tools<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Ant Task</a></li>
-       <li><a href="">Eclipse Plugin</a></li>
-       <li><a href="">Maven Plugin</a></li>
-       <li><a href="">`arch` shell command</a></li>
-       <li><a href="">Online Manipulator</a></li>
-       <li><a href="">Webconsole plugin</a></li>
-       <li><a href="">Junit4OSGi</a></li>
-    </ul>   
-    </li><!-- End of tools -->  
-    <!-- Menu 5 : Support -->
-    <li>
-    <a href="">Support </a>
-    </li>
-    <!-- End of the menu 5 -->          
-    <!-- Menu 6 : Misc -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Misc<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Supported JVMs</a></li>
-       <li><a href="">Supported OSGi Implementations</a></li>
-       <li><a href="http://ipojo-dark-side.blogspot.com">iPOJO's Dark Side Blog</a></li>
-       <li><a href="">Article & Presentations</a></li>
-       <li><a href="http://www.apache.org/">ASF</a></li>
-       <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-       <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
-    </ul>
-    </li><!-- End of misc -->
-    </ul> <!-- End of the menu -->
-    </div> <!-- Page header -->
-  
-      <!-- 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/combining-ipojo-and-configuration-admin.html" target="felix_cwiki">/site/combining-ipojo-and-configuration-admin.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>Combining iPOJO and Configuration Admin</h1>
-      
-      <div class="content">
-        <h1 id="combining-ipojo-and-configuration-admin">Combining iPOJO and Configuration Admin</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="combining-ipojo-and-configuration-admin">Combining iPOJO and Configuration Admin</h1>
 <p><em>This page presents how creating, reconfiguring and destroying iPOJO component instance with the OSGi Configuration Admin.</em></p>
 <p>{div:class=toc}
 [TOC]
@@ -474,31 +415,37 @@ Now we can remove this property by recon
 <p>The service does no more publish the <code>p1</code> property.</p>
 <h2 id="conclusion">Conclusion</h2>
 <p>This page has presented how to combine the configuration admin and iPOJO. You can also use <a href="http://ipojo-dark-side.blogspot.com/2009/04/ipojo-and-file-install-configuring.html">FileInstall in combination with iPOJO and the Configuration Admin</a>. Subscribe to the Felix users mailing list by sending a message to [mailto:users-subscribe@felix.apache.org]; after subscribing, email questions or feedback to [mailto:users@felix.apache.org]</p>
-      </div>
-      
-      <img src="http://felix.apache.org/ipojo/site/footer.png" class="footer">
-
-      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
-      </div>
-      <div class="trademarkFooter"> 
-        Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
-        logo are trademarks of The Apache Software Foundation. All other marks mentioned
-        may be trademarks or registered trademarks of their respective owners.
-      </div>
+        </div>
     </div>
+
+    <hr/>
+
+    <div class="container">
+        <footer id="footer">
+            <div class="row">
+                <div class="trademarkFooter span7"> 
+                Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
+                logo are trademarks of The Apache Software Foundation. All other marks mentioned
+                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
+                </div>
+            </div>
+        </footer>           
     </div>
-    
-    <script type="text/javascript">
+</body>
+
+<script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
+</script>
+
+<script type="text/javascript">
     try{
-    var pageTracker = _gat._getTracker("UA-1518442-4");
-    pageTracker._trackPageview();
+        var pageTracker = _gat._getTracker("UA-1518442-4");
+        pageTracker._trackPageview();
     } catch(err) {}
-    </script>
+</script>
 
-  </body>
 </html>

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 Wed Feb  6 16:23:22 2013
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -17,200 +16,142 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <head>
+
+<head>
     <title>Apache Felix - Constructing POJO objects with factory methods</title>
     <link rel="icon" href="/res/favicon.ico">
-    <link rel="stylesheet" href="/site/media.data/site.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/superfish.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/style.css" type="text/css" media="all">
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    
-    <!--
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shCore.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushCSharp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPhp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJScript.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushVb.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushSql.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushXml.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushShell.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushDelphi.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPython.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJava.js"></script>
-    -->
     
-    <script type="text/javascript" src="/ipojo/site/jquery-1.js"></script>
-    <script type="text/javascript" src="/ipojo/site/hoverIntent.js"></script>
-    <script type="text/javascript" src="/ipojo/site/superfish.js"></script> 
-    <script type="text/javascript" src="/ipojo/site/supersubs.js"></script> 
-    
-    <script type="text/javascript"> 
-     
-        $(document).ready(function(){ 
-            $("ul.sf-menu").supersubs({ 
-                minWidth:    14,   // minimum width of sub-menus in em units 
-                maxWidth:    30,   // maximum width of sub-menus in em units 
-                extraWidth:  1     // extra width can ensure lines don't sometimes turn over 
-                                   // due to slight rounding differences and font-family 
-            }).superfish();  // call supersubs first, then superfish, so that subs are 
-                             // not display:none when measuring. Call before initialising 
-                             // containing tabs for same reason. 
-        }); 
-     
-    </script>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="The most powerful component model for OSGi">
+
     
-  </head>
-  <body>
-    <div class="title">
-      <div class="logo">
-        <a href="http://felix.apache.org/">
-          <img border="0" alt="Apache Felix" src="/res/logo.png">
-        </a>
-      </div>
-      <div class="header">
-        <a href="http://www.apache.org/">
-          <img border="0" alt="Apache" src="/res/apache.png">
-        </a>
-      </div>
+    <link href="/ipojo/web/bootstrap/css/bootstrap-cerulean.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/ipojo/web/style.css" rel="stylesheet">
+
+
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="/ipojo/web/bootstrap/js/bootstrap.min.js"></script>
+    
+</head>
+
+<body data-spy="scroll" data-target=".subnav">
+    <div class="navbar navbar-fixed-top navbar-inverse">
+        <div class="navbar-inner">
+            <div class="container">
+               <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                </a>
+                <a class="brand" href="#">Apache Felix iPOJO</a>
+         
+                 <div class="nav-collapse" id="main-menu">
+                    <ul class="nav" id="main-menu-left">
+                        <li><a href="news.html">News</a></li>
+                        <li><a href="/downloads.cgi">Download</a></li>
+                    
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tutorials <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Why choose iPOJO</a></li>
+                                <li><a href="">Success stories</a></li>
+                                <li><a href="">Features</a></li>
+                                <li class="divider"></li>
+                                <li><a href="">iPOJO in 10 minutes</a></li>
+                                <li><a href="">Using Annotations</a></li>
+                                <li><a href="">Maven tutorial</a></li>
+                                <li><a href="">Advanced tutorial</a></li>
+                                <li><a href="">Using Distributed OSGi</a></li>
+                                <li><a href="">Application Composition</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Requiring a service</a></li>
+                                <li><a href="">Providing a service</a></li>
+                                <li><a href="">Lifecycle management</a></li>
+                                <li><a href="">Configuration</a></li>
+                                <li><a href="">Introspection</a></li>
+                                <li><a href="">Impacting the lifecycle</a></li>
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">External <em>handlers</em></a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">Asynchronous communication</a></li>
+                                        <li><a href="">JMX management</a></li>
+                                        <li><a href="">Extender pattern</a></li>
+                                        <li><a href="">Whiteboard pattern</a></li>
+                                        <li><a href="">Temporal dependencies</a></li>
+                                    </ul>
+                                </li>                                            
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Advanced topics</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">iPOJO and config admin</a></li>
+                                        <li><a href="">Factories and Instances</a></li>
+                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="">API</a></li>
+                                        <li><a href="">Testing components</a></li>
+                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="">Reference Card</a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="">Handler development</a></li>
+                                        <li><a href="">Manipulation Metadata </a></li>
+                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="tools-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Ant Task</a></li>
+                                <li><a href="">Eclipse Plugin</a></li>
+                                <li><a href="">Maven Plugin</a></li>
+                                <li><a href="">`arch` shell command</a></li>
+                                <li><a href="">Online Manipulator</a></li>
+                                <li><a href="">Webconsole plugin</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="community-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Support</a></li>
+                                <li><a href="http://www.apache.org/">ASF</a></li>
+                                <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                                <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="misc-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Misc <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Supported JVMs</a></li>
+                                <li><a href="">Supported OSGi Implementations</a></li>
+                                <li><a href="">Article & Presentations</a></li>
+                            </ul>
+                        </li>
+                    </ul>
+                    <ul class="nav pull-right" id="main-menu-right">
+                        <li><a rel="tooltip" target="_blank" href="http://felix.apache.org">Apache Felix <i class="icon-share-alt"></i></a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>    
     </div>
-  
-    <div class="main">
-    <div class="main">
-    <div class="page-header">
-    <img src="/ipojo/site/header.png" class="header">
-    <a href="http://ipojo.org"><img src="/ipojo/site/ipojo.png" width="225" class="header-logo"></a>
-    <ul class="sf-menu sf-js-enabled sf-shadow" id="ipojo-menu">
-    <li class="current">
-    <!-- Menu Overview -->
-    <a href="#" class="sf-with-ul">Overview<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <li>
-        <a href="">Home</a>                          
-        </li>
-        <li>
-        <a href="">Why choose iPOJO</a>
-        </li>
-        <li>
-        <a href="">Success stories</a>
-        </li>
-        <li>
-        <a href="">Features</a>
-        </li>
-    </ul>
-    </li>   
-    
-    <li class="">           
-    <!-- Menu download -->
-    <li>
-    <a href="/downloads.cgi">Download </a>
-    </li>
-    
-    <li class="">                   
-    <!-- Menu Documentation -->
-    <a href="#" class="sf-with-ul">Documentation<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <!-- sub-menu : getting started -->
-        <li class="">
-        <a href="#" class="sf-with-ul">Getting Started<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-        <ul>
-         <li><a href="">iPOJO in 10 minutes</a></li>
-         <li><a href="">Using Annotations</a></li>
-         <li><a href="">Maven tutorial</a></li>
-         <li><a href="">Advanced tutorial</a></li>
-         <li><a href="">Using Distributed OSGi</a></li>
-         <li><a href="">Application Composition</a></li>
-        </ul>
-        </li> <!-- end of getting started -->
-        <!-- sub menu : Describing Components -->
-         <li class="">
-            <a href="" class="sf-with-ul">Describing components<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">Requiring a service</a></li>
-            <li><a href="">Providing a service</a></li>
-            <li><a href="">Lifecycle management</a></li>
-            <li><a href="">Configuration</a></li>
-            <li><a href="">Introspection</a></li>
-            <li><a href="">Impacting the lifecycle</a></li>
-            <li><a href="">Asynchronous communication</a></li>
-            <li><a href="">JMX management</a></li>
-            <li><a href="">Extender pattern</a></li>
-            <li><a href="">Whiteboard pattern</a></li>
-            <li><a href="">Temporal dependencies</a></li>
-            </ul>
-         </li> <!-- End of describing components -->
-        <!-- sub-menu : User Guide -->
-        <li class="">
-        <a href="" class="sf-with-ul">User Guide<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">iPOJO and config admin</a></li>
-            <li><a href="">Factories and Instances</a></li>
-            <li><a href="">XML Schemas</a></li>
-            <li><a href="">API</a></li>
-            <li><a href="">Testing components</a></li>
-            <li><a href="">Eclipse Integration</a></li>
-            <li><a href="">FAQ</a></li>
-            <li><a href="">Reference Card</a></li>
-            </ul>
-        </li> <!-- end of user guide -->
-        <!-- sub-menu : Dev Guide -->
-        <li> 
-        <a href="#" class="sf-with-ul">Advanced Topics<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-           <ul>
-            <li><a href="http://felix.apache.org/ipojo/api/1.6.0">Javadoc</a></li>
-            <li><a href="">Handler development</a></li>
-            <li><a href="">Manipulation Metadata </a></li>
-            <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
-           </ul>
-        </li> <!-- End of Dev guide -->
-    </ul> 
-    </li> <!-- End of doc -->
-    <!-- Menu 4 : Tools -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Tools<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Ant Task</a></li>
-       <li><a href="">Eclipse Plugin</a></li>
-       <li><a href="">Maven Plugin</a></li>
-       <li><a href="">`arch` shell command</a></li>
-       <li><a href="">Online Manipulator</a></li>
-       <li><a href="">Webconsole plugin</a></li>
-       <li><a href="">Junit4OSGi</a></li>
-    </ul>   
-    </li><!-- End of tools -->  
-    <!-- Menu 5 : Support -->
-    <li>
-    <a href="">Support </a>
-    </li>
-    <!-- End of the menu 5 -->          
-    <!-- Menu 6 : Misc -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Misc<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Supported JVMs</a></li>
-       <li><a href="">Supported OSGi Implementations</a></li>
-       <li><a href="http://ipojo-dark-side.blogspot.com">iPOJO's Dark Side Blog</a></li>
-       <li><a href="">Article & Presentations</a></li>
-       <li><a href="http://www.apache.org/">ASF</a></li>
-       <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-       <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
-    </ul>
-    </li><!-- End of misc -->
-    </ul> <!-- End of the menu -->
-    </div> <!-- Page header -->
-  
-      <!-- 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/constructing-pojo-objects-with-factory-methods.html" target="felix_cwiki">/site/constructing-pojo-objects-with-factory-methods.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>Constructing POJO objects with factory methods</h1>
-      
-      <div class="content">
-        <h1 id="using-a-factory-method-to-create-pojo-object">Using a factory method to create POJO object</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="using-a-factory-method-to-create-pojo-object">Using a factory method to create POJO object</h1>
 <p><em>By default, iPOJO calls the POJO constructor to create objects. This constructor can either has no argument or receive the bundle context. However sometimes, you may want a more sophisticated object creation policy.</em></p>
 <p>iPOJO allows you describing a factory method called to create POJO objects instead of the  constructor. So, every time that iPOJO needs to create an instance of your POJO class, this method will be called to obtain the object.</p>
 <p>To use this feature you need to add the <code>factory-method</code> attribute in the Component element as illustrated below:</p>
@@ -243,31 +184,37 @@
         <span class="k">return</span> <span class="n">singleton</span><span class="p">;</span>
     <span class="p">}</span>
 </pre></div>
-      </div>
-      
-      <img src="http://felix.apache.org/ipojo/site/footer.png" class="footer">
-
-      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
-      </div>
-      <div class="trademarkFooter"> 
-        Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
-        logo are trademarks of The Apache Software Foundation. All other marks mentioned
-        may be trademarks or registered trademarks of their respective owners.
-      </div>
+        </div>
     </div>
+
+    <hr/>
+
+    <div class="container">
+        <footer id="footer">
+            <div class="row">
+                <div class="trademarkFooter span7"> 
+                Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
+                logo are trademarks of The Apache Software Foundation. All other marks mentioned
+                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
+                </div>
+            </div>
+        </footer>           
     </div>
-    
-    <script type="text/javascript">
+</body>
+
+<script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
+</script>
+
+<script type="text/javascript">
     try{
-    var pageTracker = _gat._getTracker("UA-1518442-4");
-    pageTracker._trackPageview();
+        var pageTracker = _gat._getTracker("UA-1518442-4");
+        pageTracker._trackPageview();
     } catch(err) {}
-    </script>
+</script>
 
-  </body>
 </html>

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 Wed Feb  6 16:23:22 2013
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -17,200 +16,142 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <head>
+
+<head>
     <title>Apache Felix - How-to use iPOJO factories</title>
     <link rel="icon" href="/res/favicon.ico">
-    <link rel="stylesheet" href="/site/media.data/site.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/superfish.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/style.css" type="text/css" media="all">
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     
-    <!--
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shCore.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushCSharp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPhp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJScript.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushVb.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushSql.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushXml.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushShell.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushDelphi.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPython.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJava.js"></script>
-    -->
-    
-    <script type="text/javascript" src="/ipojo/site/jquery-1.js"></script>
-    <script type="text/javascript" src="/ipojo/site/hoverIntent.js"></script>
-    <script type="text/javascript" src="/ipojo/site/superfish.js"></script> 
-    <script type="text/javascript" src="/ipojo/site/supersubs.js"></script> 
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="The most powerful component model for OSGi">
+
     
-    <script type="text/javascript"> 
-     
-        $(document).ready(function(){ 
-            $("ul.sf-menu").supersubs({ 
-                minWidth:    14,   // minimum width of sub-menus in em units 
-                maxWidth:    30,   // maximum width of sub-menus in em units 
-                extraWidth:  1     // extra width can ensure lines don't sometimes turn over 
-                                   // due to slight rounding differences and font-family 
-            }).superfish();  // call supersubs first, then superfish, so that subs are 
-                             // not display:none when measuring. Call before initialising 
-                             // containing tabs for same reason. 
-        }); 
-     
-    </script>
+    <link href="/ipojo/web/bootstrap/css/bootstrap-cerulean.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/ipojo/web/style.css" rel="stylesheet">
+
+
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="/ipojo/web/bootstrap/js/bootstrap.min.js"></script>
     
-  </head>
-  <body>
-    <div class="title">
-      <div class="logo">
-        <a href="http://felix.apache.org/">
-          <img border="0" alt="Apache Felix" src="/res/logo.png">
-        </a>
-      </div>
-      <div class="header">
-        <a href="http://www.apache.org/">
-          <img border="0" alt="Apache" src="/res/apache.png">
-        </a>
-      </div>
+</head>
+
+<body data-spy="scroll" data-target=".subnav">
+    <div class="navbar navbar-fixed-top navbar-inverse">
+        <div class="navbar-inner">
+            <div class="container">
+               <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                </a>
+                <a class="brand" href="#">Apache Felix iPOJO</a>
+         
+                 <div class="nav-collapse" id="main-menu">
+                    <ul class="nav" id="main-menu-left">
+                        <li><a href="news.html">News</a></li>
+                        <li><a href="/downloads.cgi">Download</a></li>
+                    
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tutorials <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Why choose iPOJO</a></li>
+                                <li><a href="">Success stories</a></li>
+                                <li><a href="">Features</a></li>
+                                <li class="divider"></li>
+                                <li><a href="">iPOJO in 10 minutes</a></li>
+                                <li><a href="">Using Annotations</a></li>
+                                <li><a href="">Maven tutorial</a></li>
+                                <li><a href="">Advanced tutorial</a></li>
+                                <li><a href="">Using Distributed OSGi</a></li>
+                                <li><a href="">Application Composition</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Requiring a service</a></li>
+                                <li><a href="">Providing a service</a></li>
+                                <li><a href="">Lifecycle management</a></li>
+                                <li><a href="">Configuration</a></li>
+                                <li><a href="">Introspection</a></li>
+                                <li><a href="">Impacting the lifecycle</a></li>
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">External <em>handlers</em></a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">Asynchronous communication</a></li>
+                                        <li><a href="">JMX management</a></li>
+                                        <li><a href="">Extender pattern</a></li>
+                                        <li><a href="">Whiteboard pattern</a></li>
+                                        <li><a href="">Temporal dependencies</a></li>
+                                    </ul>
+                                </li>                                            
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Advanced topics</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">iPOJO and config admin</a></li>
+                                        <li><a href="">Factories and Instances</a></li>
+                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="">API</a></li>
+                                        <li><a href="">Testing components</a></li>
+                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="">Reference Card</a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="">Handler development</a></li>
+                                        <li><a href="">Manipulation Metadata </a></li>
+                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="tools-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Ant Task</a></li>
+                                <li><a href="">Eclipse Plugin</a></li>
+                                <li><a href="">Maven Plugin</a></li>
+                                <li><a href="">`arch` shell command</a></li>
+                                <li><a href="">Online Manipulator</a></li>
+                                <li><a href="">Webconsole plugin</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="community-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Support</a></li>
+                                <li><a href="http://www.apache.org/">ASF</a></li>
+                                <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                                <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="misc-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Misc <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Supported JVMs</a></li>
+                                <li><a href="">Supported OSGi Implementations</a></li>
+                                <li><a href="">Article & Presentations</a></li>
+                            </ul>
+                        </li>
+                    </ul>
+                    <ul class="nav pull-right" id="main-menu-right">
+                        <li><a rel="tooltip" target="_blank" href="http://felix.apache.org">Apache Felix <i class="icon-share-alt"></i></a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>    
     </div>
-  
-    <div class="main">
-    <div class="main">
-    <div class="page-header">
-    <img src="/ipojo/site/header.png" class="header">
-    <a href="http://ipojo.org"><img src="/ipojo/site/ipojo.png" width="225" class="header-logo"></a>
-    <ul class="sf-menu sf-js-enabled sf-shadow" id="ipojo-menu">
-    <li class="current">
-    <!-- Menu Overview -->
-    <a href="#" class="sf-with-ul">Overview<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <li>
-        <a href="">Home</a>                          
-        </li>
-        <li>
-        <a href="">Why choose iPOJO</a>
-        </li>
-        <li>
-        <a href="">Success stories</a>
-        </li>
-        <li>
-        <a href="">Features</a>
-        </li>
-    </ul>
-    </li>   
-    
-    <li class="">           
-    <!-- Menu download -->
-    <li>
-    <a href="/downloads.cgi">Download </a>
-    </li>
-    
-    <li class="">                   
-    <!-- Menu Documentation -->
-    <a href="#" class="sf-with-ul">Documentation<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <!-- sub-menu : getting started -->
-        <li class="">
-        <a href="#" class="sf-with-ul">Getting Started<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-        <ul>
-         <li><a href="">iPOJO in 10 minutes</a></li>
-         <li><a href="">Using Annotations</a></li>
-         <li><a href="">Maven tutorial</a></li>
-         <li><a href="">Advanced tutorial</a></li>
-         <li><a href="">Using Distributed OSGi</a></li>
-         <li><a href="">Application Composition</a></li>
-        </ul>
-        </li> <!-- end of getting started -->
-        <!-- sub menu : Describing Components -->
-         <li class="">
-            <a href="" class="sf-with-ul">Describing components<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">Requiring a service</a></li>
-            <li><a href="">Providing a service</a></li>
-            <li><a href="">Lifecycle management</a></li>
-            <li><a href="">Configuration</a></li>
-            <li><a href="">Introspection</a></li>
-            <li><a href="">Impacting the lifecycle</a></li>
-            <li><a href="">Asynchronous communication</a></li>
-            <li><a href="">JMX management</a></li>
-            <li><a href="">Extender pattern</a></li>
-            <li><a href="">Whiteboard pattern</a></li>
-            <li><a href="">Temporal dependencies</a></li>
-            </ul>
-         </li> <!-- End of describing components -->
-        <!-- sub-menu : User Guide -->
-        <li class="">
-        <a href="" class="sf-with-ul">User Guide<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">iPOJO and config admin</a></li>
-            <li><a href="">Factories and Instances</a></li>
-            <li><a href="">XML Schemas</a></li>
-            <li><a href="">API</a></li>
-            <li><a href="">Testing components</a></li>
-            <li><a href="">Eclipse Integration</a></li>
-            <li><a href="">FAQ</a></li>
-            <li><a href="">Reference Card</a></li>
-            </ul>
-        </li> <!-- end of user guide -->
-        <!-- sub-menu : Dev Guide -->
-        <li> 
-        <a href="#" class="sf-with-ul">Advanced Topics<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-           <ul>
-            <li><a href="http://felix.apache.org/ipojo/api/1.6.0">Javadoc</a></li>
-            <li><a href="">Handler development</a></li>
-            <li><a href="">Manipulation Metadata </a></li>
-            <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
-           </ul>
-        </li> <!-- End of Dev guide -->
-    </ul> 
-    </li> <!-- End of doc -->
-    <!-- Menu 4 : Tools -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Tools<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Ant Task</a></li>
-       <li><a href="">Eclipse Plugin</a></li>
-       <li><a href="">Maven Plugin</a></li>
-       <li><a href="">`arch` shell command</a></li>
-       <li><a href="">Online Manipulator</a></li>
-       <li><a href="">Webconsole plugin</a></li>
-       <li><a href="">Junit4OSGi</a></li>
-    </ul>   
-    </li><!-- End of tools -->  
-    <!-- Menu 5 : Support -->
-    <li>
-    <a href="">Support </a>
-    </li>
-    <!-- End of the menu 5 -->          
-    <!-- Menu 6 : Misc -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Misc<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Supported JVMs</a></li>
-       <li><a href="">Supported OSGi Implementations</a></li>
-       <li><a href="http://ipojo-dark-side.blogspot.com">iPOJO's Dark Side Blog</a></li>
-       <li><a href="">Article & Presentations</a></li>
-       <li><a href="http://www.apache.org/">ASF</a></li>
-       <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-       <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
-    </ul>
-    </li><!-- End of misc -->
-    </ul> <!-- End of the menu -->
-    </div> <!-- Page header -->
-  
-      <!-- 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/how-to-use-ipojo-factories.html" target="felix_cwiki">/site/how-to-use-ipojo-factories.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>How-to use iPOJO factories</h1>
-      
-      <div class="content">
-        <h1 id="ipojo-factories-principles">iPOJO Factories Principles</h1>
+
+    <div class="container">
+        <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]
@@ -420,31 +361,37 @@ To do this just use the OSGi API and the
 <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>
-      </div>
-      
-      <img src="http://felix.apache.org/ipojo/site/footer.png" class="footer">
-
-      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
-      </div>
-      <div class="trademarkFooter"> 
-        Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
-        logo are trademarks of The Apache Software Foundation. All other marks mentioned
-        may be trademarks or registered trademarks of their respective owners.
-      </div>
+        </div>
     </div>
+
+    <hr/>
+
+    <div class="container">
+        <footer id="footer">
+            <div class="row">
+                <div class="trademarkFooter span7"> 
+                Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
+                logo are trademarks of The Apache Software Foundation. All other marks mentioned
+                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
+                </div>
+            </div>
+        </footer>           
     </div>
-    
-    <script type="text/javascript">
+</body>
+
+<script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
+</script>
+
+<script type="text/javascript">
     try{
-    var pageTracker = _gat._getTracker("UA-1518442-4");
-    pageTracker._trackPageview();
+        var pageTracker = _gat._getTracker("UA-1518442-4");
+        pageTracker._trackPageview();
     } catch(err) {}
-    </script>
+</script>
 
-  </body>
 </html>

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 Wed Feb  6 16:23:22 2013
@@ -1,7 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -17,200 +16,142 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <head>
+
+<head>
     <title>Apache Felix - iPOJO Hierarchical Composition Overview</title>
     <link rel="icon" href="/res/favicon.ico">
-    <link rel="stylesheet" href="/site/media.data/site.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/superfish.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/ipojo/site/style.css" type="text/css" media="all">
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     
-    <!--
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shCore.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushCSharp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPhp.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJScript.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushVb.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushSql.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushXml.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushShell.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushDelphi.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushPython.js"></script>
-    <script class="javascript" src="http://cwiki.apache.org/confluence/download/resources/confluence.ext.code:code/shBrushJava.js"></script>
-    -->
-    
-    <script type="text/javascript" src="/ipojo/site/jquery-1.js"></script>
-    <script type="text/javascript" src="/ipojo/site/hoverIntent.js"></script>
-    <script type="text/javascript" src="/ipojo/site/superfish.js"></script> 
-    <script type="text/javascript" src="/ipojo/site/supersubs.js"></script> 
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="The most powerful component model for OSGi">
+
     
-    <script type="text/javascript"> 
-     
-        $(document).ready(function(){ 
-            $("ul.sf-menu").supersubs({ 
-                minWidth:    14,   // minimum width of sub-menus in em units 
-                maxWidth:    30,   // maximum width of sub-menus in em units 
-                extraWidth:  1     // extra width can ensure lines don't sometimes turn over 
-                                   // due to slight rounding differences and font-family 
-            }).superfish();  // call supersubs first, then superfish, so that subs are 
-                             // not display:none when measuring. Call before initialising 
-                             // containing tabs for same reason. 
-        }); 
-     
-    </script>
+    <link href="/ipojo/web/bootstrap/css/bootstrap-cerulean.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/ipojo/web/bootstrap/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/ipojo/web/style.css" rel="stylesheet">
+
+
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="/ipojo/web/bootstrap/js/bootstrap.min.js"></script>
     
-  </head>
-  <body>
-    <div class="title">
-      <div class="logo">
-        <a href="http://felix.apache.org/">
-          <img border="0" alt="Apache Felix" src="/res/logo.png">
-        </a>
-      </div>
-      <div class="header">
-        <a href="http://www.apache.org/">
-          <img border="0" alt="Apache" src="/res/apache.png">
-        </a>
-      </div>
+</head>
+
+<body data-spy="scroll" data-target=".subnav">
+    <div class="navbar navbar-fixed-top navbar-inverse">
+        <div class="navbar-inner">
+            <div class="container">
+               <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                 <span class="icon-bar"></span>
+                </a>
+                <a class="brand" href="#">Apache Felix iPOJO</a>
+         
+                 <div class="nav-collapse" id="main-menu">
+                    <ul class="nav" id="main-menu-left">
+                        <li><a href="news.html">News</a></li>
+                        <li><a href="/downloads.cgi">Download</a></li>
+                    
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tutorials <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Why choose iPOJO</a></li>
+                                <li><a href="">Success stories</a></li>
+                                <li><a href="">Features</a></li>
+                                <li class="divider"></li>
+                                <li><a href="">iPOJO in 10 minutes</a></li>
+                                <li><a href="">Using Annotations</a></li>
+                                <li><a href="">Maven tutorial</a></li>
+                                <li><a href="">Advanced tutorial</a></li>
+                                <li><a href="">Using Distributed OSGi</a></li>
+                                <li><a href="">Application Composition</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="user-guide-menu">
+                                <li><a href="">Requiring a service</a></li>
+                                <li><a href="">Providing a service</a></li>
+                                <li><a href="">Lifecycle management</a></li>
+                                <li><a href="">Configuration</a></li>
+                                <li><a href="">Introspection</a></li>
+                                <li><a href="">Impacting the lifecycle</a></li>
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">External <em>handlers</em></a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">Asynchronous communication</a></li>
+                                        <li><a href="">JMX management</a></li>
+                                        <li><a href="">Extender pattern</a></li>
+                                        <li><a href="">Whiteboard pattern</a></li>
+                                        <li><a href="">Temporal dependencies</a></li>
+                                    </ul>
+                                </li>                                            
+                                <li class="divider"></li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Advanced topics</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="">iPOJO and config admin</a></li>
+                                        <li><a href="">Factories and Instances</a></li>
+                                        <li><a href="">XML Schemas</a></li>
+                                        <li><a href="">API</a></li>
+                                        <li><a href="">Testing components</a></li>
+                                        <li><a href="">Eclipse Integration</a></li>
+                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="">Reference Card</a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-write-your-own-handler.html">Handler development</a></li>
+                                        <li><a href="">Manipulation Metadata </a></li>
+                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="tools-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Ant Task</a></li>
+                                <li><a href="">Eclipse Plugin</a></li>
+                                <li><a href="">Maven Plugin</a></li>
+                                <li><a href="">`arch` shell command</a></li>
+                                <li><a href="">Online Manipulator</a></li>
+                                <li><a href="">Webconsole plugin</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="community-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Support</a></li>
+                                <li><a href="http://www.apache.org/">ASF</a></li>
+                                <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                                <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+                            </ul>
+                        </li>
+
+                        <li class="dropdown" id="misc-menu">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Misc <b class="caret"></b></a>
+                            <ul class="dropdown-menu" id="swatch-menu">
+                                <li><a href="">Supported JVMs</a></li>
+                                <li><a href="">Supported OSGi Implementations</a></li>
+                                <li><a href="">Article & Presentations</a></li>
+                            </ul>
+                        </li>
+                    </ul>
+                    <ul class="nav pull-right" id="main-menu-right">
+                        <li><a rel="tooltip" target="_blank" href="http://felix.apache.org">Apache Felix <i class="icon-share-alt"></i></a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>    
     </div>
-  
-    <div class="main">
-    <div class="main">
-    <div class="page-header">
-    <img src="/ipojo/site/header.png" class="header">
-    <a href="http://ipojo.org"><img src="/ipojo/site/ipojo.png" width="225" class="header-logo"></a>
-    <ul class="sf-menu sf-js-enabled sf-shadow" id="ipojo-menu">
-    <li class="current">
-    <!-- Menu Overview -->
-    <a href="#" class="sf-with-ul">Overview<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <li>
-        <a href="">Home</a>                          
-        </li>
-        <li>
-        <a href="">Why choose iPOJO</a>
-        </li>
-        <li>
-        <a href="">Success stories</a>
-        </li>
-        <li>
-        <a href="">Features</a>
-        </li>
-    </ul>
-    </li>   
-    
-    <li class="">           
-    <!-- Menu download -->
-    <li>
-    <a href="/downloads.cgi">Download </a>
-    </li>
-    
-    <li class="">                   
-    <!-- Menu Documentation -->
-    <a href="#" class="sf-with-ul">Documentation<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-        <!-- sub-menu : getting started -->
-        <li class="">
-        <a href="#" class="sf-with-ul">Getting Started<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-        <ul>
-         <li><a href="">iPOJO in 10 minutes</a></li>
-         <li><a href="">Using Annotations</a></li>
-         <li><a href="">Maven tutorial</a></li>
-         <li><a href="">Advanced tutorial</a></li>
-         <li><a href="">Using Distributed OSGi</a></li>
-         <li><a href="">Application Composition</a></li>
-        </ul>
-        </li> <!-- end of getting started -->
-        <!-- sub menu : Describing Components -->
-         <li class="">
-            <a href="" class="sf-with-ul">Describing components<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">Requiring a service</a></li>
-            <li><a href="">Providing a service</a></li>
-            <li><a href="">Lifecycle management</a></li>
-            <li><a href="">Configuration</a></li>
-            <li><a href="">Introspection</a></li>
-            <li><a href="">Impacting the lifecycle</a></li>
-            <li><a href="">Asynchronous communication</a></li>
-            <li><a href="">JMX management</a></li>
-            <li><a href="">Extender pattern</a></li>
-            <li><a href="">Whiteboard pattern</a></li>
-            <li><a href="">Temporal dependencies</a></li>
-            </ul>
-         </li> <!-- End of describing components -->
-        <!-- sub-menu : User Guide -->
-        <li class="">
-        <a href="" class="sf-with-ul">User Guide<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-            <ul>
-            <li><a href="">iPOJO and config admin</a></li>
-            <li><a href="">Factories and Instances</a></li>
-            <li><a href="">XML Schemas</a></li>
-            <li><a href="">API</a></li>
-            <li><a href="">Testing components</a></li>
-            <li><a href="">Eclipse Integration</a></li>
-            <li><a href="">FAQ</a></li>
-            <li><a href="">Reference Card</a></li>
-            </ul>
-        </li> <!-- end of user guide -->
-        <!-- sub-menu : Dev Guide -->
-        <li> 
-        <a href="#" class="sf-with-ul">Advanced Topics<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-           <ul>
-            <li><a href="http://felix.apache.org/ipojo/api/1.6.0">Javadoc</a></li>
-            <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-write-your-own-handler.html">Handler development</a></li>
-            <li><a href="">Manipulation Metadata </a></li>
-            <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
-           </ul>
-        </li> <!-- End of Dev guide -->
-    </ul> 
-    </li> <!-- End of doc -->
-    <!-- Menu 4 : Tools -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Tools<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Ant Task</a></li>
-       <li><a href="">Eclipse Plugin</a></li>
-       <li><a href="">Maven Plugin</a></li>
-       <li><a href="">`arch` shell command</a></li>
-       <li><a href="">Online Manipulator</a></li>
-       <li><a href="">Webconsole plugin</a></li>
-       <li><a href="">Junit4OSGi</a></li>
-    </ul>   
-    </li><!-- End of tools -->  
-    <!-- Menu 5 : Support -->
-    <li>
-    <a href="">Support </a>
-    </li>
-    <!-- End of the menu 5 -->          
-    <!-- Menu 6 : Misc -->
-    <li class="">
-    <a href="#" class="sf-with-ul">Misc<span class="sf-sub-indicator"> »</span><span class="sf-sub-indicator"> »</span></a>
-    <ul>
-       <li><a href="">Supported JVMs</a></li>
-       <li><a href="">Supported OSGi Implementations</a></li>
-       <li><a href="http://ipojo-dark-side.blogspot.com">iPOJO's Dark Side Blog</a></li>
-       <li><a href="">Article & Presentations</a></li>
-       <li><a href="http://www.apache.org/">ASF</a></li>
-       <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-       <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
-    </ul>
-    </li><!-- End of misc -->
-    </ul> <!-- End of the menu -->
-    </div> <!-- Page header -->
-  
-      <!-- 
-      
-      <div class="tip">
-           This page is a translated version of <a href="/site/ipojo-hierarchical-composition-overview.html" target="felix_cwiki">/site/ipojo-hierarchical-composition-overview.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>iPOJO Hierarchical Composition Overview</h1>
-      
-      <div class="content">
-        <h1 id="introduction">Introduction</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="introduction">Introduction</h1>
 <p><em>iPOJO is an extensible, service-oriented component model implemented on the top of the OSGi framework that aims to simplify the development of OSGi™ applications. iPOJO follows a POJO-based component approach using external metadata to describe how POJO components should be managed by the iPOJO runtime. Some of the standard features of iPOJO include automatic service dependency management, service publication, and configuration property injection.</em></p>
 <p>Another feature of iPOJO is component factories. As stated previously, an iPOJO component is described by its metadata. In iPOJO, the metadata describes a component type. For each component type, iPOJO registers a factory service that can be used to create instances of the component type described by the metadata.</p>
 <p>In addition to these features, iPOJO also provides a service-oriented composition model. iPOJO's composition model tries to merge:
@@ -407,31 +348,37 @@ The delegation of HelloDispatcher servic
 <p>With this flag set, iPOJO publishes an architecture service for the composite. The architecture of the composite can be examined using the "arch" shell command for Felix.</p>
 <h2 id="composition-model-extensibility">Composition Model Extensibility</h2>
 <p>Like the rest of iPOJO, the composition model is extensible. The composite container is composed of a "composite handler", which is a special handler designed to support composite components. More documentation to come on this feature.</p>
-      </div>
-      
-      <img src="http://felix.apache.org/ipojo/site/footer.png" class="footer">
-
-      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1441864 by fmeschbe on Sun, 3 Feb 2013 06:44:40 +0000
-      </div>
-      <div class="trademarkFooter"> 
-        Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
-        logo are trademarks of The Apache Software Foundation. All other marks mentioned
-        may be trademarks or registered trademarks of their respective owners.
-      </div>
+        </div>
     </div>
+
+    <hr/>
+
+    <div class="container">
+        <footer id="footer">
+            <div class="row">
+                <div class="trademarkFooter span7"> 
+                Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project
+                logo are trademarks of The Apache Software Foundation. All other marks mentioned
+                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
+                </div>
+            </div>
+        </footer>           
     </div>
-    
-    <script type="text/javascript">
+</body>
+
+<script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
+</script>
+
+<script type="text/javascript">
     try{
-    var pageTracker = _gat._getTracker("UA-1518442-4");
-    pageTracker._trackPageview();
+        var pageTracker = _gat._getTracker("UA-1518442-4");
+        pageTracker._trackPageview();
     } catch(err) {}
-    </script>
+</script>
 
-  </body>
 </html>



Mime
View raw message