File fb303-0.9.1-buildxml.patch of Package thrift

File fb303-0.9.1-buildxml.patch of Package thrift (Revision ced7f698f20fe4c49dfa92c60736a00d)

Currently displaying revision ced7f698f20fe4c49dfa92c60736a00d , Show latest

diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml
index 8f2fa51..d89f05e 100755
--- a/contrib/fb303/java/build.xml
+++ b/contrib/fb303/java/build.xml
@@ -17,8 +17,7 @@
  specific language governing permissions and limitations
  under the License.
  -->
-<project name="libfb303" default="dist" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="libfb303" default="dist" basedir=".">
 
   
   <property name="thrift.root" location="${basedir}/../../../"/>
@@ -26,7 +25,7 @@
   <property name="interface.dir" value="${basedir}/../if"/>
   <property name="thrift.java.dir" location="${thrift.root}/lib/java"/>
   <property name="build.tools.dir" location="${thrift.java.dir}/build/tools/"/>
-  <property name="thrift_compiler" value="${thrift.root}/compiler/cpp/thrift"/> 
+  <property name="thrift_compiler" value="${thrift.root}/compiler/cpp/thrift"/>
 
   
   <property file="${thrift.java.dir}/build.properties" />
@@ -38,8 +37,8 @@
   </condition>
   <property name="version" value="${thrift.version}-snapshot"/>
 
-  <property name="fb303.final.name" value="${fb303.artifactid}-${version}"/>
-  <property name="thrift.java.libthrift" value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
+  <property name="fb303.final.name" value="${fb303.artifactid}"/>
+  <property name="thrift.java.libthrift" value="${thrift.java.dir}/build/libthrift.jar"/>
 
   <property name="src" value="${basedir}/src"/>
   <property name="gen" value="${basedir}/gen-java"/>
@@ -50,7 +49,7 @@
   <property name="fb303.jar.file" location="${build.dir}/${fb303.final.name}.jar"/>
   <property name="fb303.pom.xml" location="${build.dir}/${fb303.final.name}.pom"/>
 
-  <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>
 
@@ -72,13 +71,21 @@
   
   <target name="dist" depends="init,generate">
     <echo message="Building ${fb303.final.name}.jar"/>
-    <javac destdir="${build.classes.dir}" debug="on">
+    <javac destdir="${build.classes.dir}" debug="on" includeantruntime="false" >
       <classpath>
         <pathelement location="${thrift.java.libthrift}"/>
-        <fileset dir="${thrift.root}/lib/java/build/lib">
-          <include name="*.jar"/>
-        </fileset>
+	<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="log4j.jar"/>
+	  <include name="slf4j/api.jar"/>
+	  <include name="tomcat-servlet-3.0-api.jar"/>
+	</fileset>
       </classpath>
+
       <src path="${src}"/>
       <src path="${gen}"/>
       <include name="**/*.java"/>
@@ -99,97 +106,4 @@
     <delete dir="${build.dir}"/>
     <delete dir="${gen}"/>
   </target>
-
-  <target name="mvn.ant.tasks.download" depends="setup.init,mvn.ant.tasks.check" 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"/>
-  </target>
-
-  <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
-      <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
-  </target>
-
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <echo message="${mvn.ant.task.jar}"/>
-    
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
-
-    
-    <artifact:remoteRepository id="central" url="${mvn.repo}"/>
-    <artifact:remoteRepository id="apache" url="${apache.repo}"/>
-
-    
-    <artifact:pom id="pom" 
-      groupId="${thrift.groupid}" 
-      artifactId="${fb303.artifactid}"
-      version="${version}" 
-      url="http://thrift.apache.org"
-      name="Apache Thrift"
-      description="Thrift is a software framework for scalable cross-language services development."
-      packaging="pom"
-    >
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
-      <license name="The Apache Software License, Version 2.0" url="${license}"/>
-      <scm connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git" 
-      developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"
-      url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-    />
-      
-      <developer id="mcslee" name="Mark Slee"/>
-      <developer id="dreiss" name="David Reiss"/>
-      <developer id="aditya" name="Aditya Agarwal"/>
-      <developer id="marck" name="Marc Kwiatkowski"/>
-      <developer id="jwang" name="James Wang"/>
-      <developer id="cpiro" name="Chris Piro"/>
-      <developer id="bmaurer" name="Ben Maurer"/>
-      <developer id="kclark" name="Kevin Clark"/>
-      <developer id="jake" name="Jake Luciani"/>
-      <developer id="bryanduxbury" name="Bryan Duxbury"/>
-      <developer id="esteve" name="Esteve Fernandez"/>
-      <developer id="todd" name="Todd Lipcon"/>
-      <developer id="geechorama" name="Andrew McGeachie"/>
-      <developer id="molinaro" name="Anthony Molinaro"/>
-      <developer id="roger" name="Roger Meier"/>
-      <developer id="jfarrell" name="Jake Farrell"/>
-      <developer id="jensg" name="Jens Geyer"/>
-      <developer id="carl" name="Carl Yeksigian"/>
-
-      
-      <dependency groupId="org.apache.thrift" artifactId="libthrift" version="${version}"/>
-    </artifact:pom>
-
-    
-    <artifact:writepom pomRefId="pom" file="${fb303.pom.xml}"/>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-
-  <macrodef name="signAndDeploy">
-    
-    <attribute name="file"/>
-    <attribute name="classifier" default=""/>
-    <attribute name="packaging" default="jar"/>
-    <attribute name="pom" default=""/>
-    <sequential>
-      <artifact:mvn fork="true">
-        <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-        <arg value="-DrepositoryId=${maven-repository-id}"/>
-        <arg value="-Durl=${maven-repository-url}"/>
-        <arg value="-DpomFile=@{pom}"/>
-        <arg value="-Dfile=@{file}"/>
-        <arg value="-Dclassifier=@{classifier}"/>
-        <arg value="-Dpackaging=@{packaging}"/>
-        <arg value="-Pgpg"/>
-      </artifact:mvn>
-    </sequential>
-  </macrodef>
-
-  <target name="publish" depends="clean,dist">
-    
-    
-    <signAndDeploy file="${fb303.pom.xml}" packaging="pom" classifier="" pom="${fb303.pom.xml}"/>
-    <signAndDeploy file="${fb303.jar.file}" packaging="jar" classifier="" pom="${fb303.pom.xml}"/>
-  </target>
 </project>