diff --git a/build.xml b/build.xml
index ecb4835..ca87984 100644
--- a/build.xml
+++ b/build.xml
@@ -1,186 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  build.xml generated by maven from project.xml version 0.8.1
+  on date February 18 2003, time 0945
+-->
+
 <project default="jar" name="commons-graph" basedir=".">
-  
-  <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>
-  
+  <property name="defaulttargetdir" value="target">
+  </property>
+  <property name="libdir" value="target/lib">
+  </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="distdir" value="dist">
+  </property>
+  <property name="javadocdir" value="dist/docs/api">
+  </property>
+  <property name="final.name" value="commons-graph-0.8.1">
+  </property>
   <target name="init" description="o Initializes some properties">
-    <mkdir dir="lib"></mkdir>
+    <mkdir dir="${libdir}">
+    </mkdir>
     <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+      <equals arg2="only" arg1="${build.sysclasspath}">
+      </equals>
     </condition>
   </target>
-
   <target name="compile" description="o Compile the code" depends="get-deps">
-    
-    <mkdir dir="${classesdir}"></mkdir>
-
+    <mkdir dir="${classesdir}">
+    </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="src/java"></pathelement>
+        <pathelement location="src/java">
+        </pathelement>
       </src>
       <classpath>
-        <fileset dir="lib">
-          <include name="*.jar"></include>
+        <fileset dir="${libdir}">
+          <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>
-
+    <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>
+    <delete dir="${defaulttargetdir}">
+    </delete>
+    <delete dir="${distdir}">
+    </delete>
   </target>
-
   <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
+    <mkdir dir="dist">
+    </mkdir>
     <copy todir="dist">
-      <fileset dir="${defaulttargetdir}"></fileset>
+      <fileset dir="${defaulttargetdir}" includes="*.jar">
+      </fileset>
+      <fileset dir="${basedir}" includes="LICENSE*, README*">
+      </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>
+    <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">
-        
-        <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>
-    
+    <mkdir dir="${testreportdir}">
+    </mkdir>
+    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+      <sysproperty key="basedir" value=".">
+      </sysproperty>
+      <formatter type="xml">
+      </formatter>
+      <formatter usefile="false" type="plain">
+      </formatter>
+      <classpath>
+        <fileset dir="${libdir}">
+          <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>
-
-      
-   
-      
-    
+    <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="${libdir}">
+          <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>
- 
-    
+    <mkdir dir="${javadocdir}">
+    </mkdir>
     <tstamp>
-      <format pattern="2001-yyyy" property="year"></format>
+      <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>
- 
+    <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 dir="${libdir}">
+          <include name="*.jar">
+          </include>
         </fileset>
-        <pathelement location="target/${final.name}.jar"></pathelement>
+        <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>
+    <get dest="${libdir}/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="${libdir}/jdepend-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.2.jar">
+    </get>
+    <get dest="${libdir}/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="${libdir}/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="${libdir}/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="${libdir}/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="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
+    </get>
+    <get dest="${libdir}/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>
-    
+    <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
+</project>
\ No newline at end of file
diff --git a/gump.xml b/gump.xml
index a595e3a..91364fb 100644
--- a/gump.xml
+++ b/gump.xml
@@ -4,7 +4,7 @@
   <description>Graph Representation and Manipulation Library</description>
   <url href="http://jakarta.apache.org/commons/graph/">
   </url>
-  <cvs module="jakarta-commons-sandbox/graph2" repository="jakarta">
+  <cvs module="jakarta-commons-sandbox/graph2" repository="">
   </cvs>
   <project name="commons-graph">
     <ant buildfile="build.xml" target="dist">
@@ -12,19 +12,17 @@
       </property>
     </ant>
     <package>org.apache.commons.graph</package>
-    <depend project="commons-collections">
+    <depend project="commons-collections:commons-collections">
     </depend>
     <depend project="jakarta-ant">
     </depend>
-    <depend project="jdepend">
+    <depend project="jdepend:jdepend">
     </depend>
-    <depend project="junit">
+    <depend project="junit:junit">
     </depend>
-    <depend project="log4j">
+    <depend project="log4j:log4j">
     </depend>
-    <depend project="nsuml">
-    </depend>
-    <depend project="xml-apis">
+    <depend project="xml-apis:xml-apis">
     </depend>
     <depend project="xml-xerces">
     </depend>