felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r857373 [4/4] - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/ documentation/subprojects/apache-felix-ipojo/ documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/ documentation/subprojects/apache...
Date Fri, 05 Apr 2013 08:55:32 GMT
Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
@@ -397,222 +397,191 @@ iPOJO 1.3.0-SNAPSHOT sets the lifecycle 
 Finally, the <code>org.osgi.service.log</code> is imported because iPOJO delegates log to a log service (if available). This service is get from the bundle context from the bundle declaring the component type. So, to get this service, the package of the service interface is imported.  Then, according to implementations, log services may get the bundle logging the message.</p>
 <h2 id="how-does-ipojo-compare-to-declarative-services-or-blueprint">How does iPOJO compare to Declarative Services or Blueprint?</h2>
 <p>The following table highlights some of the features of each system, it does not attempt to highlight every feature of each.</p>
-<table>
-<thead>
-<tr>
-<th>Dependency injection &nbsp;</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Callback injection</td>
-<td>Yes</td>
-<td>Yes (public method only)</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Constructor injection</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Field injection</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Setter injection</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Proxy injection</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>List injection</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Nullable injection</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Dependency Injection</th>
+      <th>Declarative Service</th>
+      <th>Blueprint</th>
+      <th>iPOJO</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>Callback injection</strong></td>
+      <td>Yes</td>
+      <td>Yes (public method only)</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Constructor injection</strong></td>
+      <td>No</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Field injection</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Proxy injection</strong></td>
+      <td>No</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Collections (List, Set...) injection</strong></td>
+      <td>No</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Mock (<em>nullable, default-implementation</em>) injection</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+  </tbody>
 </table>
-<table>
-<thead>
-<tr>
-<th>Lifecycle</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Callbacks (activate/deactivate)</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Factory pattern</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Lazy initialization</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Damping</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Field synchronization</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Component lifecycle control</td>
-<td>Yes</td>
-<td>Partial</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Service lifecycle control</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
-</table>
-<table>
-<thead>
-<tr>
-<th>Configuration</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Property configuration</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Field configuration</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Configuration Admin</td>
-<td>Yes</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
-</table>
-<table>
-<thead>
-<tr>
-<th>Services</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Custom attribute type</td>
-<td>No</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Lazy initialization</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Composite services</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
-</table>
-<table>
-<thead>
-<tr>
-<th>Component description</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>XML</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>Java annotations</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-<tr>
-<td>API</td>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
+
+<p><br/></p>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Lifecycle</th>
+      <th>Declarative Service</th>
+      <th>Blueprint</th>
+      <th>iPOJO</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>Lifecycle callbacks (activate / deactivate)</strong></td>
+      <td>Yes</td>
+      <td>Yes (public method only)</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Factory / Prototype</strong></td>
+      <td>Yes</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Lazzy initialization</strong></td>
+      <td>Yes</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Damping</strong></td>
+      <td>No</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Handling of the synchronization</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Code can impact the lifecycle</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Code can impact the service publication</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+  </tbody>
 </table>
-<table>
-<thead>
-<tr>
-<th>Nonfunctional</th>
-<th>Declarative Services</th>
-<th>Blueprint</th>
-<th>iPOJO</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Multiple providers</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>No</td>
-</tr>
-</tbody>
+
+<p><br/>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Configuration</th>
+      <th>Declarative Service</th>
+      <th>Blueprint</th>
+      <th>iPOJO</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>Property configuration</strong></td>
+      <td>Yes</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Property injectin inside field</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Property injection using <em>setters</em></strong></td>
+      <td>No</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Configuration admin support</strong></td>
+      <td>Yes</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Code can update the configuration</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+  </tbody>
 </table>
+<br/>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Component configuration</th>
+      <th>Declarative Service</th>
+      <th>Blueprint</th>
+      <th>iPOJO</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>XML</strong></td>
+      <td>Yes</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Annotations</strong></td>
+      <td>Yes</td>
+      <td>Yes</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Defining components using an API</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td><strong>Reconfiguring components using an API</strong></td>
+      <td>No</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
+  </tbody>
+</table></p>
         </div>
     </div>
 
@@ -627,7 +596,7 @@ Finally, the <code>org.osgi.service.log<
                 may be trademarks or registered trademarks of their respective owners.
                 </div>
                 <div class="timestamp span3 offset2">
-                Rev. 1445514 by clement on Wed, 13 Feb 2013 09:20:49 +0000
+                Rev. 1464894 by clement on Fri, 5 Apr 2013 08:54:50 +0000
                 </div>
             </div>
         </footer>           

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-why-choose-ipojo.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-why-choose-ipojo.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-why-choose-ipojo.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/article-presentations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/article-presentations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/article-presentations.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/articles-and-presentations.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/download.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/download.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/download.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-maven-plug-in.html">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/future-ideas.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/future-ideas.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/future-ideas.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/handlers-proposition.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/handlers-proposition.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/handlers-proposition.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-news.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-news.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-news.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.html">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-reference-card.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-reference-card.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-reference-card.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
@@ -153,23 +153,20 @@
 
     <div class="container">
         <div class="content">
-            <h1 id="support">Support</h1>
-<p><em>Two types of support are provided for Apache Felix iPOJO. The community support is free but relies on the availability of iPOJO developers. Professional supports are provided by companies guarantying a fast and efficient feedback.</em></p>
-<h2 id="community-support">Community Support</h2>
-<h3 id="mailing-list">Mailing List</h3>
-<p>iPOJO is hosted as an Apache Felix sub-project, you can ask questions by sending mails to the Felix mailing lists. There is two mailing list:
+            <h3 id="mailing-list">Mailing List</h3>
+<p>iPOJO is hosted as an Apache Felix sub-project, you can ask questions by sending mails to the Felix mailing lists. There is two mailing lists:
 <em> The users mailing list
 </em> The developer mailing list</p>
 <p>Subscribe to the Felix users mailing list by sending a message to <a href="mailto:users-subscribe@felix.apache.org">users-subscribe@felix.apache.org</a>; after subscribing, email questions or feedback to <a href="mailto:users@felix.apache.org">users@felix.apache.org</a>.</p>
 <p>Either, if you want to be involved, subscribe to the Felix dev mailing list by sending a message to <a href="mailto:dev-subscribe@felix.apache.org">dev-subscribe@felix.apache.org</a>; after subscribing, email ideas or feedback to <a href="mailto:dev@felix.apache.org">dev@felix.apache.org</a>.</p>
 <h3 id="bug-tracker">Bug Tracker</h3>
-<p>If you want a features, an improvement or report a bug, feel free to open an issue on the Apache Felix bug tracker:</p>
+<p>If you want a features, an improvement or report a bug, open an issue on the Apache Felix bug tracker:</p>
 <ul>
 <li>Go to the <a href="https://issues.apache.org/jira/browse/FELIX">https://issues.apache.org/jira/browse/FELIX</a> page</li>
 <li>Create an account or log in.</li>
 <li>Open the 'Create a new issue in project Felix' form.</li>
 <li>Then, select the Felix project and the issue type (improvement, bug, wish, new feature...)</li>
-<li>At the second step, select the <em>iPOJO</em> component and fill out the form (please select the affected version only)</li>
+<li>At the second step, select the <strong>iPOJO</strong> component and fill out the form (please select the affected version only)</li>
 <li>Finally click on the create button</li>
 </ul>
 <p>You can also watch the issue to monitor progress. The iPOJO team tries to give you quick and frequent feedback on issues.</p>
@@ -187,7 +184,7 @@
                 may be trademarks or registered trademarks of their respective owners.
                 </div>
                 <div class="timestamp span3 offset2">
-                Rev. 1443051 by clement on Wed, 6 Feb 2013 16:33:33 +0000
+                Rev. 1464894 by clement on Fri, 5 Apr 2013 08:54:50 +0000
                 </div>
             </div>
         </footer>           

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-test-page.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-test-page.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-test-page.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/menu2.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/menu2.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/menu2.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/related-works.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/related-works.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/related-works.html Fri Apr  5 08:55:31 2013
@@ -98,15 +98,15 @@
                                         <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.html">iPOJO and config admin</a></li>
                                         <li><a href="">Factories and Instances</a></li>
                                         <li><a href="">XML Schemas</a></li>
-                                        <li><a href="">API</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html">Using the iPOJO API</a></li>
                                         <li><a href="">Testing components</a></li>
                                         <li><a href="">Eclipse Integration</a></li>
-                                        <li><a href="">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="">Handler development</a></li>
-                                        <li><a href="">Manipulation Metadata </a></li>
-                                        <li><a href="">Dive into the iPOJO Manipulation depths</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.html">Manipulation Metadata </a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.html">Dive into the iPOJO Manipulation depths</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -115,7 +115,7 @@
                         <li class="dropdown" id="tools-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Tools <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Ant Task</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html">Ant Task</a></li>
                                 <li><a href="">Eclipse Plugin</a></li>
                                 <li><a href="">Maven Plugin</a></li>
                                 <li><a href="">`arch` shell command</a></li>
@@ -127,7 +127,7 @@
                         <li class="dropdown" id="community-menu">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community <b class="caret"></b></a>
                             <ul class="dropdown-menu" id="swatch-menu">
-                                <li><a href="">Support</a></li>
+                                <li><a href="/documentation/subprojects/apache-felix-ipojo/ipojo-support.html">Support</a></li>
                                 <li><a href="http://www.apache.org/">ASF</a></li>
                                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
                                 <li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>

Added: websites/staging/felix/trunk/content/ipojo/cube.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/felix/trunk/content/ipojo/cube.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/felix/trunk/content/ipojo/cubes.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/felix/trunk/content/ipojo/cubes.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/felix/trunk/content/ipojo/ipojo-logo-150.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/felix/trunk/content/ipojo/ipojo-logo-150.png
------------------------------------------------------------------------------
    svn:mime-type = image/png



Mime
View raw message