FELIX-4077

Update documentation urls.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1486737 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/arch-gogo/pom.xml b/ipojo/arch-gogo/pom.xml
index 82cbb4e..1ef0e14 100644
--- a/ipojo/arch-gogo/pom.xml
+++ b/ipojo/arch-gogo/pom.xml
@@ -33,7 +33,9 @@
         Arch command to collect and print information about iPOJO instances.
         This command is made for Gogo.
     </description>
-    <url>http://felix.apache.org/site/ipojo-arch-command.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-arch-command.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -86,7 +88,7 @@
                             iPOJO Arch command for Gogo
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/ipojo-arch-command.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-arch-command.html
                         </Bundle-DocURL>
                         <Private-Package>org.apache.felix.ipojo.arch.gogo</Private-Package>
                         <Import-Package>
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index 9706fe0..49eef09 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -31,7 +31,9 @@
     <version>1.7.0-SNAPSHOT</version>
 
     <description>Arch command to collect and print information about iPOJO instances.</description>
-    <url>http://felix.apache.org/site/ipojo-arch-command.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-arch-command.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -60,7 +62,7 @@
                         <Bundle-Description>iPOJO Arch command for Felix
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/ipojo-arch-command.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-arch-command.html
                         </Bundle-DocURL>
                         <Private-Package>org.apache.felix.ipojo.arch</Private-Package>
                     </instructions>
diff --git a/ipojo/handler/eventadmin/eventadmin-handler/pom.xml b/ipojo/handler/eventadmin/eventadmin-handler/pom.xml
index 01d5a3c..c7ff106 100644
--- a/ipojo/handler/eventadmin/eventadmin-handler/pom.xml
+++ b/ipojo/handler/eventadmin/eventadmin-handler/pom.xml
@@ -33,7 +33,9 @@
     <description>
         iPOJO extension to easily interact with the OSGi Event Admin.
     </description>
-    <url>http://felix.apache.org/site/event-admin-handlers.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/event-admin-handlers.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -67,7 +69,7 @@
                         <Bundle-Description>iPOJO Event Admin Handlers
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/event-admin-handlers.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/event-admin-handlers.html
                         </Bundle-DocURL>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                     </instructions>
diff --git a/ipojo/handler/extender/pom.xml b/ipojo/handler/extender/pom.xml
index fd8d018..cb8dc5e 100644
--- a/ipojo/handler/extender/pom.xml
+++ b/ipojo/handler/extender/pom.xml
@@ -33,7 +33,9 @@
     <description>
         iPOJO extension to implement an extender pattern (host).
     </description>
-    <url>http://felix.apache.org/site/extender-pattern-handler.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/extender-pattern-handler.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -54,7 +56,7 @@
                         <Bundle-Description>iPOJO Extender Pattern Handler
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/extender-pattern-handler.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/extender-pattern-handler.html
                         </Bundle-DocURL>
                         <Private-Package>org.apache.felix.ipojo.handler.extender
                         </Private-Package>
diff --git a/ipojo/handler/jmx/jmx-handler/pom.xml b/ipojo/handler/jmx/jmx-handler/pom.xml
index 43ea74f..37636b7 100644
--- a/ipojo/handler/jmx/jmx-handler/pom.xml
+++ b/ipojo/handler/jmx/jmx-handler/pom.xml
@@ -32,7 +32,9 @@
     <description>
         iPOJO extension to expose instances as MBean inside a MBean Server.
     </description>
-    <url>http://felix.apache.org/site/ipojo-jmx-handler.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/ipojo-jmx-handler.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -61,7 +63,7 @@
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Description>iPOJO JMX Handler</Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/ipojo-jmx-handler.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/ipojo-jmx-handler.html
                         </Bundle-DocURL>
                     </instructions>
                 </configuration>
diff --git a/ipojo/handler/temporal/temporal-dependency-handler/pom.xml b/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
index 21dee30..f3d8a59 100644
--- a/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
+++ b/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
@@ -33,7 +33,9 @@
     <description>
         iPOJO extension to inject temporal service dependencies.
     </description>
-    <url>http://felix.apache.org/site/temporal-service-dependency.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -81,7 +83,7 @@
                         <Bundle-Description>iPOJO Temporal Dependency Handler
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/temporal-service-dependency.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.html
                         </Bundle-DocURL>
                     </instructions>
                 </configuration>
diff --git a/ipojo/handler/whiteboard/whiteboard-handler/pom.xml b/ipojo/handler/whiteboard/whiteboard-handler/pom.xml
index 986d738..e6bf2ed 100644
--- a/ipojo/handler/whiteboard/whiteboard-handler/pom.xml
+++ b/ipojo/handler/whiteboard/whiteboard-handler/pom.xml
@@ -34,7 +34,7 @@
         iPOJO extension to easily implement a white-board pattern (host).
     </description>
     <url>
-        http://felix.apache.org/site/white-board-pattern-handler.html
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.html
     </url>
 
     <dependencies>
@@ -58,7 +58,7 @@
                         <Bundle-Description>iPOJO White-Board Pattern Handler
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/white-board-pattern-handler.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.html
                         </Bundle-DocURL>
                         <Private-Package>org.apache.felix.ipojo.handler.wbp
                         </Private-Package>
diff --git a/ipojo/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index 6212583..bdcf267 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -83,7 +83,9 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Description>iPOJO Ant Task</Bundle-Description>
-                        <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
+                        <Bundle-DocURL>
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.html
+                        </Bundle-DocURL>
                         <Private-Package>
                             org.apache.felix.ipojo.metadata,
                             org.apache.felix.ipojo.manipulator*,
diff --git a/ipojo/manipulator/maven-ipojo-plugin/pom.xml b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
index 0a99ce3..f9aa76d 100644
--- a/ipojo/manipulator/maven-ipojo-plugin/pom.xml
+++ b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
@@ -33,7 +33,7 @@
         Maven Plugin to package iPOJO-powered bundles.
     </description>
     <url>
-        http://felix.apache.org/site/ipojo-maven-plug-in.html
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-maven-plug-in.html
     </url>
 
     <dependencies>
diff --git a/ipojo/manipulator/online-manipulator/pom.xml b/ipojo/manipulator/online-manipulator/pom.xml
index 45d21f5..3b5e62e 100644
--- a/ipojo/manipulator/online-manipulator/pom.xml
+++ b/ipojo/manipulator/online-manipulator/pom.xml
@@ -32,7 +32,9 @@
     <description>
         iPOJO online manipulator allowing install time manipulation of iPOJO bundle.
     </description>
-    <url>http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/apache-felix-ipojo-online-manipulator.html
+    </url>
 
     <properties>
         <ipojo.import.packages>[1.8.0,2.0.0)</ipojo.import.packages>
@@ -107,7 +109,7 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.felix.ipojo.online.manipulator</Private-Package>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/apache-felix-ipojo-online-manipulator.html
                         </Bundle-DocURL>
                         <Export-Package>
                             org.apache.felix.ipojo.manipulation*; version="${ipojo.manipulator.version}",
diff --git a/ipojo/runtime/annotations/pom.xml b/ipojo/runtime/annotations/pom.xml
index 29a9657..c060b57 100644
--- a/ipojo/runtime/annotations/pom.xml
+++ b/ipojo/runtime/annotations/pom.xml
@@ -33,7 +33,7 @@
         iPOJO Annotation pack. contained annotations are used to define iPOJO component type.
     </description>
     <url>
-        http://felix.apache.org/site/how-to-use-ipojo-annotations.html
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html
     </url>
 
 
@@ -58,7 +58,9 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Description>iPOJO Annotations</Bundle-Description>
-                        <Bundle-DocURL>http://felix.apache.org/site/how-to-use-ipojo-annotations.html</Bundle-DocURL>
+                        <Bundle-DocURL>
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html
+                        </Bundle-DocURL>
                         <Export-Package>org.apache.felix.ipojo.annotations,
                             org.apache.felix.ipojo.handler.temporal,
                             org.apache.felix.ipojo.handlers.jmx,
diff --git a/ipojo/runtime/api/pom.xml b/ipojo/runtime/api/pom.xml
index 17ec5ec..e69efb8 100644
--- a/ipojo/runtime/api/pom.xml
+++ b/ipojo/runtime/api/pom.xml
@@ -32,7 +32,9 @@
     <description>
         iPOJO API used to define component types and instances using Java.
     </description>
-    <url>http://felix.apache.org/site/apache-felix-ipojo-api.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html
+    </url>
 
     <build>
         <plugins>
@@ -46,7 +48,7 @@
                         <Bundle-SymbolicName>${project.artifactId}
                         </Bundle-SymbolicName>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/apache-felix-ipojo-api.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.html
                         </Bundle-DocURL>
                         <Import-Package>
                             org.apache.felix.ipojo.composite;resolution:=optional,
diff --git a/ipojo/runtime/composite/pom.xml b/ipojo/runtime/composite/pom.xml
index 18a94ae..b28062d 100644
--- a/ipojo/runtime/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -36,7 +36,9 @@
     <description>
         iPOJO Composition Model. This is an iPOJO extension to execute service composition.
     </description>
-    <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
+    <url>
+        http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-composition-tutorial.html
+    </url>
 
     <dependencies>
         <dependency>
@@ -70,7 +72,7 @@
                         <Bundle-Description>iPOJO Composition Layer
                         </Bundle-Description>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/ipojo-composition-tutorial.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-composition-tutorial.html
                         </Bundle-DocURL>
                         <Import-Package>
                             org.apache.felix.ipojo,
diff --git a/ipojo/runtime/core/pom.xml b/ipojo/runtime/core/pom.xml
index 6b5c186..82058de 100644
--- a/ipojo/runtime/core/pom.xml
+++ b/ipojo/runtime/core/pom.xml
@@ -118,7 +118,7 @@
                         <Bundle-Description>iPOJO Core Framework</Bundle-Description>
                         <Bundle-Activator>org.apache.felix.ipojo.extender.internal.Extender</Bundle-Activator>
                         <Bundle-DocURL>
-                            http://felix.apache.org/site/apache-felix-ipojo.html
+                            http://felix.apache.org/documentation/subprojects/apache-felix-ipojo.html
                         </Bundle-DocURL>
                         <IPOJO-Extension>
                             component:org.apache.felix.ipojo.ComponentFactory,