felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1575977 [2/6] - /felix/site/trunk/content/site/
Date Mon, 10 Mar 2014 15:48:49 GMT
Modified: felix/site/trunk/content/site/apache-felix-ipojo-testing-components.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/apache-felix-ipojo-testing-components.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/apache-felix-ipojo-testing-components.html (original)
+++ felix/site/trunk/content/site/apache-felix-ipojo-testing-components.html Mon Mar 10 15:48:48 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="apache-felix-ipojo-testing-components-HowtotestiPOJOComponents"></A>How to test iPOJO Components</H1>
 <P>Testing components is a required step in the application development process. This page explains strategies to test iPOJO-based components and applications.</P>
 
@@ -256,7 +274,7 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
 [INFO] Bundle manipulation - SUCCESS
 [INFO] [install:install]
 [INFO] Installing /Users/clement/Documents/workspaces/
-  ipojo-dev/UnitaryTest/target/org.apache.felix.ipojo.test.dummy.component-1.1.0-SNAPSHOT.jar 
+  ipojo-dev/UnitaryTest/target/org.apache.felix.ipojo.test.dummy.component-1.1.0-SNAPSHOT.jar
   to /Users/clement/.m2/repository/ipojo/tests/org.apache.felix.ipojo.test.dummy.component/1.1.0-SNAPSHOT
   /org.apache.felix.ipojo.test.dummy.component-1.1.0-SNAPSHOT.jar
 [INFO] [bundle:install]

Modified: felix/site/trunk/content/site/apache-felix-ipojo-tools.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/apache-felix-ipojo-tools.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/apache-felix-ipojo-tools.html (original)
+++ felix/site/trunk/content/site/apache-felix-ipojo-tools.html Mon Mar 10 15:48:48 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="apache-felix-ipojo-tools-iPOJOTools"></A>iPOJO Tools</H1>
 
 <P>This page contains the list of provided tools helping the development of iPOJO applications:</P>

Modified: felix/site/trunk/content/site/apache-felix-ipojo-userguide.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/apache-felix-ipojo-userguide.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/apache-felix-ipojo-userguide.html (original)
+++ felix/site/trunk/content/site/apache-felix-ipojo-userguide.html Mon Mar 10 15:48:48 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="apache-felix-ipojo-userguide-UserGuide"></A>User Guide</H1>
 <P>This page references pages composing the iPOJO User Guide:</P>
 <UL><LI><A href="apache-felix-ipojo-api.html" title="apache-felix-ipojo-api">apache-felix-ipojo-api</A></LI><LI><A href="describing-components.html" title="Describing components">Describing components</A></LI><LI><A href="how-to-use-ipojo-annotations.html" title="How to use iPOJO Annotations">How to use iPOJO Annotations</A></LI><LI><A href="ipojo-advanced-topics.html" title="iPOJO Advanced Topics">iPOJO Advanced Topics</A></LI><LI><A href="ipojo-faq.html" title="iPOJO FAQ">iPOJO FAQ</A></LI><LI><A href="using-xml-schemas.html" title="Using XML Schemas">Using XML Schemas</A></LI></UL>

Modified: felix/site/trunk/content/site/apache-felix-ipojo-why-choose-ipojo.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/apache-felix-ipojo-why-choose-ipojo.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/apache-felix-ipojo-why-choose-ipojo.html (original)
+++ felix/site/trunk/content/site/apache-felix-ipojo-why-choose-ipojo.html Mon Mar 10 15:48:48 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="" 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="apache-felix-ipojo-why-choose-ipojo-WhychooseiPOJO%3F"></A>Why choose iPOJO?</H1>
 

Modified: felix/site/trunk/content/site/architecture-handler.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/architecture-handler.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/architecture-handler.html (original)
+++ felix/site/trunk/content/site/architecture-handler.html Mon Mar 10 15:48:48 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="ArchitectureHandler-IntrospectionandArchitecture"></A>Introspection and Architecture</H1>
 

Modified: felix/site/trunk/content/site/article-presentations.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/article-presentations.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/article-presentations.html (original)
+++ felix/site/trunk/content/site/article-presentations.html Mon Mar 10 15:48:48 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="https://cwiki.apache.org/confluence/pages/viewpage.action" 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="https://cwiki.apache.org/confluence/pages/viewpage.action" 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="https://cwiki.apache.org/confluence/pages/viewpage.action" 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="https://cwiki.apache.org/confluence/pages/viewpage.action" 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="Article%26Presentations-Presentations"></A>Presentations</H1>
 
 <UL>

Modified: felix/site/trunk/content/site/combining-ipojo-and-configuration-admin.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/combining-ipojo-and-configuration-admin.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/combining-ipojo-and-configuration-admin.html (original)
+++ felix/site/trunk/content/site/combining-ipojo-and-configuration-admin.html Mon Mar 10 15:48:48 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="CombiningiPOJOandConfigurationAdmin-CombiningiPOJOandConfigurationAdmin"></A>Combining iPOJO and Configuration Admin</H1>
 
 <P><EM>This page presents how creating, reconfiguring and destroying iPOJO component instance with the OSGi Configuration Admin.</EM></P>
@@ -281,9 +299,9 @@ START LEVEL 1
 [   1] [Active     ] [    1] Apache Felix Shell Service (1.0.0)
 [   2] [Active     ] [    1] Apache Felix Shell TUI (1.0.0)
 [   3] [Active     ] [    1] Apache Felix Bundle Repository (1.0.2)
-[   4] [Active     ] [    1] Apache Felix Configuration Admin Service (1.0.10) 
-[   5] [Active     ] [    1] Apache Felix iPOJO (1.2.0) 
-[   6] [Active     ] [    1] Apache Felix iPOJO Arch Command (1.2.0) 
+[   4] [Active     ] [    1] Apache Felix Configuration Admin Service (1.0.10)
+[   5] [Active     ] [    1] Apache Felix iPOJO (1.2.0)
+[   6] [Active     ] [    1] Apache Felix iPOJO Arch Command (1.2.0)
 </PRE>
 </DIV></DIV>
 
@@ -302,8 +320,8 @@ START LEVEL 1
 <P>The component type is defined with following metadata:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
-&lt;component 
-    classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1&quot;</SPAN> 
+&lt;component
+    classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1&quot;</SPAN>
     factory=<SPAN class="code-quote">&quot;hello1&quot;</SPAN> immediate=<SPAN class="code-quote">&quot;true&quot;</SPAN> architecture=<SPAN class="code-quote">&quot;true&quot;</SPAN>/&gt;
 </PRE>
 </DIV></DIV>
@@ -312,7 +330,7 @@ So if we deploy this bundle and add a co
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
 -&gt; start file:..\config.admin.tutorial\output\config.admin.tutorial.jar
--&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello1 
+-&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello1
 Insert the configuration : {org.apache.felix.ipojo.example.ca.component.Hello1}
 -&gt; Hello
 </PRE>
@@ -321,23 +339,23 @@ Insert the configuration : {org.apache.f
 So as predicted, the Hello message appears. To be really sure of the creating, we can ask for the instance architecture (the component type allows architecture introspection thank to the architecture attribute):</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; arch 
-Instance ArchCommand -&gt; valid 
-Instance org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8 -&gt; valid 
--&gt; 
--&gt; arch -instance 
-org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8 
+-&gt; arch
+Instance ArchCommand -&gt; valid
+Instance org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8 -&gt; valid
+-&gt;
+-&gt; arch -instance
+org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8
 instance name=
-    <SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8&quot;</SPAN> 
-        component.type=<SPAN class="code-quote">&quot;hello1&quot;</SPAN> 
-        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN> bundle=<SPAN class="code-quote">&quot;7&quot;</SPAN> 
-    object name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1@120cc56&quot;</SPAN> 
-    handler 
-        name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.handlers.lifecycle.callback.LifecycleCallbackHandler&quot;</SPAN> 
-        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN> 
-    handler 
-        name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.handlers.architecture.ArchitectureHandler&quot;</SPAN> 
-        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN> 
+    <SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8&quot;</SPAN>
+        component.type=<SPAN class="code-quote">&quot;hello1&quot;</SPAN>
+        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN> bundle=<SPAN class="code-quote">&quot;7&quot;</SPAN>
+    object name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello1@120cc56&quot;</SPAN>
+    handler
+        name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.handlers.lifecycle.callback.LifecycleCallbackHandler&quot;</SPAN>
+        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN>
+    handler
+        name=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.handlers.architecture.ArchitectureHandler&quot;</SPAN>
+        state=<SPAN class="code-quote">&quot;valid&quot;</SPAN>
 -&gt;
 </PRE>
 </DIV></DIV>
@@ -345,11 +363,11 @@ instance name=
 Then, we can delete the instance by removing the configuration from the configuration admin:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; delete_conf 
-org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8 
-Delete the configuration : 
-org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8 
--&gt; arch 
+-&gt; delete_conf
+org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8
+Delete the configuration :
+org.apache.felix.ipojo.example.ca.component.Hello1.e40fe80a-2c0d-4c51-b00b-a82565874cd8
+-&gt; arch
 Instance ArchCommand -&gt; valid
 </PRE>
 </DIV></DIV>
@@ -374,8 +392,8 @@ Instance ArchCommand -&gt; valid
 <P>And the following metadata:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
-&lt;component 
-        classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello2&quot;</SPAN> 
+&lt;component
+        classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello2&quot;</SPAN>
         factory=<SPAN class="code-quote">&quot;hello2&quot;</SPAN> immediate=<SPAN class="code-quote">&quot;true&quot;</SPAN> architecture=<SPAN class="code-quote">&quot;true&quot;</SPAN>&gt;
 	<SPAN class="code-tag">&lt;callback transition=<SPAN class="code-quote">&quot;validate&quot;</SPAN> method=<SPAN class="code-quote">&quot;stop&quot;</SPAN>/&gt;</SPAN>
 	<SPAN class="code-tag">&lt;properties&gt;</SPAN>
@@ -395,27 +413,27 @@ Let's play a simple scenario:</P>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=ipojo 
-Insert the configuration : 
-{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=ipojo} 
-Created configuration: 
-org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 
-Hello ipojo 
--&gt; list_conf 
-org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 : 
- {service.pid=org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3, 
-  service.factorypid=org.apache.felix.ipojo.example.ca.component.Hello2, 
-to=ipojo} 
--&gt; update_conf 
-org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 to=felix 
-Update: 
-pid=org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 
-Update the configuration : {to=felix} 
-Hello felix 
--&gt; delete_conf 
-org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 
-Delete the configuration : 
-org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 
+-&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=ipojo
+Insert the configuration :
+{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=ipojo}
+Created configuration:
+org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3
+Hello ipojo
+-&gt; list_conf
+org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 :
+ {service.pid=org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3,
+  service.factorypid=org.apache.felix.ipojo.example.ca.component.Hello2,
+to=ipojo}
+-&gt; update_conf
+org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3 to=felix
+Update:
+pid=org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3
+Update the configuration : {to=felix}
+Hello felix
+-&gt; delete_conf
+org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3
+Delete the configuration :
+org.apache.felix.ipojo.example.ca.component.Hello2.75082279-9b4b-4c49-b0e0-8efb38b67aa3
 Good by felix-&gt; list_conf
 </PRE>
 </DIV></DIV>
@@ -423,17 +441,17 @@ Good by felix-&gt; list_conf
 Obviously it is possible to create several instance of the same type:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=ipojo 
-Insert the configuration : 
-{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=ipojo} 
-Hello ipojo 
--&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=felix 
-Insert the configuration : 
-{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=felix} 
-Hello felix 
--&gt; arch 
-Instance ArchCommand -&gt; valid 
-Instance org.apache.felix.ipojo.example.ca.component.Hello2.aaf1927c-1a81-490d-bd7b-21b13d454987 -&gt; valid 
+-&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=ipojo
+Insert the configuration :
+{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=ipojo}
+Hello ipojo
+-&gt; create_conf org.apache.felix.ipojo.example.ca.component.Hello2 to=felix
+Insert the configuration :
+{service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello2, to=felix}
+Hello felix
+-&gt; arch
+Instance ArchCommand -&gt; valid
+Instance org.apache.felix.ipojo.example.ca.component.Hello2.aaf1927c-1a81-490d-bd7b-21b13d454987 -&gt; valid
 Instance org.apache.felix.ipojo.example.ca.component.Hello2.9344fdbe-c35e-4afc-b839-f7ad0ea59a9d -&gt; valid
 </PRE>
 </DIV></DIV>
@@ -446,7 +464,7 @@ Instance org.apache.felix.ipojo.example.
 <P>It is possible to propagate the instance configuration to the published service properties. To activate property propagation you need to write the <B>'propagation'</B> attribute in the 'properties' element as in</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
-&lt;component 
+&lt;component
     classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.ca.component.Hello3&quot;</SPAN>
     factory=<SPAN class="code-quote">&quot;hello3&quot;</SPAN> architecture=<SPAN class="code-quote">&quot;true&quot;</SPAN>&gt;
 	<SPAN class="code-tag">&lt;provides/&gt;</SPAN>
@@ -460,62 +478,62 @@ Instance org.apache.felix.ipojo.example.
 So create an instance of the Hello3 component type as follow:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; create_conf  org.apache.felix.ipojo.example.ca.component.Hello3 
-Insert the configuration : 
+-&gt; create_conf  org.apache.felix.ipojo.example.ca.component.Hello3
+Insert the configuration :
 {service.factoryPid=org.apache.felix.ipojo.example.ca.component.Hello3}
 </PRE>
 </DIV></DIV>
 <P>Then, you can check provided services with the <EM>services 7</EM> command</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; services 7 
-<SPAN class="code-comment">// Factories and Managed Service factories // 
-</SPAN>---- 
-factory.name = org.apache.felix.ipojo.example.ca.component.Hello3 
-instance.name = 
-org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b 
-objectClass = org.apache.felix.ipojo.example.ca.service.Hello 
-service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3 
-service.id = 69 
--&gt; 
+-&gt; services 7
+<SPAN class="code-comment">// Factories and Managed Service factories //
+</SPAN>----
+factory.name = org.apache.felix.ipojo.example.ca.component.Hello3
+instance.name =
+org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b
+objectClass = org.apache.felix.ipojo.example.ca.service.Hello
+service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3
+service.id = 69
+-&gt;
 </PRE>
 </DIV></DIV>
 <P>Now, we update the instance configuration with a new property 'p1':</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; update_conf 
-org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b p1=v1 
-Update the configuration : {p1=v1} 
--&gt; services 7 
-config.admin.tutorial (7) provides: 
-<SPAN class="code-comment">// Factories and Managed Service factories // 
-</SPAN>---- 
-factory.name = org.apache.felix.ipojo.example.ca.component.Hello3 
-instance.name = 
-org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b 
-objectClass = org.apache.felix.ipojo.example.ca.service.Hello 
-p1 = v1 
-service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3 
-service.id = 69 
+-&gt; update_conf
+org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b p1=v1
+Update the configuration : {p1=v1}
+-&gt; services 7
+config.admin.tutorial (7) provides:
+<SPAN class="code-comment">// Factories and Managed Service factories //
+</SPAN>----
+factory.name = org.apache.felix.ipojo.example.ca.component.Hello3
+instance.name =
+org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b
+objectClass = org.apache.felix.ipojo.example.ca.service.Hello
+p1 = v1
+service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3
+service.id = 69
 </PRE>
 </DIV></DIV>
 <P>Remark that the new property p1 is published. <BR>
 Now we can remove this property by reconfiguring the instance with an empty configuration:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
--&gt; update_conf 
-org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b 
-Update the configuration : {} 
--&gt; services 7 
-ConfigAdminExample (8) provides: 
-<SPAN class="code-comment">// Factories and Managed Service factories // 
-</SPAN>---- 
-factory.name = org.apache.felix.ipojo.example.ca.component.Hello3 
-instance.name = 
-org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b 
-objectClass = org.apache.felix.ipojo.example.ca.service.Hello 
-service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3 
-service.id = 69 
+-&gt; update_conf
+org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b
+Update the configuration : {}
+-&gt; services 7
+ConfigAdminExample (8) provides:
+<SPAN class="code-comment">// Factories and Managed Service factories //
+</SPAN>----
+factory.name = org.apache.felix.ipojo.example.ca.component.Hello3
+instance.name =
+org.apache.felix.ipojo.example.ca.component.Hello3.a5ca5901-6e20-4636-8805-fbca2db1d68b
+objectClass = org.apache.felix.ipojo.example.ca.service.Hello
+service.factoryPid = org.apache.felix.ipojo.example.ca.component.Hello3
+service.id = 69
 </PRE>
 </DIV></DIV>
 <P>The service does no more publish the <TT>p1</TT> property.</P>

Modified: felix/site/trunk/content/site/configuration-handler.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/configuration-handler.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/configuration-handler.html (original)
+++ felix/site/trunk/content/site/configuration-handler.html Mon Mar 10 15:48:48 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="ConfigurationHandler-ConfigurationHandler"></A>Configuration Handler</H1>
 

Modified: felix/site/trunk/content/site/constructing-pojo-objects-with-factory-methods.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/constructing-pojo-objects-with-factory-methods.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/constructing-pojo-objects-with-factory-methods.html (original)
+++ felix/site/trunk/content/site/constructing-pojo-objects-with-factory-methods.html Mon Mar 10 15:48:48 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="ConstructingPOJOobjectswithfactorymethods-UsingafactorymethodtocreatePOJOobject"></A>Using a factory method to create POJO object</H1>
 
 <P><EM>By default, iPOJO calls the POJO constructor to create objects. This constructor can either has no argument or receive the bundle context. However sometimes, you may want a more sophisticated object creation policy.</EM></P>

Modified: felix/site/trunk/content/site/controller-lifecycle-handler.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/controller-lifecycle-handler.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/controller-lifecycle-handler.html (original)
+++ felix/site/trunk/content/site/controller-lifecycle-handler.html Mon Mar 10 15:48:48 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="ControllerLifecycleHandler-LifecycleControllerHandler"></A>Lifecycle Controller Handler</H1>
 
 <P><EM>The lifecycle controller allows a component implementation to participate to the instance lifecycle. So, you can immediately decide to stop an instance if the configuration is incorrect (correct properties, accessible resources...). The licecyel controller impacts the instance lifecycle, if you want to impact only the registered service, have a look to the service controller (<A href="providing-osgi-services.html" title="Providing OSGi services">service providing</A>).</EM></P>
@@ -236,7 +254,7 @@
 <P>If you don't want to use annotations, the following snippet does the same job using XML:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
-&lt;component 
+&lt;component
    classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.test.scenarios.component.LifecycleControllerTest&quot;</SPAN>&gt;
 		<SPAN class="code-tag">&lt;controller field=<SPAN class="code-quote">&quot;m_state&quot;</SPAN>/&gt;</SPAN>
 		<SPAN class="code-tag">&lt;properties&gt;</SPAN>

Modified: felix/site/trunk/content/site/describing-components.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/describing-components.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/describing-components.html (original)
+++ felix/site/trunk/content/site/describing-components.html Mon Mar 10 15:48:48 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="Describingcomponents-DescribingyouriPOJOcomponents"></A>Describing your iPOJO components</H1>
 



Mime
View raw message