diff --git a/build.xml b/build.xml
index 7feeb26..ecb4835 100644
--- a/build.xml
+++ b/build.xml
@@ -1,205 +1,186 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<project name="maven" default="maven:jar" basedir=".">
-
-  <!-- Give user a chance to override without editing this file
-       (and without typing -D each time they invoke a target) -->
-
-  <!-- Allow any user specific values to override the defaults -->
-  <property file="${user.home}/build.properties" />
-  <!-- Allow user defaults for this project -->
-  <property file="build.properties" />
-  <!-- Set default values for the build -->
-  <property file="project.properties" />
-
-
-  <!-- maven:start -->
+<project default="jar" name="commons-graph" basedir=".">
   
-  <!-- ================================================================== -->
-  <!-- D E L E G A T O R S                                                -->
-  <!-- ================================================================== -->
+  <property name="defaulttargetdir" value="target"></property> 
+  <property name="classesdir" value="target/classes"></property>
+  <property name="testclassesdir" value="target/test-classes"></property>
+  <property name="testreportdir" value="target/test-reports"></property>
+  
+  
+  
+  
+  	
+		
+		  
+		
+  
+  
+  <property name="resourcedir" value="."></property>
+  
+  <property name="distdir" value="dist"></property>
+  <property name="javadocdir" value="target/docs/apidocs"></property>
+  <property name="final.name" value="commons-graph-0.8.1"></property>
+  
+  <target name="init" description="o Initializes some properties">
+    <mkdir dir="lib"></mkdir>
+    <condition property="noget">
+      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+    </condition>
+  </target>
+
+  <target name="compile" description="o Compile the code" depends="get-deps">
+    
+    <mkdir dir="${classesdir}"></mkdir>
+
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="src/java"></pathelement>
+      </src>
+      <classpath>
+        <fileset dir="lib">
+          <include name="*.jar"></include>
+        </fileset>
+      </classpath>
+    </javac>
+    
+    
+
+    
+		
+
+  </target>
+    
+  <target name="jar" description="o Create the jar" depends="compile,test">
+
+    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
+
+  </target>
+  
+  <target name="clean" description="o Clean up the generated directories">
+    <delete dir="${defaulttargetdir}"></delete>
+    <delete dir="${distdir}"></delete>
+  </target>
+
+  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+    <mkdir dir="dist"></mkdir>
+    <copy todir="dist">
+      <fileset dir="${defaulttargetdir}"></fileset>
+    </copy>
+  </target>
+ 
+  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+    <fail message="There were test failures."></fail>
+  </target>
+  <target name="internal-test" depends="compile-tests">
+    
+      <mkdir dir="${testreportdir}"></mkdir>
+      <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
         
-
-    <target name="maven:site">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
-    </target>
-
-
-    <target name="maven:dist">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
-    </target>
-
-
-    <target name="maven:env">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
-    </target>
-
-
-    <target name="maven:test">
-      <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
-    </target>
-
-
-    <target name="maven:announce">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
-    </target>
-
-
-    <target name="maven:activity-log">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
-    </target>
-
-
-    <target name="maven:compile">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
-    </target>
-
-
-    <target name="maven:validate-war">
-      <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
-    </target>
-
-
-    <target name="maven:pdf">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
-    </target>
-
-
-    <target name="maven:iutest">
-      <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
-    </target>
-
-
-    <target name="maven:deploy-site">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
-    </target>
-
-
-    <target name="maven:deploy-dist">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
-    </target>
-
-
-    <target name="maven:war">
-      <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
-    </target>
-
-
-    <target name="maven:verify-project">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
-    </target>
-
-
-    <target name="maven:cvs-change-log">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
-    </target>
-
-
-    <target name="maven:ear">
-      <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
-    </target>
-
-
-    <target name="maven:cross-ref">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
-    </target>
-
-
-    <target name="maven:update-jars">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
-    </target>
-
-
-    <target name="maven:validate-pom">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
-    </target>
-
-
-    <target name="maven:install-jar">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
-    </target>
-
-
-    <target name="maven:fo">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
-    </target>
-
-
-    <target name="maven:javadocs">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
-    </target>
-
-
-    <target name="maven:validate-struts-war">
-      <ant antfile="${maven.home}/plugins/struts/build.xml" target="validate-struts-war"/>
-    </target>
-
-
-    <target name="maven:task-list">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
-    </target>
-
-
-    <target name="maven:ejb">
-      <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ejb"/>
-    </target>
-
-
-    <target name="maven:docs">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
-    </target>
-
-
-    <target name="maven:clean">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
-    </target>
-
-
-    <target name="maven:dist-build">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
-    </target>
-
-
-    <target name="maven:metrics">
-      <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
-    </target>
-
-
-    <target name="maven:docs-quick">
-      <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
-    </target>
-
-
-    <target name="maven:run-singletest">
-      <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
-    </target>
-
-
-    <target name="maven:check-source">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
-    </target>
-
-
-    <target name="maven:generate-reactor">
-      <ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
-    </target>
-
-
-    <target name="maven:jar">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
-    </target>
-
-
-    <target name="maven:maven-update">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
-    </target>
-
-
-    <target name="maven:gump-descriptor">
-      <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
-    </target>
-
-
-  <!-- maven:end -->
+        <sysproperty key="basedir" value="."></sysproperty>
+        <formatter type="xml"></formatter>
+        <formatter usefile="true" type="plain"></formatter>
+        <classpath>
+          <fileset dir="lib">
+            <include name="*.jar"></include>
+          </fileset>
+          <pathelement path="${testclassesdir}"></pathelement>
+          <pathelement path="${classesdir}"></pathelement>
+        </classpath>
+        <batchtest todir="${testreportdir}">
+          <fileset dir="src/test">
+            
+              <include name="**/*Test.java"></include>
+            
+            
+            
+            
+            
+          </fileset>
+        </batchtest>
+      </junit>
+    
+  </target>
+
+  <target name="compile-tests" depends="compile">
+    
+      <mkdir dir="${testclassesdir}"></mkdir>
+      <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+        <src>
+          <pathelement location="src/test"></pathelement>
+        </src>
+        <classpath>
+          <fileset dir="lib">
+            <include name="*.jar"></include>
+          </fileset>
+          <pathelement path="${classesdir}"></pathelement>
+        </classpath>
+      </javac>
+
+      
+   
+      
+    
+  </target>
+
+  <target name="javadoc" description="o Generate javadoc" depends="jar">
+ 
+ 
+    <mkdir dir="${javadocdir}"></mkdir>
+ 
+    
+    <tstamp>
+      <format pattern="2001-yyyy" property="year"></format>
+    </tstamp>
+ 
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
+ 
+    <property name="title" value="Graph 0.8.1 API"></property>
+ 
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.graph.*">
+      <classpath>
+        <fileset dir="lib">
+          <include name="*.jar"></include>
+        </fileset>
+        <pathelement location="target/${final.name}.jar"></pathelement>
+      </classpath>
+    </javadoc>
+ 
+  </target>
+
+  <target name="get-deps" unless="noget" depends="init">
+  
+    
+    <get dest="lib/log4j-1.1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.1.3.jar"></get>
+    <get dest="lib/jdepend-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.2.jar"></get>
+    <get dest="lib/nsuml-0.4.20.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/nsuml/jars/nsuml-0.4.20.jar"></get>
+    <get dest="lib/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar"></get>
+    <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
+    <get dest="lib/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar"></get>
+    
+    <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
+    <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
+    <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get>
+  </target>
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  <target name="install-maven">
+
+    
+
+    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
+    
+    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
+    
+  </target>
 
 </project>
+    
\ No newline at end of file