You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bu...@apache.org on 2014/03/10 16:49:08 UTC

svn commit: r900934 [3/6] - in /websites/staging/felix/trunk/content: ./ site/

Modified: websites/staging/felix/trunk/content/site/developing-camel-mediators-with-ipojo.html
==============================================================================
--- websites/staging/felix/trunk/content/site/developing-camel-mediators-with-ipojo.html (original)
+++ websites/staging/felix/trunk/content/site/developing-camel-mediators-with-ipojo.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="DevelopingCamelmediatorswithiPOJO-DevelopingCamelmediatorswithiPOJO"></A>Developing Camel mediators with iPOJO</H1>
 <P><EM>The <A href="http://activemq.apache.org/camel/tutorial-osgi-camel-part1.html" class="external-link" rel="nofollow">Camel OSGi tutorial </A> provides a very simple and neat overview of Camel. This article mentions the usage of iPOJO to implement the mediator. This document provides this implementation.</EM></P>
 
@@ -283,7 +301,7 @@ Create or edit the file metadata.xml in 
   <SPAN class="code-tag">&lt;artifactId&gt;</SPAN>demo.service-ipojo-bundle<SPAN class="code-tag">&lt;/artifactId&gt;</SPAN>
   <SPAN class="code-tag">&lt;version&gt;</SPAN>0.1<SPAN class="code-tag">&lt;/version&gt;</SPAN>
   <SPAN class="code-tag">&lt;name&gt;</SPAN>demo.service-ipojo-bundle<SPAN class="code-tag">&lt;/name&gt;</SPAN>
-  
+
   <SPAN class="code-tag">&lt;build&gt;</SPAN>
     <SPAN class="code-tag">&lt;plugins&gt;</SPAN>
       <SPAN class="code-tag">&lt;plugin&gt;</SPAN>
@@ -312,7 +330,7 @@ Create or edit the file metadata.xml in 
       <SPAN class="code-tag">&lt;/plugin&gt;</SPAN>
     <SPAN class="code-tag">&lt;/plugins&gt;</SPAN>
   <SPAN class="code-tag">&lt;/build&gt;</SPAN>
-  
+
   <SPAN class="code-tag">&lt;dependencies&gt;</SPAN>
 	  <SPAN class="code-tag">&lt;dependency&gt;</SPAN>
           <SPAN class="code-tag">&lt;groupId&gt;</SPAN>org.slf4j<SPAN class="code-tag">&lt;/groupId&gt;</SPAN>

Modified: websites/staging/felix/trunk/content/site/dive-into-the-ipojo-manipulation-depths.html
==============================================================================
--- websites/staging/felix/trunk/content/site/dive-into-the-ipojo-manipulation-depths.html (original)
+++ websites/staging/felix/trunk/content/site/dive-into-the-ipojo-manipulation-depths.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="DiveintotheiPOJOManipulationdepths-DiveintotheiPOJOManipulationdepths"></A>Dive into the iPOJO Manipulation depths</H1>
 
 <P>iPOJO (primitive) components are managed using byte code manipulation. Don't be afraid, you don't have to be fluent in byte code to understand components ☺. This page explains how the manipulation works and how your class file is transformed. This manipulation takes care to <B>NOT</B> change the behavior of the manipulated class.</P>
@@ -273,7 +291,7 @@
 </SPAN> }
   <SPAN class="code-keyword">private</SPAN> void _myMethod() {
    <SPAN class="code-comment">// my code here
-</SPAN> } 
+</SPAN> }
 </PRE>
 </DIV></DIV>
 

Modified: websites/staging/felix/trunk/content/site/download.html
==============================================================================
--- websites/staging/felix/trunk/content/site/download.html (original)
+++ websites/staging/felix/trunk/content/site/download.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 
 <H1><A name="Download-DownloadiPOJO"></A>Download iPOJO</H1>
 

Modified: websites/staging/felix/trunk/content/site/event-admin-handlers.html
==============================================================================
--- websites/staging/felix/trunk/content/site/event-admin-handlers.html (original)
+++ websites/staging/felix/trunk/content/site/event-admin-handlers.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 
 <H1><A name="EventAdminHandlers-EventAdminHandlers"></A>Event Admin Handlers</H1>
 
@@ -232,10 +250,10 @@
 @Component
 @Instantiate
 <SPAN class="code-keyword">public</SPAN> class MyComponent {
-    
+
     @Publishes( <SPAN class="code-comment">// or @Publisher before the 1.7.0
 </SPAN>	  name=<SPAN class="code-quote">&quot;myPublisher&quot;</SPAN>,
-      topics=<SPAN class="code-quote">&quot;bar,nuts&quot;</SPAN>) 
+      topics=<SPAN class="code-quote">&quot;bar,nuts&quot;</SPAN>)
     <SPAN class="code-keyword">private</SPAN> Publisher m_publisher;
 
     @Subscriber(
@@ -520,23 +538,23 @@ This method is the easier way to send 	d
 <SPAN class="code-keyword">public</SPAN> class PubSub {
     @Publishes(name=<SPAN class="code-quote">&quot;p1&quot;</SPAN>, synchronous=<SPAN class="code-keyword">true</SPAN>)
     Publisher publisher1;
-    
+
     @Publishes(name=<SPAN class="code-quote">&quot;p2&quot;</SPAN>, synchronous=<SPAN class="code-keyword">false</SPAN>, topics=<SPAN class="code-quote">&quot;foo,bar&quot;</SPAN>, data_key=<SPAN class="code-quote">&quot;data&quot;</SPAN>)
     Publisher publisher2;
-    
+
     @Publishes(name=<SPAN class="code-quote">&quot;p3&quot;</SPAN>, synchronous=<SPAN class="code-keyword">true</SPAN>, topics=<SPAN class="code-quote">&quot;bar&quot;</SPAN>)
     Publisher publisher3;
-    
+
     @Subscriber(name=<SPAN class="code-quote">&quot;s1&quot;</SPAN>, data_key=<SPAN class="code-quote">&quot;data&quot;</SPAN>)
     <SPAN class="code-keyword">public</SPAN> void receive1(<SPAN class="code-object">Object</SPAN> foo) {
         <SPAN class="code-comment">// <SPAN class="code-object">Process</SPAN> event
 </SPAN>    }
-    
+
     @Subscriber(name=<SPAN class="code-quote">&quot;s2&quot;</SPAN>, topics=<SPAN class="code-quote">&quot;foo,bar&quot;</SPAN>, filter=<SPAN class="code-quote">&quot;(foo=<SPAN class="code-keyword">true</SPAN>)&quot;</SPAN>)
     <SPAN class="code-keyword">public</SPAN> void receive2(Event foo) {
         <SPAN class="code-comment">// <SPAN class="code-object">Process</SPAN> event
 </SPAN>    }
-    
+
     @Subscriber(name=<SPAN class="code-quote">&quot;s3&quot;</SPAN>, topics=<SPAN class="code-quote">&quot;foo&quot;</SPAN>, data_key=<SPAN class="code-quote">&quot;data&quot;</SPAN>, data_type=<SPAN class="code-quote">&quot;java.lang.<SPAN class="code-object">String</SPAN>&quot;</SPAN>)
     <SPAN class="code-keyword">public</SPAN> void receive3(<SPAN class="code-object">String</SPAN> foo) {
         <SPAN class="code-comment">// <SPAN class="code-object">Process</SPAN> event

Modified: websites/staging/felix/trunk/content/site/extender-pattern-handler.html
==============================================================================
--- websites/staging/felix/trunk/content/site/extender-pattern-handler.html (original)
+++ websites/staging/felix/trunk/content/site/extender-pattern-handler.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 
 <H1><A name="ExtenderPatternHandler-Theextenderpatternhandler"></A>The extender pattern handler</H1>
 <P><EM>The objective of this handler is to simplify the development of extender-based architecture. This architecture-style is based on two different entities:</EM></P>
@@ -235,12 +253,12 @@ Nowadays, a lot of frameworks use this p
 <SPAN class="code-tag">&lt;ipojo <SPAN class="code-keyword">xmlns:extender</SPAN>=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.extender&quot;</SPAN>&gt;</SPAN>
 	&lt;component
 		classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.extender.MyExtender&quot;</SPAN>&gt;
-		
+
                 <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Extender Pattern handler configuration --&gt;</SPAN></SPAN>
-		&lt;extender:extender 
+		&lt;extender:extender
                   extension=<SPAN class="code-quote">&quot;My-Extension&quot;</SPAN>
-                  onArrival=<SPAN class="code-quote">&quot;onBundleArrival&quot;</SPAN> 
-                  onDeparture=<SPAN class="code-quote">&quot;onBundleDeparture&quot;</SPAN> 
+                  onArrival=<SPAN class="code-quote">&quot;onBundleArrival&quot;</SPAN>
+                  onDeparture=<SPAN class="code-quote">&quot;onBundleDeparture&quot;</SPAN>
                 /&gt;
 
 		<SPAN class="code-tag">&lt;callback transition=<SPAN class="code-quote">&quot;invalidate&quot;</SPAN> method=<SPAN class="code-quote">&quot;stopping&quot;</SPAN> /&gt;</SPAN>
@@ -265,7 +283,7 @@ You can also use annotations:</P>
 	<SPAN class="code-keyword">public</SPAN> void starting() {
 	  <SPAN class="code-comment">// ...
 </SPAN>	}
-	
+
 	@Invalidate
 	<SPAN class="code-keyword">public</SPAN> void stopping {
 	  <SPAN class="code-comment">// ...
@@ -336,11 +354,11 @@ Sources are available on the Felix trunk
 @Component
 @org.apache.felix.ipojo.extender.Extender(extension=<SPAN class="code-quote">&quot;foo&quot;</SPAN>, onArrival=<SPAN class="code-quote">&quot;onArrival&quot;</SPAN>, onDeparture=<SPAN class="code-quote">&quot;onDeparture&quot;</SPAN>)
 <SPAN class="code-keyword">public</SPAN> class Extender {
-    
+
     <SPAN class="code-keyword">public</SPAN> void onArrival(Bundle bundle, <SPAN class="code-object">String</SPAN> foo) {
         <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something
 </SPAN>    }
-    
+
     <SPAN class="code-keyword">public</SPAN> void onDeparture(Bundle bundle) {
         <SPAN class="code-comment">// <SPAN class="code-keyword">do</SPAN> something
 </SPAN>    }

Modified: websites/staging/felix/trunk/content/site/future-ideas.html
==============================================================================
--- websites/staging/felix/trunk/content/site/future-ideas.html (original)
+++ websites/staging/felix/trunk/content/site/future-ideas.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="FutureIdeas-iPOJOFutureIdeas"></A>iPOJO Future Ideas</H1>
 
 <P>This page documents various ideas to be considered in the future, but not currently on the road map.</P>

Modified: websites/staging/felix/trunk/content/site/handlers-proposition.html
==============================================================================
--- websites/staging/felix/trunk/content/site/handlers-proposition.html (original)
+++ websites/staging/felix/trunk/content/site/handlers-proposition.html Mon Mar 10 15:49:07 2014
@@ -29,6 +29,24 @@
     <DIV class="main">
 <P>This page gathers <EM>future</EM> handlers for iPOJO. Some handlers are planned or are under study.</P>
 
+<div style="
+background-color: #fdf7f7;
+border-color: #d9534f;
+margin: 40px 0;
+padding: 20px;
+border-left: 5px solid #d9534f;">
+    <h4 style="margin-top: 0;
+    font-size: 18px;
+    margin-bottom: 5px;
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-weight: 500;
+    line-height: 1.1;
+    color: inherit;">The iPOJO documentation has moved </h4>
+    <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+        The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+</div>
+
 <H2><A name="HandlersProposition-ComponentBinding"></A>Component Binding</H2>
 
 <UL>

Modified: websites/staging/felix/trunk/content/site/how-to-use-ipojo-annotations.html
==============================================================================
--- websites/staging/felix/trunk/content/site/how-to-use-ipojo-annotations.html (original)
+++ websites/staging/felix/trunk/content/site/how-to-use-ipojo-annotations.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="HowtouseiPOJOAnnotations-HowtouseiPOJOannotations"></A>How to use iPOJO annotations</H1>
 
 <P><EM>You can use annotations to define your component types. This page presents supported annotations.</EM></P>
@@ -305,8 +323,8 @@ You can download the archive containing 
 @Component
 @Provides
 <SPAN class="code-keyword">public</SPAN> class HelloImpl <SPAN class="code-keyword">implements</SPAN> Hello {
-    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> sayHello(<SPAN class="code-object">String</SPAN> name) { 
-     <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;hello &quot;</SPAN> + name; 
+    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> sayHello(<SPAN class="code-object">String</SPAN> name) {
+     <SPAN class="code-keyword">return</SPAN> <SPAN class="code-quote">&quot;hello &quot;</SPAN> + name;
     }
 }
 </PRE>
@@ -347,22 +365,22 @@ Then, it uses the requires annotation to
 }
 
 <SPAN class="code-keyword">public</SPAN> void invoke() {
-	<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-object">int</SPAN> i = 0; i &lt; m_hello.length; i++) { 
+	<SPAN class="code-keyword">for</SPAN> (<SPAN class="code-object">int</SPAN> i = 0; i &lt; m_hello.length; i++) {
           <SPAN class="code-object">System</SPAN>.out.println(m_hello[i].
-             sayHello(<SPAN class="code-quote">&quot;Clement&quot;</SPAN>)); 
+             sayHello(<SPAN class="code-quote">&quot;Clement&quot;</SPAN>));
         }
 }
 
  @Validate
- <SPAN class="code-keyword">public</SPAN> void starting() {    
-    <SPAN class="code-object">Thread</SPAN> T = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">Thread</SPAN>(<SPAN class="code-keyword">this</SPAN>);     
-    end = <SPAN class="code-keyword">false</SPAN>;     
-    T.start(); 
+ <SPAN class="code-keyword">public</SPAN> void starting() {
+    <SPAN class="code-object">Thread</SPAN> T = <SPAN class="code-keyword">new</SPAN> <SPAN class="code-object">Thread</SPAN>(<SPAN class="code-keyword">this</SPAN>);
+    end = <SPAN class="code-keyword">false</SPAN>;
+    T.start();
  }
 
  @Invalidate
- <SPAN class="code-keyword">public</SPAN> void stopping() {    
-     end = <SPAN class="code-keyword">true</SPAN>; 
+ <SPAN class="code-keyword">public</SPAN> void stopping() {
+     end = <SPAN class="code-keyword">true</SPAN>;
  }
 }
 </PRE>
@@ -423,7 +441,7 @@ The <TT>SERVICE</TT> strategy refers to 
 	</DIV>
 	</DIV>
 	<DIV class="box-blue-content">
-The <TT>factory</TT> attribute became <TT>strategy</TT>. A third policy is now available (<TT>instance</TT>) allowing to create one service object per asking instance. Moreover, it is also possible to indicates the <TT>CreationStrategy</TT> class name. 
+The <TT>factory</TT> attribute became <TT>strategy</TT>. A third policy is now available (<TT>instance</TT>) allowing to create one service object per asking instance. Moreover, it is also possible to indicates the <TT>CreationStrategy</TT> class name.
 	</DIV>
 	<DIV class="box-blue-footer"></DIV>
 </DIV>

Modified: websites/staging/felix/trunk/content/site/how-to-use-ipojo-factories.html
==============================================================================
--- websites/staging/felix/trunk/content/site/how-to-use-ipojo-factories.html (original)
+++ websites/staging/felix/trunk/content/site/how-to-use-ipojo-factories.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="How-touseiPOJOfactories-iPOJOFactoriesPrinciples"></A>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>
@@ -219,7 +237,7 @@
 <H3><A name="How-touseiPOJOfactories-ComponentType"></A>Component Type</H3>
 <P>A component type is a kind of instance template. If we compare component concepts with object oriented programming, component types are classes and component instances are objects. A component type is declared inside a metadata file (generally named 'metadata.xml'). The next snippet shows you a component type declaration: </P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
-<PRE class="code-xml"> 
+<PRE class="code-xml">
 <SPAN class="code-tag">&lt;component className=<SPAN class="code-quote">&quot;...&quot;</SPAN> name=<SPAN class="code-quote">&quot;MyFactory&quot;</SPAN>&gt;</SPAN>
     ...
     <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--component type configuration --&gt;</SPAN></SPAN>
@@ -238,7 +256,7 @@
 <P>The 'name' attribute contains the factory name. If not specified, the 'className' attribute is used as the factory name. This factory name is used to refer to the factory (and consequently to the component type). <BR>
 A factory can be public or private. A public factory allows creating instances dynamically and from other bundles. A private factory can only be used to create instances by declaring them in the same metadata.xml file that defines the instances' component type (i.e. in the same bundle). By default, factories are public. To set the factory to private add the 'public=&quot;false&quot;'' attribute in the '&lt;component&gt;' element, such as: </P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
-<PRE class="code-xml"> 
+<PRE class="code-xml">
 <SPAN class="code-tag">&lt;component className=<SPAN class="code-quote">&quot;...&quot;</SPAN> name=<SPAN class="code-quote">&quot;MyPrivateFactory&quot;</SPAN> public=<SPAN class="code-quote">&quot;false&quot;</SPAN>&gt;</SPAN>
     ...
     <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--component type configuration --&gt;</SPAN></SPAN>
@@ -315,12 +333,12 @@ Instance declaration properties can be m
 <PRE class="code-xml">
 <SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;a.factory&quot;</SPAN> name=<SPAN class="code-quote">&quot;complex-props&quot;</SPAN>&gt;</SPAN>
         <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--Creates a string array--&gt;</SPAN></SPAN>
-	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;array&quot;</SPAN> type=<SPAN class="code-quote">&quot;array&quot;</SPAN>&gt;</SPAN> 
+	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;array&quot;</SPAN> type=<SPAN class="code-quote">&quot;array&quot;</SPAN>&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property value=<SPAN class="code-quote">&quot;a&quot;</SPAN>/&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property value=<SPAN class="code-quote">&quot;b&quot;</SPAN>/&gt;</SPAN>
 	<SPAN class="code-tag">&lt;/property&gt;</SPAN>
         <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--Creates a list containing string--&gt;</SPAN></SPAN>
-	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;list&quot;</SPAN> type=<SPAN class="code-quote">&quot;list&quot;</SPAN>&gt;</SPAN> 
+	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;list&quot;</SPAN> type=<SPAN class="code-quote">&quot;list&quot;</SPAN>&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property value=<SPAN class="code-quote">&quot;a&quot;</SPAN>/&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property value=<SPAN class="code-quote">&quot;b&quot;</SPAN>/&gt;</SPAN>
 	<SPAN class="code-tag">&lt;/property&gt;</SPAN>
@@ -330,7 +348,7 @@ Instance declaration properties can be m
 		<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;b&quot;</SPAN> value=<SPAN class="code-quote">&quot;b&quot;</SPAN>/&gt;</SPAN>
 	<SPAN class="code-tag">&lt;/property&gt;</SPAN>
         <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--Creates a map containing string--&gt;</SPAN></SPAN>
-	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;map&quot;</SPAN> type=<SPAN class="code-quote">&quot;map&quot;</SPAN>&gt;</SPAN> 
+	<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;map&quot;</SPAN> type=<SPAN class="code-quote">&quot;map&quot;</SPAN>&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;a&quot;</SPAN> value=<SPAN class="code-quote">&quot;a&quot;</SPAN>/&gt;</SPAN>
 		<SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;b&quot;</SPAN> value=<SPAN class="code-quote">&quot;b&quot;</SPAN>/&gt;</SPAN>
 	<SPAN class="code-tag">&lt;/property&gt;</SPAN>
@@ -365,7 +383,7 @@ Instance declaration properties can be m
 	<SPAN class="code-tag">&lt;requires field=<SPAN class="code-quote">&quot;another_field&quot;</SPAN> from=<SPAN class="code-quote">&quot;another-factory&quot;</SPAN>/&gt;</SPAN>
 <SPAN class="code-tag">&lt;/component&gt;</SPAN>
 </PRE>
-</DIV></DIV> 
+</DIV></DIV>
 <H3><A name="How-touseiPOJOfactories-Creatinginstances"></A>Creating instances</H3>
 <P>Once you have a reference on the factory you can create instance with the 'createComponentInstance' method.</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -430,10 +448,10 @@ To do this just use the OSGi API and the
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
     ComponentInstance instance = ...
-    <SPAN class="code-comment">// ... 
+    <SPAN class="code-comment">// ...
 </SPAN>    <SPAN class="code-keyword">try</SPAN> {
-        ServiceReference[] refs = 
-              context.getServiceReferences(YourServiceInterface.class.getName(), 
+        ServiceReference[] refs =
+              context.getServiceReferences(YourServiceInterface.class.getName(),
               <SPAN class="code-quote">&quot;(instance.name=&quot;</SPAN> + instance.getInstanceName() +<SPAN class="code-quote">&quot;)&quot;</SPAN>);
         <SPAN class="code-keyword">if</SPAN> (refs != <SPAN class="code-keyword">null</SPAN>) {
             Foo your_object = (Foo) context.getService(refs[0]);
@@ -450,7 +468,7 @@ To do this just use the OSGi API and the
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
     <SPAN class="code-keyword">if</SPAN> (instance.getState() == ComponentInstance.VALID) {
-       ImplementationClass object = 
+       ImplementationClass object =
           (ImplementationClass) ((InstanceManager) instance).getPojoObject();
     } <SPAN class="code-keyword">else</SPAN> {
        <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Cannot get an implementation object from an invalid instance&quot;</SPAN>);

Modified: websites/staging/felix/trunk/content/site/how-to-use-ipojo-manipulation-metadata.html
==============================================================================
--- websites/staging/felix/trunk/content/site/how-to-use-ipojo-manipulation-metadata.html (original)
+++ websites/staging/felix/trunk/content/site/how-to-use-ipojo-manipulation-metadata.html Mon Mar 10 15:49:07 2014
@@ -28,11 +28,11 @@
     </DIV>
     <DIV class="main">
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/superfish.css); 
+ @import url(http://felix.apache.org/ipojo/site/superfish.css);
 </STYLE>
 
 <STYLE type="text/css">
- @import url(http://felix.apache.org/ipojo/site/style.css); 
+ @import url(http://felix.apache.org/ipojo/site/style.css);
 </STYLE>
 
 <P>
@@ -50,22 +50,22 @@
 
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/jquery-1.js"></SCRIPT>
 <SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/hoverIntent.js"></SCRIPT>
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT> 
-<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/supersubs.js"></SCRIPT> 
+<SCRIPT type="text/javascript" src="http://felix.apache.org/ipojo/site/superfish.js"></SCRIPT>
+<SCRIPT type="text/javascript" src="http://felix.apache.org/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 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>
 <DIV class="main">
 <DIV class="page-header">
@@ -77,7 +77,7 @@
 <A href="" class="sf-with-ul">Overview<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
 	<LI>
-	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>							
+	<A href="apache-felix-ipojo.html" title="Apache Felix iPOJO">Home</A>
 	</LI>
 	<LI>
 	<A href="apache-felix-ipojo-why-choose-ipojo.html" title="apache-felix-ipojo-why-choose-ipojo">Why choose iPOJO</A>
@@ -89,15 +89,15 @@
 	<A href="apache-felix-ipojo-feature-overview.html" title="Apache Felix iPOJO Feature Overview">Features</A>
 	</LI>
 </UL>
-</LI>	
+</LI>
 
-<LI class="">			
+<LI class="">
 <!-- Menu download -->
 <LI>
 <A href="download.html" title="Download">Download </A>
 </LI>
 
-<LI class="">					
+<LI class="">
 <!-- Menu Documentation -->
 <A href="" class="sf-with-ul">Documentation<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
 <UL>
@@ -145,7 +145,7 @@
         </UL>
     </LI> <!-- end of user guide -->
     <!-- sub- menu : Dev Guide -->
-    <LI> 
+    <LI>
     <A href="" class="sf-with-ul">Advanced Topics<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
        <UL>
         <LI><A href="http://felix.apache.org/ipojo/api/1.6.0" class="external-link" rel="nofollow">Javadoc</A></LI>
@@ -154,7 +154,7 @@
         <LI><A href="dive-into-the-ipojo-manipulation-depths.html" title="Dive into the iPOJO Manipulation depths">Dive into the iPOJO Manipulation depths</A></LI>
        </UL>
     </LI> <!-- End of Dev guide -->
-</UL> 
+</UL>
 </LI> <!-- End of doc -->
 <!-- Menu 4 : Tools -->
 <LI class="">
@@ -167,13 +167,13 @@
    <LI><A href="apache-felix-ipojo-online-manipulator.html" title="apache-felix-ipojo-online-manipulator">Online Manipulator</A></LI>
    <LI><A href="ipojo-webconsole-plugin.html" title="iPOJO Webconsole Plugin">Webconsole plugin</A></LI>
    <LI><A href="apache-felix-ipojo-junit4osgi.html" title="apache-felix-ipojo-junit4osgi">Junit4OSGi</A></LI>
-</UL>   
-</LI><!-- End of tools -->	
+</UL>
+</LI><!-- End of tools -->
 <!-- Menu 5 : Support -->
 <LI>
 <A href="ipojo-support.html" title="ipojo-support">Support </A>
 </LI>
-<!-- End of the menu 5 -->			
+<!-- End of the menu 5 -->
 <!-- Menu 6 : Misc -->
 <LI class="">
 <A href="" class="sf-with-ul">Misc<SPAN class="sf-sub-indicator"> &raquo;</SPAN><SPAN class="sf-sub-indicator"> &raquo;</SPAN></A>
@@ -193,6 +193,24 @@
 
 <DIV class="content">
 
+    <div style="
+    background-color: #fdf7f7;
+    border-color: #d9534f;
+    margin: 40px 0;
+    padding: 20px;
+    border-left: 5px solid #d9534f;">
+        <h4 style="margin-top: 0;
+        font-size: 18px;
+        margin-bottom: 5px;
+        margin-top: 0;
+        margin-bottom: 10px;
+        font-weight: 500;
+        line-height: 1.1;
+        color: inherit;">The iPOJO documentation has moved </h4>
+        <p style="margin-top: 0px; padding-top: 0px; margin-bottom: 0px;">
+            The new web site is <a href="http://ipojo.org">here</a>, update your bookmark.</p>
+    </div>
+
 <H1><A name="HowtouseiPOJOManipulationMetadata-HowtouseiPOJOManipulationMetadata"></A>How to use iPOJO Manipulation Metadata</H1>
 
 <P><EM>During the manipulation process, iPOJO gathers information about the manipulated classes. These metadata are stored inside the bundle manifest and are used to avoid reflection on the manipulated class. By using these metadata, your handler can check that the implementation class contains required fields, methods, check implemented interfaces.</EM></P>