You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/04/05 10:54:51 UTC

svn commit: r1464894 - in /felix/site/trunk: content/documentation/subprojects/ content/documentation/subprojects/apache-felix-ipojo/ content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/ content/documentation/subprojects/ap...

Author: clement
Date: Fri Apr  5 08:54:50 2013
New Revision: 1464894

URL: http://svn.apache.org/r1464894
Log:
add new iPOJO logo and images, migrate the manipulation details to the new CMS system, migrate the iPOJO Ant task documentation to the new CMS system, migrate the iPOJO FAQ to the new CMS system, migrate the support page to the new CMS system

Added:
    felix/site/trunk/content/ipojo/cube.png   (with props)
    felix/site/trunk/content/ipojo/cubes.png   (with props)
    felix/site/trunk/content/ipojo/ipojo-logo-150.png   (with props)
Modified:
    felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.mdtext
    felix/site/trunk/templates/ipojo.html

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo.mdtext?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo.mdtext Fri Apr  5 08:54:50 2013
@@ -9,7 +9,7 @@ Title: Apache Felix iPOJO
 				<p class="lead">A flexible and extendible service component model</p>
 			</div>	
 			<div class="span6">
-				<img src="http://placehold.it/350x150">
+				<img src="/ipojo/ipojo-logo-150.png">
 			</div>	
  			</div>
  		</header>	
@@ -18,8 +18,8 @@ Title: Apache Felix iPOJO
 	<div class="row">
  				<div class="span6">
  				<h3>What's iPOJO</h3>	
- 				<strong>iPOJO</strong> is a <em>service component runtime</em> aiming to simplify OSGi application development. It natively supports <strong>ALL</strong> the dynamism of OSGi. Based on the concept of POJO, application logic is developed easily. Non-functional properties are just injected in the component at runtime.</p>
- 				<img src="http://placehold.it/350x150">
+ 				<strong>iPOJO</strong> is a <em>service component runtime</em> aiming to simplify OSGi application development. It natively supports <strong>ALL</strong> the dynamism of OSGi. iPOJO is made to run the modern applications exhibiting modularity and requiring runtime adaption and autonomic behavior.</p>
+ 				<img src="/ipojo/cubes.png" class="offset1">
  				</div>
  				<div class="span6">
  					<h3>Main features</h3>
@@ -30,6 +30,7 @@ Title: Apache Felix iPOJO
 						<li><i class="icon-ok"></i> iPOJO manages the component instance lifecycle and the environment dynamics as never before possible</li>
 						<li><i class="icon-ok"></i> iPOJO provides a powerful composition system to create highly dynamic applications</li>
 						<li><i class="icon-ok"></i> iPOJO supports annotations, XML, and a Java-based API to define components</li>
+						<li><i class="icon-ok"></i> iPOJO applications are natively dynamic, adaptable and autonomic-ready</li>
 					</ul>
 				</div> 					
 			</div>

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.mdtext?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.mdtext Fri Apr  5 08:54:50 2013
@@ -5,7 +5,7 @@ Title: Dive into the iPOJO Manipulation 
 
 # Dive into the iPOJO Manipulation depths
 
-iPOJO (primitive) components are managed using byte code manipulation. Don't be afraid, you don't have to be fluent in byte code to understand components ☺. This page explains how the manipulation works and how your class file is transformed. This manipulation takes care to *NOT* change the behavior of the manipulated class.
+iPOJO (primitive) components are managed using byte code manipulation. Don't be afraid, you don't have to be fluent in byte code to understand components. This page explains how the manipulation works and how your class file is transformed. This manipulation takes care to **NOT** change the behavior of the manipulated class.
 
 [TOC]
 

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.mdtext?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.mdtext Fri Apr  5 08:54:50 2013
@@ -8,31 +8,30 @@ Title: iPOJO Ant Task
 
 *iPOJO Ant Task allows automating the iPOJO manipulation process within an Ant build process. This page explains how to use the iPOJO Ant Task and how to combine them with the BND Tasks.*
 
-{div:class=toc}
 [TOC]
-{div}
 
 ## Downloading the iPOJO Ant Task
 
-The iPOJO Ant Task can ben downloaded from [here]({{ refs.download.path }}).
+The iPOJO Ant Task can ben downloaded from [here](http://felix.apache.org/downloads.cgi).
 
 ## How to use the Ant Task
 
 The iPOJO Ant task take an input bundle and a metadata file and create the final (i.e. manipulated) bundle.
 To use the task declare a target in your build.xml as:
-{div:class=pom}
-<target name="main">
-&nbsp;&nbsp;&nbsp;&nbsp;{color:red}<!-- Change the path to point on the iPOJO Ant task jar-->{color}
-&nbsp;&nbsp;&nbsp;&nbsp;<taskdef name="ipojo"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;classname="org.apache.felix.ipojo.task.IPojoTask"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}classpath="org.apache.felix.ipojo.ant-1.6.0.jar"{color}/>
-
-&nbsp;&nbsp;&nbsp;&nbsp;<ipojo
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;input="foo.jar"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;metadata = "meta.xml"
-&nbsp;&nbsp;&nbsp;&nbsp;/>
-</target>
-{div}
+
+	:::xml
+	<target name="main">
+        <!-- Change the path to point on the iPOJO Ant task jar-->
+        <taskdef name="ipojo"
+                classname="org.apache.felix.ipojo.task.IPojoTask"
+                classpath="org.apache.felix.ipojo.ant-1.8.6.jar"/>
+
+        <ipojo
+                input="foo.jar"
+                metadata = "meta.xml"
+        />
+	</target>
+
 First, define the new task. Then simply use it. The input argument describe the input bundle (must exists) and the metadata argument describes the metadata file (must exist too). The input bundle must be a well-formed bundle.
 
 ## Ant Task Arguments
@@ -47,83 +46,86 @@ The iPOJO Ant Task as three different ar
 ## Combining the iPOJO Ant Task and BND
 
 The iPOJO Ant Task requires an input bundle. BND is a tools simplifying bundle creation. So, it is possible to combine the two tools to create your bundle automatically. The following build.xml shows you an example of combination.
-{div:class=pom}
-<project default="main" basedir=".">
-&nbsp;&nbsp;&nbsp;&nbsp;<target name="bnd">
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}<!-- Change to use the latest BND version --{color}{color:red}>{color}
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<taskdef resource="aQute/bnd/ant/taskdef.properties"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}classpath="bnd-0.0.178.jar"{color}/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<bnd
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;classpath="src"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eclipse="true"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;failok="false"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;exceptions="true"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}files="foo.bnd"{color}/>
-&nbsp;&nbsp;&nbsp;&nbsp;</target>
-
-&nbsp;&nbsp;&nbsp;&nbsp;<target name="main" depends="bnd">
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <echo message="Call main"/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}<!-- Change the path to point on the iPOJO Ant task jar -->{color}
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<taskdef name="ipojo"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;classname="org.apache.felix.ipojo.task.IPojoTask"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}classpath="org.apache.felix.ipojo.ant-1.6.0.jar"{color} />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<ipojo
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}input="foo.jar"{color}
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;metadata = "meta.xml"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; />
-&nbsp;&nbsp;&nbsp;&nbsp;</target>
-</project>
-{div}
+
+	:::xml
+	<project default="main" basedir=".">
+        <target name="bnd">
+            <!-- Change to use the latest BND version -->
+            <taskdef resource="aQute/bnd/ant/taskdef.properties"
+                classpath="bnd-0.0.178.jar"/>
+            <bnd
+                classpath="src"
+                eclipse="true"
+                failok="false"
+                exceptions="true"
+                files="foo.bnd"/>
+        </target>
+
+        <target name="main" depends="bnd">
+             <echo message="Call main"/>
+            <!-- Change the path to point on the iPOJO Ant task jar -->
+            <taskdef name="ipojo"
+                classname="org.apache.felix.ipojo.task.IPojoTask"
+                classpath="org.apache.felix.ipojo.ant-1.8.6.jar" />
+
+			<!-- the input attribute must fit the .bnd file name -->                
+            <ipojo
+                input="foo.jar"
+                metadata = "meta.xml"
+             />
+        </target>
+	</project>
+
 The first target creates the bundle with BND. More details on the BND Ant Task are available here. To combine the BND output and the iPOJO input, the iPOJO input need to be the same as the BND file but with the ".jar" extension. For instance, the BND file is foo.bnd, so the input jar must be foo.jar.
 To be sure that the BND bundle is already created, you can add the "*depends*" clause in the target using the iPOJO task to the target creating the bundle.
 
 However, it is possible to create only one target doing the two operations as:
-{div:class=pom}
-<target name="main">
-&nbsp;&nbsp;&nbsp;&nbsp;{color:red}<!-- Change to use the latest BND version -->{color}
-&nbsp;&nbsp;&nbsp;&nbsp;<taskdef
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;resource="aQute/bnd/ant/taskdef.properties"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}classpath="bnd-0.0.178.jar"/>{color}
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}<!-- Change the path to point on the iPOJO Ant task jar -->{color}
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<taskdef name="ipojo"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;classname="org.apache.felix.ipojo.task.IPojoTask"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{color:red}classpath="org.apache.felix.ipojo.ant-1.6.0.jar"{color}/>
-
-&nbsp;&nbsp;&nbsp;&nbsp;<bnd
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;classpath="src"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eclipse="true"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;failok="false"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;exceptions="true"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;files="{color:red}foo.bnd{color}"/>
-
-&nbsp;&nbsp;&nbsp;&nbsp;<ipojo
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;input="{color:red}foo.jar{color}"
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;metadata = "meta.xml"/>
-</target>
-{div}
+
+	:::xml
+	<target name="main">
+        <!-- Change to use the latest BND version -->
+        <taskdef
+            resource="aQute/bnd/ant/taskdef.properties"
+            classpath="bnd-0.0.178.jar"/>
+
+        <!-- Change the path to point on the iPOJO Ant task jar -->
+        <taskdef name="ipojo"
+            classname="org.apache.felix.ipojo.task.IPojoTask"
+            classpath="org.apache.felix.ipojo.ant-1.8.6.jar"/>
+
+        <bnd
+                classpath="src"
+                eclipse="true"
+                failok="false"
+                exceptions="true"
+                files="foo.bnd"/>
+
+        <ipojo
+            input="foo.jar"
+            metadata = "meta.xml"/>
+	</target>
+
 
 ## Directory manipulation
 
 The manipulator can take a directory in input. In this case, classes from this folder is manipulated. You can also set the manifest file location too. Here in an example of configuration using this mode:
 
+	:::xml	
     <target name="manipulate">		
-         <ipojo
-    	dir="${output..}" <!-- Manipulated directory -->
-    	metadata="metadata.xml"
-    	manifest="META-INF/MANIFEST.MF"  <!-- Manifest location -->
+    	<!-- Set the manipulated directory and manifest location --> 
+        <ipojo
+    	  dir="${output..}"
+    	  metadata="metadata.xml"
+    	  manifest="META-INF/MANIFEST.MF"
         />
     </target>
 
 
-<div class="info" markdown="1">
-**Manifest location**
-If not set, the manifest is searched in the given `directory/META-INF` folder (*i.e.* `$dir/META-INF/MANIFEST.MF`).
+<div class="alert alert-info" markdown="1">
+<h4>Manifest location</h4>
+If not set, the manifest is searched in the given <code>directory/META-INF</code> folder (<em>i.e.</em> <code>$dir/META-INF/MANIFEST.MF</code>).
 </div>
 
-## Conclusion
-
-Subscribe to the Felix users mailing list by sending a message to [mailto:users-subscribe@felix.apache.org]({{ refs.mailto-users-subscribe-felix-apache-org.path }}); after subscribing, email questions or feedback to [mailto:users@felix.apache.org].
   
   
   

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.mdtext?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.mdtext Fri Apr  5 08:54:50 2013
@@ -269,50 +269,187 @@ Finally, the `org.osgi.service.log` is i
 
 The following table highlights some of the features of each system, it does not attempt to highlight every feature of each.
 
-| Dependency injection &nbsp; | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| Callback injection | Yes | Yes (public method only) | Yes |
-| Constructor injection | No | Yes | Yes |
-| Field injection | No | No | Yes |
-| Setter injection | Yes | Yes | Yes |
-| Proxy injection | No | Yes | Yes |
-| List injection | No | Yes | Yes |
-| Nullable injection | No | No | Yes |
-
-
-| Lifecycle | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| Callbacks (activate/deactivate) | Yes | Yes | Yes |
-| Factory pattern | Yes | Yes | Yes |
-| Lazy initialization | Yes | Yes | Yes |
-| Damping | No | Yes | Yes |
-| Field synchronization | No | No | Yes |
-| Component lifecycle control | Yes | Partial | Yes |
-| Service lifecycle control | No | No | Yes |
-
-
-| Configuration | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| Property configuration | No | Yes | Yes |
-| Field configuration | No | No | Yes |
-| Configuration Admin | Yes | No | Yes |
-
-
-| Services | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| Custom attribute type | No | Yes | Yes |
-| Lazy initialization | Yes | Yes | Yes |
-| Composite services | No | No | Yes |
-
-
-| Component description | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| XML | Yes | Yes | Yes |
-| Java annotations | No | No | Yes |
-| API | No | No | Yes |
-
-
-| Nonfunctional | Declarative Services | Blueprint | iPOJO |
-|--|--|--|--|
-| Multiple providers | Yes | Yes | No |
-  
\ No newline at end of file
+<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>
+<br/>
+
+<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>
+<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>
\ No newline at end of file

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.mdtext?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-ipojo/ipojo-support.mdtext Fri Apr  5 08:54:50 2013
@@ -1,16 +1,9 @@
 translation_pending: true
 Title: ipojo-support
 
-
-# Support
-
-*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.*
-
-## Community Support
-
 ### Mailing List
 
-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:
+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:
 * The users mailing list
 * The developer mailing list
 
@@ -20,13 +13,13 @@ Either, if you want to be involved, subs
 
 ### Bug Tracker
 
-If you want a features, an improvement or report a bug, feel free to open an issue on the Apache Felix bug tracker:
+If you want a features, an improvement or report a bug, open an issue on the Apache Felix bug tracker:
 
 * Go to the [https://issues.apache.org/jira/browse/FELIX](https://issues.apache.org/jira/browse/FELIX) page
 * Create an account or log in.
 * Open the 'Create a new issue in project Felix' form.
 * Then, select the Felix project and the issue type (improvement, bug, wish, new feature...)
-* At the second step, select the *iPOJO* component and fill out the form (please select the affected version only)
+* At the second step, select the **iPOJO** component and fill out the form (please select the affected version only)
 * Finally click on the create button
 
 You can also watch the issue to monitor progress. The iPOJO team tries to give you quick and frequent feedback on issues.

Added: felix/site/trunk/content/ipojo/cube.png
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/ipojo/cube.png?rev=1464894&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/site/trunk/content/ipojo/cube.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: felix/site/trunk/content/ipojo/cubes.png
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/ipojo/cubes.png?rev=1464894&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/site/trunk/content/ipojo/cubes.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: felix/site/trunk/content/ipojo/ipojo-logo-150.png
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/ipojo/ipojo-logo-150.png?rev=1464894&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/site/trunk/content/ipojo/ipojo-logo-150.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: felix/site/trunk/templates/ipojo.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/templates/ipojo.html?rev=1464894&r1=1464893&r2=1464894&view=diff
==============================================================================
--- felix/site/trunk/templates/ipojo.html (original)
+++ felix/site/trunk/templates/ipojo.html Fri Apr  5 08:54:50 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="{{ refs.felix-how-to-use-ipojo-factories.path }}">Factories and Instances</a></li>
                                         <li><a href="{{ refs.using-xml-schemas.path }}">XML Schemas</a></li>
-                                        <li><a href="{{ refs.apache-felix-ipojo-api.path }}">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="{{ refs.apache-felix-ipojo-testing-components.path }}">Testing components</a></li>
                                         <li><a href="{{ refs.apache-felix-ipojo-eclipse-integration.path }}">Eclipse Integration</a></li>
-                                        <li><a href="{{ refs.ipojo-faq.path }}">FAQ</a></li>
+                                        <li><a href="/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.html">FAQ</a></li>
                                         <li><a href="{{ refs.ipojo-reference-card.path }}">Reference Card</a></li>
                                         <li class="divider"></li>
                                         <li><a href="{{ refs.how-to-write-your-own-handler.path }}">Handler development</a></li>
-                                        <li><a href="{{ refs.how-to-use-ipojo-manipulation-metadata.path }}">Manipulation Metadata </a></li>
-                                        <li><a href="{{ refs.dive-into-the-ipojo-manipulation-depths.path }}">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="{{ refs.ipojo-ant-task.path }}">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="{{ refs.ipojo-eclipse-plug-in.path }}">Eclipse Plugin</a></li>
                                 <li><a href="{{ refs.ipojo-maven-plug-in.path }}">Maven Plugin</a></li>
                                 <li><a href="{{ refs.felix-ipojo-arch-command.path }}">`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="{{ refs.ipojo-support.path }}">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>