felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1575977 [5/6] - /felix/site/trunk/content/site/
Date Mon, 10 Mar 2014 15:48:49 GMT
Modified: felix/site/trunk/content/site/ipojo-composition-tutorial.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-composition-tutorial.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-composition-tutorial.html (original)
+++ felix/site/trunk/content/site/ipojo-composition-tutorial.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="iPOJOCompositionTutorial-iPOJOCompositionTutorial"></A>iPOJO Composition Tutorial</H1>
 <P><EM>This page describes how works the composition mechanisms provided by iPOJO and how to use it. this feature allows you to design applications that will natively support the dynamism and the evolution.</EM></P>
 
@@ -307,10 +325,10 @@ The descriptor of this application is:</
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition1&quot;</SPAN>&gt;</SPAN>
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the English dictionary --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.english.EnglishDictionary&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the Checker --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.checker.SpellCheck&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the GUI --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.gui.SpellCheckerGui&quot;</SPAN>/&gt;</SPAN>
 <SPAN class="code-tag">&lt;/composite&gt;</SPAN>
@@ -431,15 +449,15 @@ If we use this implementation, we need t
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition2&quot;</SPAN>&gt;</SPAN>
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the English dictionary --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.english.EnglishDictionary&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the Checker --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.checker.SpellCheck&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the GUI --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.gui.SpellCheckerGui&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Imports the log service --&gt;</SPAN></SPAN>
-	&lt;subservice action=<SPAN class="code-quote">&quot;import&quot;</SPAN> 
+	&lt;subservice action=<SPAN class="code-quote">&quot;import&quot;</SPAN>
              specification=<SPAN class="code-quote">&quot;org.osgi.service.log.LogService&quot;</SPAN>/&gt;
 <SPAN class="code-tag">&lt;/composite&gt;</SPAN>
 
@@ -499,12 +517,12 @@ In the first composition, we create an i
 <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Declares a composition --&gt;</SPAN></SPAN>
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition3&quot;</SPAN>&gt;</SPAN>
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the English dictionary --&gt;</SPAN></SPAN>
-	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN> 
+	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN>
              specification=<SPAN class="code-quote">&quot;spell.services.DictionaryService&quot;</SPAN>/&gt;
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the Checker --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.checker.SpellCheck&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the GUI --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.gui.SpellCheckerGui&quot;</SPAN>/&gt;</SPAN>
 <SPAN class="code-tag">&lt;/composite&gt;</SPAN>
@@ -541,7 +559,7 @@ component.properties = &lt;unknown value
 component.providedServiceSpecifications = spell.services.DictionaryService
 factory.name = spell.english.EnglishDictionary
 factory.state = 1
-objectClass = org.apache.felix.ipojo.Factory, 
+objectClass = org.apache.felix.ipojo.Factory,
               org.osgi.service.cm.ManagedServiceFactory
 service.id = 39
 service.pid = spell.english.EnglishDictionary
@@ -579,14 +597,14 @@ So, let's imagine a fourth version of ou
 <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Declares a composition --&gt;</SPAN></SPAN>
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition4&quot;</SPAN>&gt;</SPAN>
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the English dictionary --&gt;</SPAN></SPAN>
-	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN> 
+	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN>
           specification=<SPAN class="code-quote">&quot;spell.services.DictionaryService&quot;</SPAN>/&gt;
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the Checker --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.checker.SpellCheck&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Export the SpellChecker service --&gt;</SPAN></SPAN>
-	&lt;provides action=<SPAN class="code-quote">&quot;export&quot;</SPAN> 
+	&lt;provides action=<SPAN class="code-quote">&quot;export&quot;</SPAN>
             specification=<SPAN class="code-quote">&quot;spell.services.SpellChecker&quot;</SPAN>/&gt;
 <SPAN class="code-tag">&lt;/composite&gt;</SPAN>
 
@@ -623,7 +641,7 @@ component.properties = &lt;unknown value
 component.providedServiceSpecifications = spell.services.SpellChecker
 factory.name = composition4
 factory.state = 1
-objectClass = org.apache.felix.ipojo.Factory, 
+objectClass = org.apache.felix.ipojo.Factory,
               org.osgi.service.cm.ManagedServiceFactory
 service.id = 36
 service.pid = composition4
@@ -648,7 +666,7 @@ component.properties = &lt;unknown value
 component.providedServiceSpecifications = spell.services.SpellChecker
 factory.name = composition4
 factory.state = 1
-objectClass = org.apache.felix.ipojo.Factory, 
+objectClass = org.apache.felix.ipojo.Factory,
               org.osgi.service.cm.ManagedServiceFactory
 service.id = 36
 service.pid = composition4
@@ -657,7 +675,7 @@ factory.name = composition4
 instance.name = composition4-0
 objectClass = spell.services.SpellChecker
 service.id = 41
--&gt; 
+-&gt;
 </PRE>
 </DIV></DIV>
 <H2><A name="iPOJOCompositionTutorial-Hierarchicalcomposites"></A>Hierarchical composites</H2>
@@ -669,18 +687,18 @@ service.id = 41
 <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Declares the same composition than the latest one --&gt;</SPAN></SPAN>
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition4&quot;</SPAN>&gt;</SPAN>
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the English dictionary --&gt;</SPAN></SPAN>
-	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN> 
+	&lt;subservice action=<SPAN class="code-quote">&quot;instantiate&quot;</SPAN>
             specification=<SPAN class="code-quote">&quot;spell.services.DictionaryService&quot;</SPAN>/&gt;
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  Instantiates an instance of the Checker --&gt;</SPAN></SPAN>
 	<SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;spell.checker.SpellCheck&quot;</SPAN>/&gt;</SPAN>
-	
+
 	<SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Exports the SpellChecker service --&gt;</SPAN></SPAN>
-	&lt;provides action=<SPAN class="code-quote">&quot;export&quot;</SPAN> 
+	&lt;provides action=<SPAN class="code-quote">&quot;export&quot;</SPAN>
             specification=<SPAN class="code-quote">&quot;spell.services.SpellChecker&quot;</SPAN>/&gt;
 <SPAN class="code-tag">&lt;/composite&gt;</SPAN>
 
-&lt;!--  Declares another composition containing an instance of the previous 
+&lt;!--  Declares another composition containing an instance of the previous
       composition and an instance of the GUI
  --&gt;
 <SPAN class="code-tag">&lt;composite name=<SPAN class="code-quote">&quot;composition5&quot;</SPAN>&gt;</SPAN>

Modified: felix/site/trunk/content/site/ipojo-concepts-overview.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-concepts-overview.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-concepts-overview.html (original)
+++ felix/site/trunk/content/site/ipojo-concepts-overview.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>
+
 <P><BR class="atl-forced-newline"></P>
 
 <DIV class="box">

Modified: felix/site/trunk/content/site/ipojo-eclipse-plug-in.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-eclipse-plug-in.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-eclipse-plug-in.html (original)
+++ felix/site/trunk/content/site/ipojo-eclipse-plug-in.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="iPOJOEclipsePlug-in-iPOJOEclipsePlugin"></A>iPOJO Eclipse Plug-in</H1>
 
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Update</B><BR>The iPOJO Eclipse plugin is now hosted and supported in the <A href="http://ipojo-toolbox.wiki.sourceforge.net/iPOJO-Eclipse-plugin" class="external-link" rel="nofollow">iPOJO Toolbox project</A>.</TD></TR></TABLE></DIV>
@@ -264,20 +282,20 @@
         Date date = <SPAN class="code-keyword">new</SPAN> Date(entry.getTime());
         <SPAN class="code-object">String</SPAN> message = &quot;&quot;;
         <SPAN class="code-keyword">switch</SPAN>(entry.getLevel()) {
-        <SPAN class="code-keyword">case</SPAN> LogService.LOG_DEBUG: message = <SPAN class="code-quote">&quot;[DEBUG] &quot;</SPAN> + 
+        <SPAN class="code-keyword">case</SPAN> LogService.LOG_DEBUG: message = <SPAN class="code-quote">&quot;[DEBUG] &quot;</SPAN> +
            DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> +
            entry.getMessage(); <SPAN class="code-keyword">break</SPAN>;
-        <SPAN class="code-keyword">case</SPAN> LogService.LOG_ERROR: message = <SPAN class="code-quote">&quot;[ERROR] &quot;</SPAN> + 
+        <SPAN class="code-keyword">case</SPAN> LogService.LOG_ERROR: message = <SPAN class="code-quote">&quot;[ERROR] &quot;</SPAN> +
            DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> +
            entry.getMessage(); <SPAN class="code-keyword">break</SPAN>;
-        <SPAN class="code-keyword">case</SPAN> LogService.LOG_INFO: message = <SPAN class="code-quote">&quot;[INFO] &quot;</SPAN> + 
-           DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> + 
+        <SPAN class="code-keyword">case</SPAN> LogService.LOG_INFO: message = <SPAN class="code-quote">&quot;[INFO] &quot;</SPAN> +
+           DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> +
            entry.getMessage(); <SPAN class="code-keyword">break</SPAN>;
-        <SPAN class="code-keyword">case</SPAN> LogService.LOG_WARNING: message = <SPAN class="code-quote">&quot;[WARNING] &quot;</SPAN> + 
+        <SPAN class="code-keyword">case</SPAN> LogService.LOG_WARNING: message = <SPAN class="code-quote">&quot;[WARNING] &quot;</SPAN> +
            DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> +
            entry.getMessage(); <SPAN class="code-keyword">break</SPAN>;
-        <SPAN class="code-keyword">default</SPAN>: message = <SPAN class="code-quote">&quot;[UNKNOWN] &quot;</SPAN> + 
-           DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> + entry.getMessage(); 
+        <SPAN class="code-keyword">default</SPAN>: message = <SPAN class="code-quote">&quot;[UNKNOWN] &quot;</SPAN> +
+           DateFormat.getInstance().format(date) + <SPAN class="code-quote">&quot; - &quot;</SPAN> + entry.getMessage();
            <SPAN class="code-keyword">break</SPAN>;
         }
         <SPAN class="code-object">System</SPAN>.out.println(message);
@@ -297,7 +315,7 @@ Private-Package: org.apache.felix.ipojo.
 <PRE class="code-java">
 &lt;ipojo&gt;
 &lt;!-- Declare the component type <SPAN class="code-keyword">for</SPAN> LogCons --&gt;
-&lt;component classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.logcons.LogCons&quot;</SPAN> 
+&lt;component classname=<SPAN class="code-quote">&quot;org.apache.felix.ipojo.example.logcons.LogCons&quot;</SPAN>
            name=<SPAN class="code-quote">&quot;LogCons&quot;</SPAN>&gt;
 	&lt;requires field=<SPAN class="code-quote">&quot;reader&quot;</SPAN>/&gt;
 	&lt;callback transition=<SPAN class="code-quote">&quot;validate&quot;</SPAN> method=<SPAN class="code-quote">&quot;start&quot;</SPAN>/&gt;

Modified: felix/site/trunk/content/site/ipojo-faq.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-faq.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-faq.html (original)
+++ felix/site/trunk/content/site/ipojo-faq.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="iPOJOFAQ-ApacheFelixiPOJOFAQ"></A>Apache Felix iPOJO FAQ</H1>
 

Modified: felix/site/trunk/content/site/ipojo-hello-word-maven-based-tutorial.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-hello-word-maven-based-tutorial.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-hello-word-maven-based-tutorial.html (original)
+++ felix/site/trunk/content/site/ipojo-hello-word-maven-based-tutorial.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="iPOJOHelloWord%28Maven-Based%29tutorial-iPOJOHelloWorld"></A>iPOJO Hello World</H1>
 
 <P><EM>This page presents how to use the iPOJO runtime and its associated service component model. The concepts of the service component model are introduced, followed by a simple example that demonstrates the features of iPOJO.</EM></P>
@@ -308,16 +326,16 @@ mvn clean install
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
 <SPAN class="code-tag">&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;</SPAN>
-&lt;ipojo 
+&lt;ipojo
     <SPAN class="code-keyword">xmlns:xsi</SPAN>=<SPAN class="code-quote">&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</SPAN>
-    xsi:schemaLocation=<SPAN class="code-quote">&quot;org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd&quot;</SPAN> 
+    xsi:schemaLocation=<SPAN class="code-quote">&quot;org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd&quot;</SPAN>
     xmlns=<SPAN class="code-quote">&quot;org.apache.felix.ipojo&quot;</SPAN>&gt;
-      
+
   &lt;component classname=<SPAN class="code-quote">&quot;ipojo.example.hello.impl.HelloImpl&quot;</SPAN>
     name=<SPAN class="code-quote">&quot;HelloProvider&quot;</SPAN>&gt;
     <SPAN class="code-tag">&lt;provides /&gt;</SPAN>
   <SPAN class="code-tag">&lt;/component&gt;</SPAN>
-  
+
   <SPAN class="code-tag">&lt;instance component=<SPAN class="code-quote">&quot;HelloProvider&quot;</SPAN> name=<SPAN class="code-quote">&quot;HelloService&quot;</SPAN> /&gt;</SPAN>
 <SPAN class="code-tag">&lt;/ipojo&gt;</SPAN>
 </PRE>
@@ -466,9 +484,9 @@ mvn clean install
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml">
 <SPAN class="code-tag">&lt;?xml version=<SPAN class="code-quote">&quot;1.0&quot;</SPAN> encoding=<SPAN class="code-quote">&quot;UTF-8&quot;</SPAN>?&gt;</SPAN>
-&lt;ipojo 
+&lt;ipojo
     <SPAN class="code-keyword">xmlns:xsi</SPAN>=<SPAN class="code-quote">&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</SPAN>
-    xsi:schemaLocation=<SPAN class="code-quote">&quot;org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd&quot;</SPAN> 
+    xsi:schemaLocation=<SPAN class="code-quote">&quot;org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd&quot;</SPAN>
     xmlns=<SPAN class="code-quote">&quot;org.apache.felix.ipojo&quot;</SPAN>&gt;
 
   <SPAN class="code-tag">&lt;component classname=<SPAN class="code-quote">&quot;ipojo.example.hello.client.HelloClient&quot;</SPAN>&gt;</SPAN>

Modified: felix/site/trunk/content/site/ipojo-hierarchical-composition-overview.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-hierarchical-composition-overview.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-hierarchical-composition-overview.html (original)
+++ felix/site/trunk/content/site/ipojo-hierarchical-composition-overview.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="iPOJOHierarchicalCompositionOverview-Introduction"></A>Introduction</H1>
 
 <P><EM>iPOJO is an extensible, service-oriented component model implemented on the top of the OSGi framework that aims to simplify the development of OSGi&trade; applications. iPOJO follows a POJO-based component approach using external metadata to describe how POJO components should be managed by the iPOJO runtime. Some of the standard features of iPOJO include automatic service dependency management, service publication, and configuration property injection.</EM></P>

Modified: felix/site/trunk/content/site/ipojo-in-10-minutes.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-in-10-minutes.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-in-10-minutes.html (original)
+++ felix/site/trunk/content/site/ipojo-in-10-minutes.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="iPOJOin10minutes-iPOJOin10minutes"></A>iPOJO in 10 minutes</H1>
 

Modified: felix/site/trunk/content/site/ipojo-jmx-handler.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-jmx-handler.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-jmx-handler.html (original)
+++ felix/site/trunk/content/site/ipojo-jmx-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="iPOJOJMXHandler-iPOJOJMXHandler"></A>iPOJO JMX Handler</H1>
 
 <P><EM>This handler provides JMX management of component instance. It could be useful to manage instance remotely. As the handler exposes MBeans, you must have a MBean server running on your platform (as the platform MBean server or the MOSGi MBean Server).</EM></P>
@@ -334,7 +352,7 @@ postDeregister</TD>
 <TR>
 <TD class="confluenceTd">rights</TD>
 <TD class="confluenceTd">NO</TD>
-<TD class="confluenceTd">Specify the access permission of the exposed field. The accepted values are : 
+<TD class="confluenceTd">Specify the access permission of the exposed field. The accepted values are :
 <UL>
 	<LI>&quot;r&quot; : read-only access, the default value.</LI>
 	<LI>&quot;w&quot; : read and write access.</LI>
@@ -491,13 +509,13 @@ Do nothing
 
     @Property(name=<SPAN class="code-quote">&quot;prop&quot;</SPAN>, notification=<SPAN class="code-keyword">true</SPAN>, rights=<SPAN class="code-quote">&quot;w&quot;</SPAN>) <SPAN class="code-comment">// Field published in the MBean
 </SPAN>    <SPAN class="code-object">String</SPAN> m_foo;
-    
+
     @Method(description=<SPAN class="code-quote">&quot;set the foo prop&quot;</SPAN>) <SPAN class="code-comment">// Method published in the MBean
 </SPAN>    <SPAN class="code-keyword">public</SPAN> void setFoo(<SPAN class="code-object">String</SPAN> mes) {
         <SPAN class="code-object">System</SPAN>.out.println(<SPAN class="code-quote">&quot;Set foo to &quot;</SPAN> + mes);
         m_foo = mes;
     }
-    
+
     @Method(description=<SPAN class="code-quote">&quot;get the foo prop&quot;</SPAN>) <SPAN class="code-comment">// Method published in the MBean
 </SPAN>    <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getFoo() {
         <SPAN class="code-keyword">return</SPAN> m_foo;

Modified: felix/site/trunk/content/site/ipojo-maven-plug-in.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-maven-plug-in.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-maven-plug-in.html (original)
+++ felix/site/trunk/content/site/ipojo-maven-plug-in.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="iPOJOMavenPlug-in-HowtousetheiPOJOMavenPlugin"></A>How to use the iPOJO Maven Plug-in</H1>
 
 <DIV class="toc"><DIV>

Modified: felix/site/trunk/content/site/ipojo-news.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/site/ipojo-news.html?rev=1575977&r1=1575976&r2=1575977&view=diff
==============================================================================
--- felix/site/trunk/content/site/ipojo-news.html (original)
+++ felix/site/trunk/content/site/ipojo-news.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="iPOJO-news-What%27shot%3F"></A>What's hot ? </H1>
 



Mime
View raw message