--- build.xml.orig	2008-07-01 16:45:20.000000000 +0100
+++ build.xml	2008-07-07 00:42:57.846071795 +0100
@@ -29,23 +29,14 @@
     <target name="compile-library">
         <mkdir dir="svnkit/bin" />
         <mkdir dir="svnkit-cli/bin" />
-        <mkdir dir="contrib/javahl/bin" />
-        <mkdir dir="contrib/sequence/bin" />
 
         <path id="library.classpath">
-            <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />            
-            <pathelement path="contrib/javahl/bin" />
-            <pathelement path="contrib/sequence/bin" />
+            <fileset dir="contrib"> 
+                <include name="**/*.jar"/> 
+            </fileset> 
             <pathelement path="svnkit/bin" />
         </path>
 
-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
-            <exclude name="**/SVNClient.java" />
-            <exclude name="**/SVNAdmin.java" />
-            <exclude name="**/Path.java" />
-        </javac>
-        <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true"
                destdir="svnkit/bin"
                srcdir="svnkit/src"
@@ -116,26 +107,13 @@
         <mkdir dir="contrib/sequence/bin-test" />
         <mkdir dir="svnkit-test/bin" />
         <path id="tests.classpath">
-            <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />
-            <pathelement location="contrib/junit/junit.jar" />
-            <pathelement path="contrib/javahl/bin" />
-            <pathelement path="contrib/sequence/bin" />
-            <pathelement path="contrib/sequence/bin-test" />
+            <fileset dir="contrib"> 
+                <include name="**/*.jar"/> 
+            </fileset> 
             <pathelement path="svnkit/bin" />
             <pathelement path="svnkit-cli/bin" />
         </path>
 
-        <path id="sequence.tests.classpath">
-            <pathelement location="contrib/junit/junit.jar" />
-            <pathelement path="contrib/sequence/bin" />
-        </path>
-
-        <javac debug="true"
-               destdir="contrib/sequence/bin-test"
-               srcdir="contrib/sequence/src-test"
-               classpathref="sequence.tests.classpath"
-        />
         <javac debug="true"
                destdir="svnkit-test/bin"
                srcdir="svnkit-test/src"
@@ -164,10 +142,6 @@
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
-        	<fileset dir="contrib/sequence">
-                <include name="SEQUENCE-LICENSE" />
-        	</fileset>
-            <fileset dir="contrib/sequence/bin" />
             <fileset dir="svnkit/src">
                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />
                 <include name="org/tmatesoft/svn/core/io/repository/**" />
@@ -179,30 +153,13 @@
             <fileset dir="svnkit/bin">
                 <include name="org/tigris/**" />
             </fileset>
-            <fileset dir="contrib/javahl/bin" >
-                <exclude name="org/tigris/subversion/javahl/tests/**" />
-                <exclude name="org/tigris/subversion/javahl/SVNClient.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNClient$*.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin$*.class" />
-                <exclude name="org/tigris/subversion/javahl/Path.class" />
-            </fileset>
-            <fileset dir="contrib/javahl">
-                <include name="JAVAHL-LICENSE" />
-            </fileset>
         </jar>
-        <copy file="contrib/trilead/trilead.jar" todir="build/lib" />
-        <copy file="contrib/jna/jna.jar" todir="build/lib" />
     	<!-- copy licences and changelog -->
         <copy todir="build/lib" flatten="true">
             <fileset dir=".">
                 <include name="changelog.txt" />
                 <include name="README.txt" />
                 <include name="COPYING" />
-                <include name="contrib/jna/JNA-LICENSE" />
-                <include name="contrib/javahl/JAVAHL-LICENSE" />
-                <include name="contrib/sequence/SEQUENCE-LICENSE" />
-                <include name="contrib/trilead/TRILEAD-LICENSE" />
             </fileset>
         </copy>
     </target>
@@ -237,24 +194,12 @@
         <zip destfile="build/lib/svnkitsrc.zip">
             <fileset dir="svnkit/src" />
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
-            <fileset dir="contrib/javahl/src">
-            	<exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
-            	<exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
-                <exclude name="org/tigris/subversion/javahl/Path.java"/>
-            </fileset>
-            <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
             </fileset>
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
-            <fileset dir="contrib/javahl" >
-                <include name="JAVAHL-LICENSE" />
-            </fileset>
-            <fileset dir="contrib/sequence" >
-                <include name="SEQUENCE-LICENSE" />
-            </fileset>
         </zip>
         <zip destfile="build/lib/svnkitclisrc.zip">
             <fileset dir="svnkit-cli/src" />
@@ -326,9 +271,10 @@
        	<copy file="doc/javadoc-files/info.png" todir="build/doc/javadoc"/>
 
     	<path id="doc.classpath">
+            <fileset dir="contrib"> 
+                <include name="**/*.jar"/> 
+            </fileset> 
             <pathelement path="svnkit/bin" />
-            <pathelement path="contrib/sequence/bin" />
-            <pathelement path="contrib/javahl/bin" />
 		</path>
     	<javadoc destdir="build/doc/javadoc" failonerror="false"
                  windowtitle="JavaDoc :: Documentation :: Pure Java Subversion (SVN) Client Library"
@@ -360,9 +306,6 @@
         <!-- delete all compiled classes -->
         <delete>
             <fileset dir=".">
-                <include name="contrib/javahl/bin/**" />
-                <include name="contrib/sequence/bin/**" />
-                <include name="contrib/sequence/bin-test/**" />
                 <include name="svnkit/bin/**" />
                 <include name="svnkit-eclipse/bin/**" />
                 <include name="svnkit-test/bin/**" />
@@ -428,29 +371,12 @@
                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />
                 <include name="org/tmatesoft/svn/core/io/repository/**" />
 			</fileset>
-			<fileset dir="contrib/javahl/bin">
-                <exclude name="org/tigris/subversion/javahl/SVNClient**" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
-                <exclude name="org/tigris/subversion/javahl/Path**" />
-			</fileset>
-			<fileset dir="contrib/sequence/bin">
-				<include name="**"/>
-			</fileset>
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
             </fileset>
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
-            <fileset dir="contrib/javahl" >
-                <include name="JAVAHL-LICENSE" />
-            </fileset>
-            <fileset dir="contrib/jna" >
-                <include name="JNA-LICENSE" />
-            </fileset>
-            <fileset dir="contrib/sequence" >
-                <include name="SEQUENCE-LICENSE" />
-            </fileset>
 		</jar>
 
 		<jar destfile="build/maven/svnkit-${build.number}-sources.jar">
@@ -466,32 +392,12 @@
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
 			</fileset>
-			<fileset dir="contrib/javahl/src">
-				<exclude name=".svn"/>
-				<exclude name=".svn/**"/>
-                <exclude name="org/tigris/subversion/javahl/SVNClient.java" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
-                <exclude name="org/tigris/subversion/javahl/Path.java" />
-			</fileset>
-			<fileset dir="contrib/sequence/src">
-				<exclude name=".svn"/>
-				<exclude name=".svn/**"/>
-			</fileset>
 			<fileset dir="${basedir}" >
                 <include name="COPYING" />
             </fileset>
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
-            <fileset dir="contrib/javahl" >
-                <include name="JAVAHL-LICENSE" />
-            </fileset>
-            <fileset dir="contrib/jna" >
-                <include name="JNA-LICENSE" />
-            </fileset>
-            <fileset dir="contrib/sequence" >
-                <include name="SEQUENCE-LICENSE" />
-            </fileset>
 		</jar>
 		
 		<copy file="pom.xml" tofile="build/maven/pom.xml"/>
@@ -543,11 +449,6 @@
                 <exclude name="**/bin/**" />
                 <exclude name="bin/**" />
             </zipfileset>
-            <zipfileset dir="contrib" prefix="svnkit-src-${build.number}/contrib">
-                <exclude name="**/.svn" />
-                <exclude name="**/bin/**" />
-                <exclude name="bin/**" />
-            </zipfileset>
             <zipfileset dir="." prefix="svnkit-src-${build.number}">
                 <include name=".settings/*" />
                 <include name="*.*" />
@@ -560,11 +461,11 @@
 
     <target name="test-java" depends="init-environment,compile-tests">
         <path id="test.classpath">
-            <pathelement path="contrib/junit/junit.jar" />
+            <fileset dir="contrib"> 
+                <include name="**/*.jar"/> 
+            </fileset> 
             <pathelement path="svnkit/bin" />
-            <pathelement path="contrib/sequence/bin" />
             <pathelement path="svnkit-test/bin" />
-            <pathelement path="contrib/sequence/bin-test" />
         </path>
         <java classpathref="test.classpath"
               dir="svnkit-test"
@@ -630,10 +531,10 @@
     	<path id="python.classpath">
             <pathelement path="build/lib/svnkit.jar" />
             <pathelement path="build/lib/svnkit-cli.jar" />
-            <pathelement path="build/lib/trilead.jar" />
-            <pathelement path="build/lib/jna.jar" />
-            <pathelement path="contrib/junit/junit.jar" />
             <pathelement path="svnkit-test/bin" />
+            <fileset dir="contrib"> 
+                <include name="**/*.jar"/> 
+            </fileset> 
         </path>
 
         <copy file="svnkit-test/logging.cli.properties"