*) Merging didn't work correctly. Fixed.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@27 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.xml

@@ -4,6 +4,7 @@
 	</description>
 	
 <property name="src" location="source"/>
+<property name="lib" location="lib"/>
 <property name="build" location="classes"/>
 <property name="htroot" location="htroot"/>
 
@@ -31,7 +32,15 @@
 
 
 <target name="compile" depends="init" description="compiles the source">
-<javac srcdir="${src}/" destdir="${build}"/>
+	<javac srcdir="${src}/" destdir="${build}">
+        <classpath>
+          	<pathelement location="${build}" />
+        	
+        	<!-- libs needed for the yacy thread/object-pools -->
+          	<pathelement location="${lib}/commons-collections.jar" />
+        	<pathelement location="${lib}/commons-pool-1.2.jar" />        	
+        </classpath>		
+	</javac>	
 	<javac srcdir="${htroot}/" destdir="${htroot}" classpath="${build}"/>
 	<javac srcdir="${htroot}/htdocsdefault" destdir="${htroot}/htdocsdefault" classpath="${build}"/>	
 	<javac srcdir="${htroot}/yacy" destdir="${htroot}/yacy" classpath="${build}"/>	
@@ -43,4 +52,11 @@
 <move file="${src}/yacy.java.orig" tofile="${src}/yacy.java" />
 </target>
 
+<target name="clean" description="make clean">	
+    <delete>
+      	<fileset dir="${build}" includes="**/*.class" />
+    	<fileset dir="${htroot}" includes="**/*.class" />
+    </delete>	
+</target>
+	
 </project>