--- lib/java/build.xml	2011-04-20 22:13:45.000000000 +0200
+++ lib/java/build.xml-gil	2011-11-30 16:24:11.161292281 +0100
@@ -17,8 +17,7 @@
  specific language governing permissions and limitations
  under the License.
  -->
-<project name="libthrift" default="dist" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="libthrift" default="dist" basedir=".">
   
   <description>Thrift Build File</description>
   <property name="thrift.root" location="../../"/>
@@ -64,21 +63,32 @@
   <property name="pom.xml" location="${build.dir}/${final.name}.pom"/>
 
   <path id="compile.classpath">
-    <fileset dir="${build.lib.dir}"> 
-      <include name="**/*.jar"/>
+    <fileset dir="/usr/share/java"> 
+      <include name="commons-codec.jar"/>
+      <include name="commons-lang.jar"/>
+      <include name="commons-logging.jar"/>
+      <include name="httpcomponents/httpcore.jar"/>
+      <include name="httpcomponents/httpclient.jar"/>
+      <include name="httpcomponents/httpclient.jar"/>
+      <include name="log4j.jar"/>
+      <include name="slf4j/api.jar"/>
+      <include name="tomcat6-servlet-api.jar"/>
     </fileset>
   </path>
 
   <path id="test.classpath">
     <path refid="compile.classpath"/>
-    <pathelement path="${env.CLASSPATH}"/>
+    <fileset dir="/usr/share/java"> 
+      <include name="junit4.jar"/>
+      <include name="slf4j/log4j12.jar"/>
+    </fileset>
     <pathelement location="${build.test.dir}"/>
     <pathelement location="${jar.file}"/>
     <pathelement location="${test.jar.file}"/>
   </path>
 
   <!-- Tasks --> 
-  <target name="init" depends="setup.init,mvn.init" unless="init.finished">
+  <target name="init" depends="setup.init" unless="init.finished">
     <property name="init.finished" value="true"/>
   </target>
 
@@ -230,24 +240,24 @@
   </target>
 
   <target name="mvn.ant.tasks.download" depends="setup.init" unless="mvn.ant.tasks.found">
-    <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
+    <!--get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/-->
   </target>
 
   <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
+    <!--condition property="mvn.ant.tasks.found">
       <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
+    </condition-->
   </target> 
 
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
+  <!--target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
+    <Download mvn ant tasks, download dependencies, and setup pom file >
     <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
 
-    <!-- remote repositories used to download dependencies from -->
+    < remote repositories used to download dependencies from >
     <artifact:remoteRepository id="central" url="${mvn.repo}"/>
     <artifact:remoteRepository id="apache" url="${apache.repo}"/>
 
-    <!-- Pom file information -->
+    < Pom file information >
     <artifact:pom id="pom" 
       groupId="${thrift.groupid}" 
       artifactId="${thrift.artifactid}"
@@ -264,7 +274,7 @@
         developerConnection="scm:svn:http://svn.apache.org/repos/asf/thrift/trunk/"
         url="http://svn.apache.org/viewcvs.cgi/thrift"
       />
-      <!-- Thrift Developers -->
+      < Thrift Developers >
       <developer id="mcslee" name="Mark Slee"/>
       <developer id="dreiss" name="David Reiss"/>
       <developer id="aditya" name="Aditya Agarwal"/>
@@ -282,7 +292,7 @@
       <developer id="roger" name="Roger Meier"/>
       <developer id="jfarrell" name="Jake Farrell"/>
 
-      <!-- Thrift dependencies list -->
+      < Thrift dependencies list >
       <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.5.8"/>
       <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.5.8"/>
       <dependency groupId="commons-lang" artifactId="commons-lang" version="2.5"/>
@@ -291,23 +301,23 @@
       <dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.0.1"/>
     </artifact:pom>
 
-    <!-- Generate the pom file -->
+    < Generate the pom file >
     <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
 
-    <!-- Download the dependencies -->
+    < Download the dependencies >
     <artifact:dependencies filesetId="build-dependency-jars" pomRefId="pom"/>
 
-    <!-- Copy the dependencies to the build/lib dir -->
+    < Copy the dependencies to the build/lib dir >
     <copy todir="${build.dir}/lib">
       <fileset refid="build-dependency-jars"/>
       <mapper type="flatten"/>
     </copy>
 
     <property name="mvn.finished" value="true"/>
-  </target>
+  </target-->
 
-  <macrodef name="signAndDeploy">
-    <!-- Sign and deploy jars to apache repo -->
+  <!--macrodef name="signAndDeploy">
+    < Sign and deploy jars to apache repo >
     <attribute name="file"/>
     <attribute name="classifier" default=""/>
     <attribute name="packaging" default="jar"/>
@@ -323,14 +333,14 @@
         <arg value="-Pgpg"/>
       </artifact:mvn>
     </sequential>
-  </macrodef>
+  </macrodef-->
 
-  <target name="publish" depends="clean,init,test,dist,javadoc,pack.src">
-    <!-- Compile, package, test and then send release to apache maven repo -->
-    <!-- run with: ant -Drelease=true publish-->
+  <!--target name="publish" depends="clean,init,test,dist,javadoc,pack.src">
+    < Compile, package, test and then send release to apache maven repo >
+    < run with: ant -Drelease=true publish>
     <signAndDeploy file="${pom.xml}" packaging="pom" classifier=""/>
     <signAndDeploy file="${jar.file}" packaging="jar" classifier=""/>
     <signAndDeploy file="${javadoc.jar.file}" packaging="jar" classifier="javadoc"/>
     <signAndDeploy file="${source.tar.gz}" packaging="src" classifier="tar.gz"/>
-  </target>
+  </target-->
 </project>