- remove now obsolete commons-...jars from build.xml, see r4310

- complete reformat of the build.xml as it contained an unreadable mixture of space and tab indentation + trailing chars (now using 2 spaces indent without tabs)

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

build.xml

@@ -94,8 +94,7 @@
     <copy file="build.properties" tofile="build.properties.new">
       <filterchain>
         <tokenfilter>
-                <replaceregex 
-                    pattern="^releaseNr=(.*)"
+          <replaceregex pattern="^releaseNr=(.*)"
                         replace="releaseNr=$Revision: ${baseRevisionNr} $" />
         </tokenfilter>
       </filterchain>
@@ -110,8 +109,7 @@
     <loadproperties srcFile="build.properties">
       <filterchain>
         <tokenfilter>
-                <replaceregex 
-                    pattern="^releaseNr=\$Revision:\s(.*)\s\$"
+          <replaceregex pattern="^releaseNr=\$Revision:\s(.*)\s\$"
                         replace="releaseNr=\1"/>
         </tokenfilter>
       </filterchain>
@@ -175,15 +173,12 @@
   </target>
 
   <target name="compileMain" depends="init" description="Compiling the yacy sources ...">
- 
     <!-- defining the classpath that should be used for compiling -->
     <path id="project.class.path">
       <pathelement location="${build}" />
       <pathelement location="${htroot}" />
 
       <!-- libs needed for the yacy thread/object-pools -->
-    <pathelement location="${lib}/commons-collections.jar" />
-    <pathelement location="${lib}/commons-pool.jar" />    
       <pathelement location="${lib}/tar.jar" />
       <pathelement location="${libx}/saaj.jar" />
       <pathelement location="${libx}/axis.jar" />
@@ -228,8 +223,6 @@
       <pathelement location="${htroot}"/>
 
       <!-- libs needed for the yacy thread/object-pools -->
-	    <pathelement location="${lib}/commons-collections.jar" />
-	    <pathelement location="${lib}/commons-pool.jar" />  
       <pathelement location="${lib}/tar.jar" />
       <!-- userspecific libs -->
       <pathelement location="${htdocsWWW}/lib/*.jar" />
@@ -241,7 +234,6 @@
            classpathref="htdocsWWW.class.path"
            debug="true" debuglevel="lines,vars,source"
            source="${javacSource}" target="${javacTarget}" />
-	
   </target>
 
   <!-- compiling optional content parsers and building install packages -->
@@ -309,7 +301,6 @@
 
   <!-- compile optional classs that were not compiled elsewhere -->
   <target name="compileExtensions" depends="compileMain,compileParsers,compileSeedUploaders,compilePortForwarding">
-	
     <!-- compile rss Reader -->
     <javac srcdir="${src}" destdir="${build}"
            debug="true" debuglevel="lines,vars,source" 
@@ -605,8 +596,6 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-      <pathelement location="${lib}/commons-collections.jar" />
-      <pathelement location="${lib}/commons-pool.jar" />        
         <pathelement location="${lib}/tar.jar" />
         <pathelement location="${libx}" />
         <fileset dir="${libx}" includes="**/*.jar" />
@@ -626,8 +615,6 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-      <pathelement location="${lib}/commons-collections.jar" />
-      <pathelement location="${lib}/commons-pool.jar" />        
         <pathelement location="${lib}/tar.jar" />
         <pathelement location="${libx}" />
         <fileset dir="${libx}" includes="**/*.jar" />
@@ -642,8 +629,6 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-      <pathelement location="${lib}/commons-collections.jar" />
-      <pathelement location="${lib}/commons-pool.jar" />        
         <pathelement location="${lib}/tar.jar" />
         <pathelement location="${libx}" />
         <fileset dir="${libx}" includes="**/*.jar" />
@@ -662,8 +647,6 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-      <pathelement location="${lib}/commons-collections.jar" />
-      <pathelement location="${lib}/commons-pool.jar" />        
         <pathelement location="${lib}/tar.jar" />
         <pathelement location="${libx}" />
         <fileset dir="${libx}" includes="**/*.jar" />
@@ -739,7 +722,6 @@ This needs jsmoothgen
     winInstallerExe build a installer-programm for windows, instead of a tar.gz.
 
     This needs nsis-ant-1.2.jar in the yacyfolder.
-
 -->
 
   <target name="distWithWinStartExe" depends="makeWinStartExe,dist">