felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r849584 [13/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/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 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 - Temporal Service Dependency</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/temporal-service-dependency.html" target="felix_cwiki">/site/temporal-service-dependency.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>Temporal Service Dependency</h1>
-      
-      <div class="content">
-        <h1 id="the-temporal-dependency-handler">The temporal dependency handler</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="the-temporal-dependency-handler">The temporal dependency handler</h1>
 <p><em>Regular service dependencies participate to the instance lifecycle. Moreover, the injected service object is either available or not available. A temporal dependency handler is a little different and provides a different resolution pattern. Indeed, the temporal dependency does not invalidate the instance. Moreover, if not available, the temporal dependency waits (and so blocks the current thread) for a provider. Of course, the maximum waiting time can be specified. If a timeout occurs, the handler throws a Runtime Exception.</em></p>
 <p>{div:class=toc}
 [TOC]
@@ -335,31 +276,37 @@ are also executed if the lookup failed. 
 <h2 id="download">Download</h2>
 <p>The handler is available on the <a href="/documentation/subprojects/apache-felix-ipojo/download.html">download</a> page.
 Sources are available on the Felix trunk at the following location: <a href="http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/temporal">http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/temporal</a>.</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/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 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 - White Board Pattern Handler</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/white-board-pattern-handler.html" target="felix_cwiki">/site/white-board-pattern-handler.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>White Board Pattern Handler</h1>
-      
-      <div class="content">
-        <h1 id="the-white-board-pattern-handler">The white board pattern handler</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="the-white-board-pattern-handler">The white board pattern handler</h1>
 <p>The objective of this handler is to simplify the development of white-board architecture. This architecture-style is based is very close to the extender architecture style but relies on services instead of bundles.</p>
 <p>{div:class=toc}
 [TOC]
@@ -351,31 +292,37 @@ public class WhiteBoardExemple {</p>
 <h2 id="download">Download</h2>
 <p>The handler is available on the <a href="/documentation/subprojects/apache-felix-ipojo/download.html">download</a> page.
 Sources are available on the Felix trunk at the following location: <a href="http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/whiteboard">http://svn.apache.org/repos/asf/felix/trunk/ipojo/handler/whiteboard</a>.</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/how-to-use-ipojo-annotations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/how-to-use-ipojo-annotations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/how-to-use-ipojo-annotations.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 Annotations</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>
-    
-  </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>
-    </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>   
+    <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">
+
     
-    <li class="">           
-    <!-- Menu download -->
-    <li>
-    <a href="/downloads.cgi">Download </a>
-    </li>
+    <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>
     
-    <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-annotations.html" target="felix_cwiki">/site/how-to-use-ipojo-annotations.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>How to use iPOJO Annotations</h1>
-      
-      <div class="content">
-        <h1 id="how-to-use-ipojo-annotations">How to use iPOJO annotations</h1>
+</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="container">
+        <div class="content">
+            <h1 id="how-to-use-ipojo-annotations">How to use iPOJO annotations</h1>
 <p><em>You can use annotations to define your component types. This page presents supported annotations.</em></p>
 <p>{div:class=toc}
 [TOC]
@@ -520,31 +461,37 @@ The annotation is org.apache.felix.ipojo
 
 <h3 id="using-custom-annotations">Using Custom Annotations</h3>
 <p>External handlers can provides their own annotations. Using these annotations just requires to add them to your build path. To external handlers annotations, please refer to the external handler documentation.</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.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 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 Advanced Topics</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/ipojo-advanced-topics.html" target="felix_cwiki">/site/ipojo-advanced-topics.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
-      -->
-      
-      <h1>iPOJO Advanced Topics</h1>
-      
-      <div class="content">
-        <h1 id="advanced-topics">Advanced Topics</h1>
+
+    <div class="container">
+        <div class="content">
+            <h1 id="advanced-topics">Advanced Topics</h1>
 <p><em>This page presents some advanced features.</em></p>
 <ul>
 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">Combining iPOJO and Configuration Admin</a></li>
@@ -218,31 +159,37 @@
 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.html">How-to use iPOJO factories</a></li>
 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-hierarchical-composition-overview.html">iPOJO Hierarchical Composition Overview</a></li>
 </ul>
-      </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