diff --git a/build.bat b/build.bat
index 52804d6c4..a72c4d605 100755
--- a/build.bat
+++ b/build.bat
@@ -6,7 +6,7 @@ set ANT_HOME=tools\antipede
 set OLD_CLASSPATH=%CLASSPATH%
 for %%i in (.\lib\endorsed\*.jar) do call appendcp.bat %%i
 
-call %ANT_HOME%\bin\ant -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %ANT_HOME%\bin\ant -emacs -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set ANT_HOME=%OLD_ANT_HOME%
 set CLASSPATH=%OLD_CLASSPATH%
\ No newline at end of file
diff --git a/build.sh b/build.sh
index ed186b944..471deed32 100755
--- a/build.sh
+++ b/build.sh
@@ -29,7 +29,7 @@ unset CLASSPATH
 CLASSPATH="`echo ./lib/endorsed/*.jar | tr ' ' $S`"
 export CLASSPATH
 
-$PWD/./tools/antipede/bin/ant -listener org.apache.tools.ant.XmlLogger $@ 
+$PWD/./tools/antipede/bin/ant -emacs -listener org.apache.tools.ant.XmlLogger $@ 
 
 unset CLASSPATH
 
diff --git a/build.xml b/build.xml
index 4e45d32f7..68b9d2c86 100644
--- a/build.xml
+++ b/build.xml
@@ -336,6 +336,21 @@ printed.
     
   </target>     
 
+  <!-- ================================== -->
+  <!--       Generates the XML javadocs   -->
+  <!-- ================================== -->
+  
+  <target  name="xjavadocs"   depends="-init"
+           description="Compile java source code">
+
+    <antcall target="call-cent">
+      <param name="cent-name"   value="centipede"/> 
+      <param name="cent-target" value="xjavadocs"/> 
+    </antcall>
+    
+  </target>     
+
+
   <!-- ================================== -->
   <!--       Generate UML -WIP-           -->
   <!-- ================================== -->
@@ -345,11 +360,17 @@ printed.
     
     <javadoc packagenames="${xgump.module.project.package}.*"
              sourcepath="${xlayout.build.java.dir}"
-             destdir="${xlayout.build.documentation.javadocs.dir}"
+             destdir="${xlayout.build.documentation.metrics.dir}"
              failonerror="true">
- 
+<!-- 
      <classpath>
-       <path>
+       <path> 
+       <fileset dir="."> 
+        <patternset>
+         <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.jar"/>
+         <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.zip"/>
+        </patternset>
+       </fileset>         
           <fileset dir="${xlayout.library.dir}" casesensitive="yes"> 
            <patternset>
              <include name="*/*.jar"/>
@@ -358,12 +379,27 @@ printed.
          </fileset>  
        </path> 
      </classpath>
-     
-      <doclet name="JP.co.esm.caddies.doclets.UMLDoclet"
-             path="./tools/antipede/lib/UMLDoclet.jar">
-        <param name="-d" value="docs/metrics"/>
+     <bootclasspath>
+       <path> 
+       <fileset dir="." casesensitive="yes"> 
+        <patternset>
+         <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.jar"/>
+         <include name="${cents.dir}/uml.${cent.dir.suffix}/*/*.zip"/>
+        </patternset>
+       </fileset>         
+          <fileset dir="${xlayout.library.dir}" casesensitive="yes"> 
+           <patternset>
+             <include name="*/*.jar"/>
+             <include name="*/*.zip"/>
+           </patternset>
+         </fileset>  
+       </path> 
+     </bootclasspath>    
+-->
+    
+      <doclet name="JP.co.esm.caddies.doclets.UMLDoclet">
      </doclet>
-     
+
     </javadoc>
 
   </target>     
diff --git a/layout.xml b/layout.xml
index 358df4ef5..6d6689b94 100644
--- a/layout.xml
+++ b/layout.xml
@@ -38,12 +38,12 @@
    <java dir="./build/java"/>
    <classes dir="./build/classes"/>
    <test dir="./build/testcases"/>
+   <work dir="./build/work"/>
    <documentation dir="./build/documentation">
      <javadocs dir="./build/docs/javadocs"/>
      <test dir="./build/docs/test"/>
      <metrics dir="./build/docs/metrics"/>
    </documentation>
-   <work dir="./build/work"/>   
    <scratchpad dir="./build/scratchpad">
      <java dir="./build/scratchpad/java"/>
      <classes dir="./build/scratchpad/classes"/>          
diff --git a/module.xml b/module.xml
index d4a097397..93f2081c0 100644
--- a/module.xml
+++ b/module.xml
@@ -42,6 +42,8 @@
     Why not?
   </why>
   
+  <vendor>Apache Software Foundation</vendor>
+
   <licence>This software is released under the Apache Public License 1.1. 
            For detailed legal and licensing issues, please read the LICENSE.* files
            in the /legal directory.
diff --git a/properties.xml b/properties.xml
index 402169420..e8d1eb025 100644
--- a/properties.xml
+++ b/properties.xml
@@ -32,8 +32,20 @@
          jakarta-site
          scarab-site
          xml-apache-site
-         cocoon-printer  -->       
-    <skin name="jakarta-site"/>
+         basic -->       
+    <skin name="jakarta-site">
+     <navlinks>
+      <link1 href="http://www.apache.org/">apache.org</link1>
+      <link2 href="http://jakarta.apache.org/">jakarta.apache.org</link2>
+      <link3 href="http://jakarta.apache.org/poi/">jakarta.apache.org/poi</link3>
+     </navlinks>
+     <logo>
+      <group src="images/group-logo.gif" href="http://jakarta.apache.org"/>
+      <project src="images/project-logo.gif" href="http://jakarta.apache.org/poi/"/>
+     </logo>
+    
+    </skin>
+    
   </forrest>    
   
 </properties>
\ No newline at end of file
diff --git a/tools/antipede/build.xtarget b/tools/antipede/build.xtarget
index 077f4e832..be9f7f338 100644
--- a/tools/antipede/build.xtarget
+++ b/tools/antipede/build.xtarget
@@ -87,7 +87,31 @@
   <!--  Used only by the -init target   -->
   <!-- =================================--> 
   <target  name="-cent-unjar">
-    <unjar src="${current.cent.jar}" dest="${cents.dir}"/> 
+      
+    <basename property="current.cent.jar.name" file="${current.cent.jar}" suffix=".jar"/>
+    
+    <condition property="cent-unjar.not.required">
+      <and>
+        <uptodate targetfile="${current.cent.jar}">
+          <srcfiles dir= "." includes="${cents.dir}/*.${cent.dir.suffix}/${task.properties.name}"/>      
+        </uptodate>
+        <available type="dir" file="${cents.dir}/${current.cent.jar.name}"/>
+      </and>
+    </condition>
+ 
+   <antipede-if>
+     <equals arg1="cent-unjar.not.required" arg2="true" />
+     <then>
+      <echo message="${current.cent.jar} is uptodate with respect to ${current.cent.jar.name}." />
+      <echo message="No need to expand it." />
+     </then>
+    <else>
+      <echo message="Expanding ${current.cent.jar}..." />
+      <unjar src="${current.cent.jar}" dest="${cents.dir}"/> 
+      <echo message="... ${current.cent.jar} expanded in ${current.cent.jar.name}." />    
+    </else>     
+   </antipede-if>    
+
   </target>       
         
   <!-- ============================================= -->
diff --git a/tools/cents/centipede-20020406.cent.jar b/tools/cents/centipede-20020408.cent.jar
similarity index 88%
rename from tools/cents/centipede-20020406.cent.jar
rename to tools/cents/centipede-20020408.cent.jar
index 05d868a7d..a6e3f06ac 100644
Binary files a/tools/cents/centipede-20020406.cent.jar and b/tools/cents/centipede-20020408.cent.jar differ
diff --git a/tools/cents/forrest-20020405.cent.jar b/tools/cents/forrest-20020405.cent.jar
deleted file mode 100644
index 5daa29ffc..000000000
Binary files a/tools/cents/forrest-20020405.cent.jar and /dev/null differ
diff --git a/tools/cents/jdepend-20020406.cent.jar b/tools/cents/jdepend-20020408.cent.jar
similarity index 96%
rename from tools/cents/jdepend-20020406.cent.jar
rename to tools/cents/jdepend-20020408.cent.jar
index 65d94825f..fb5a51758 100644
Binary files a/tools/cents/jdepend-20020406.cent.jar and b/tools/cents/jdepend-20020408.cent.jar differ
diff --git a/tools/cents/junit-20020406.cent.jar b/tools/cents/junit-20020408.cent.jar
similarity index 99%
rename from tools/cents/junit-20020406.cent.jar
rename to tools/cents/junit-20020408.cent.jar
index c8e0e211f..070066ac0 100644
Binary files a/tools/cents/junit-20020406.cent.jar and b/tools/cents/junit-20020408.cent.jar differ