diff --git a/build.xml b/build.xml
index 1da7bf525f..d2245ec945 100644
--- a/build.xml
+++ b/build.xml
@@ -271,6 +271,21 @@ printed.
     </antcall>
    
   </target>     
+
+  <!-- ================================== -->
+  <!--      Generate project metrics      -->
+  <!-- ================================== -->
+  
+  <target  name="metrics"   depends="-init"
+           description="Generate project metrics">
+
+    <antcall target="call-cent">
+      <param name="cent-name"   value="jdepend"/>
+      <param name="cent-target" value="jdepend-html"/> 
+    </antcall>
+ 
+ </target>     
+
   
   <!-- ================================== -->
   <!--    Generates the documentation     -->
@@ -300,6 +315,57 @@ printed.
     
   </target>     
 
+  <!-- ================================== -->
+  <!--       Generate UML                 -->
+  <!-- ================================== -->
+  
+  <target  name="uml"   depends="-init"
+           description="generate-uml">
+  <!--
+  <javadoc packagenames="org.apache.poi.*"
+           sourcepath="./src/java"
+           destdir="docs/metrics">
+
+     <doclet name="JP.co.esm.caddies.doclets.UMLDoclet"
+             path="./tools/antipede/lib/UMLDoclet.jar">
+        <param name="-d" value="docs/metrics"/>
+     </doclet>
+
+  </javadoc>
+    -->
+    
+        <javadoc packagenames="${xgump.module.project.package}.*"
+             sourcepath="${xlayout.build.java.dir}"
+             destdir="${xlayout.build.documentation.javadocs.dir}"
+             author="true"
+             version="true"
+             use="true"
+             failonerror="true"
+             noindex="true"
+             windowtitle="${package-name} ${package-version}  API"
+             doctitle="${package-name} ${package-version}  API"
+             bottom="Copyright &#169; ${YEAR} Apache ${package-name} project. All Rights Reserved."
+             stylesheetfile="${centipede.cent.dir}/resources/stylesheets/javadoc.css">
+ 
+     <classpath>
+       <path>
+          <fileset dir="${xlayout.library.dir}" casesensitive="yes"> 
+           <patternset>
+             <include name="*/*.jar"/>
+             <include name="*/*.zip"/>
+           </patternset>
+         </fileset>  
+       </path> 
+     </classpath>
+      <doclet name="JP.co.esm.caddies.doclets.UMLDoclet"
+             path="./tools/antipede/lib/UMLDoclet.jar">
+        <param name="-d" value="docs/metrics"/>
+     </doclet>
+     
+    </javadoc>
+
+  </target>     
+
   <!-- ================================== -->
   <!--       Generate records                -->
   <!-- ================================== -->
@@ -329,7 +395,7 @@ printed.
   <!-- ================================== -->
   
   <target  name="testmodule"   
-           depends="clean, compile, test, jar, docs, javadocs"
+           depends="clean, compile, test, jar, docs"
            description="Testing that all major targets work; useful before a commit"/>
            
            
@@ -338,7 +404,7 @@ printed.
   <!-- ================================== -->
   
   <target  name="gump"   
-           depends="clean, compile, test, jar, docs, javadocs"
+           depends="clean, compile, test, jar, docs, javadocs, metrics"
            description="Target used by Gump"/>
            
 
diff --git a/index.html b/index.html
index 26d3724c33..066c651cbb 100644
--- a/index.html
+++ b/index.html
@@ -418,6 +418,7 @@ menu.subMenus[2].addItem("site","window.open('http://jakarta.apache.org/poi/')")
 menu.subMenus[2].addItem("local","window.open('./build/docs/index.html')");
 menu.subMenus[2].addItem("local javadocs","window.open('./build/docs/javadocs/index.html')");
 menu.subMenus[2].addItem("test results","window.open('./build/docs/test/index.html')");
+menu.subMenus[2].addItem("code metrics","window.open('./build/docs/metrics/jdepend-report.html')");
 
 menu.subMenus[3].addItem("module.xml","window.open('module.xml')");
 menu.subMenus[3].addItem("layout.xml","window.open('layout.xml')");
diff --git a/tools/antipede/build.xtarget b/tools/antipede/build.xtarget
index e3b9c0492e..90504a3537 100644
--- a/tools/antipede/build.xtarget
+++ b/tools/antipede/build.xtarget
@@ -66,10 +66,10 @@
     
     <!-- define the tasks found in cents -->
     <taskdef file="${temp.dir}/${task.properties.name}">
-     <classpath>
-       <fileset dir="${tools.dir}" casesensitive="yes"> 
-         <include name="**/*.jar"/>
-       </fileset> 
+     <classpath>      
+      <fileset dir="tools">
+        <include name="**/*.jar"/>
+      </fileset>
      </classpath>
     </taskdef>
     
diff --git a/tools/antipede/lib/ant-optional-1.5-dev-20020402.jar b/tools/antipede/lib/ant-optional-1.5-dev-20020402.jar
index a6e934aff3..e71e99cfef 100644
Binary files a/tools/antipede/lib/ant-optional-1.5-dev-20020402.jar and b/tools/antipede/lib/ant-optional-1.5-dev-20020402.jar differ
diff --git a/tools/antipede/lib/jdepend.jar b/tools/antipede/lib/jdepend.jar
new file mode 100644
index 0000000000..6ab8a6f281
Binary files /dev/null and b/tools/antipede/lib/jdepend.jar differ
diff --git a/tools/cents/jdepend-20020406.cent.jar b/tools/cents/jdepend-20020406.cent.jar
new file mode 100644
index 0000000000..cd550acf11
Binary files /dev/null and b/tools/cents/jdepend-20020406.cent.jar differ