Last update of Centipede.

Fixed dist build, now it checks only functional tests before creating dist.
Changed path of cents' properties in properties.xml.
Centipede developement will now be decoupled from Poi, and continue on
krysalis.org.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352415 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -118,13 +118,13 @@ printed.
         
      all -------------- creates the jars and the site      
      compile ---------- compiles the source code      
+     test ------------- performs the jUnit tests       
      jar -------------- create the jar files
      docs ------------- generates the html docs - clean not needed        
-     site ------------- generates the html site (docs+reports)    
      javadocs --------- generates the API documentation   
-     test ------------- performs the jUnit tests       
+     site ------------- generates the html site (docs+reports)    
      clean ------------ cleans the build directory    
-     quickdist -------- creates src and bin distributions    
+     dist ------------- creates src and bin distributions    
      scratchpad ------- build-run scratchpad code       
      contrib ---------- build-run contributed code    
      generate-records - generate excel records    
@@ -253,12 +253,12 @@ printed.
     
   </target>     
 
-  <!-- ================================== -->
+  <!-- ====================================== -->
-  <!--         Build distributions        -->
+  <!--  dist target wo single build checks    -->
-  <!-- ================================== -->
+  <!-- ====================================== -->
 
-  <target  name="dist" depends="-init"
+  <target  name="dist"   depends="-init, clean, test, jar, site"
-           description="Make distributions">
+           description="Build distribution packages wo single build checks">
 
     <echo>**********************************************</echo>
     <echo>*</echo>
@@ -274,23 +274,6 @@ printed.
     <echo>***********************************************</echo>
     <echo/>
     
-    <antcall target="gump"/>
-    
-    <antcall target="quickdist"/>
-    
-  </target>     
-
-  <!-- ====================================== -->
-  <!--  dist target wo single build checks    -->
-  <!-- ====================================== -->
-
-  <target  name="quickdist"   depends="-init"
-           description="Build distribution packages wo single build checks">
-
-    <antcall target="call-cent">
-      <param name="cent-name"   value="junit"/> 
-      <param name="cent-target" value="test"/> 
-    </antcall>
 
     <antcall target="call-cent">
       <param name="cent-name"   value="centipede"/> 
@@ -299,6 +282,7 @@ printed.
     
   </target>    
   
+    
   <!-- ================================== -->
   <!--         Clean build dir            -->
   <!-- ================================== -->
@@ -317,13 +301,9 @@ printed.
   <!--         Run Junit tests            -->
   <!-- ================================== -->
   
-  <target  name="test"   depends="-init"
+  <target  name="test"   depends="-init, compile"
            description="Compile java source code">
 
-    <antcall target="call-cent">
-      <param name="cent-name"   value="centipede"/> 
-      <param name="cent-target" value="compile"/> 
-    </antcall>
  
     <antcall target="call-cent">
       <param name="cent-name"   value="junit"/> 
@@ -341,14 +321,9 @@ printed.
   <!--      Generate project metrics      -->
   <!-- ================================== -->
   
-  <target  name="metrics"   depends="-init"
+  <target  name="metrics"   depends="-init, compile"
            description="Generate project metrics">
 
-    <antcall target="call-cent">
-      <param name="cent-name"   value="centipede"/> 
-      <param name="cent-target" value="compile"/> 
-    </antcall>
-    
     <antcall target="call-cent">
       <param name="cent-name"   value="jdepend"/>
       <param name="cent-target" value="jdepend-html"/> 
@@ -376,15 +351,12 @@ printed.
   <!-- ================================== -->
   
   <target  name="site"
-           description="Makes all the site doco">
+           description="Makes all the site doco"
+           depends="docs, 
+                    test,
+                    javadocs,  
+                    metrics"/>
 
-      <antcall target="docs"/>
-      <antcall target="compile"/>
-      <antcall target="javadocs"/>
-      <antcall target="test"/>
-      <antcall target="metrics"/>
-             
-  </target>     
   
   <!-- ================================== -->
   <!--       Generates the javadocs       -->
@@ -498,6 +470,18 @@ printed.
 
   </target>
 
+  <!-- ================================== -->
+  <!--         Test 4 distribution        -->
+  <!-- ================================== -->
+
+  <target  name="testall" depends="-init"
+           description="Make big full test">
+           
+    <antcall target="gump"/>
+    <antcall target="quickdist"/>
+    
+  </target>       
+                      
   <!-- ================================== -->
   <!--        Target used by Gump         -->
   <!-- ================================== -->
@@ -506,11 +490,8 @@ printed.
            depends="testmodule"
            description="Target used by Gump">
            
-      <antcall target="clean"/>
       <antcall target="testtargets"/>
-      <antcall target="clean"/>
       <antcall target="testmodule"/>
-      <antcall target="clean"/>
       <antcall target="all"/>
       
   </target>

properties.xml

@@ -1,20 +1,24 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="tools/antipede/resources/stylesheets/properties.xsl"?>
-<!-- Project properties -->     
+<!-- Build properties - these override any property specified in the build -->
 <properties>
+
 <!-- Properties for core Ant tasks-->
    <ant>
       <XmlLogger>
-      <stylesheet uri="./tools/antipede/resources/stylesheets/log.xsl"/> 
+         <stylesheet
+          uri="./tools/antipede/resources/stylesheets/log.xsl" />
       </XmlLogger>
    </ant>
 
-  <XmlLogger file="log.xml"/>
+   <XmlLogger
+    file="log.xml" />
 
    <!-- Properties of the build -->
    <build>
       <!-- What to tell the compiler -->
-    <compiler emacs="on"
+      <compiler
+       emacs="on"
        warnings="true"
        pedantic="false"
        depend="true"
@@ -25,9 +29,12 @@
        nowarn="off"
        type="classic"
        vm="1.2" />
-              
    </build>
-  <forrest>
+
+   <centipede>
+      <tools>
+         <cents>
+            <forrest-cent>
               <!-- available skins:
 
                    basic
@@ -37,19 +44,32 @@
                    xml-apache-site
                    forrest-site  (Work In Progress)
                -->
-    <skin name="avalon-site">
+               <skin
+                name="avalon-site">
                   <navlinks>
-      <link1 href="http://www.apache.org/">apache.org</link1>
+                     <link1
-      <link2 href="http://jakarta.apache.org/">jakarta.apache.org</link2>
+                      href="http://www.apache.org/">apache.org</link1>
-      <link3 href="http://jakarta.apache.org/poi/">jakarta.apache.org/poi</link3>
+
+                     <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"/>
+                     <group
-      <project src="images/project-logo.gif" href="http://jakarta.apache.org/poi/"/>
+                      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-cent>
-  </forrest>    
+         </cents>
-  
+      </tools>
+   </centipede>
 </properties>
+