Author: todd
Date: Tue Sep 21 18:01:43 2010
New Revision: 999520
URL: http://svn.apache.org/viewvc?rev=999520&view=rev
Log:
THRIFT-907. java: update fb303 to compile on trunk
Modified:
incubator/thrift/trunk/contrib/fb303/java/FacebookBase.java
incubator/thrift/trunk/contrib/fb303/java/build.xml
Modified: incubator/thrift/trunk/contrib/fb303/java/FacebookBase.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/contrib/fb303/java/FacebookBase.java?rev=999520&r1=999519&r2=999520&view=diff
==============================================================================
--- incubator/thrift/trunk/contrib/fb303/java/FacebookBase.java (original)
+++ incubator/thrift/trunk/contrib/fb303/java/FacebookBase.java Tue Sep 21
18:01:43 2010
@@ -44,7 +44,7 @@ public abstract class FacebookBase imple
return name_;
}
- public abstract int getStatus();
+ public abstract fb_status getStatus();
public String getStatusDetails() {
return "";
Modified: incubator/thrift/trunk/contrib/fb303/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/contrib/fb303/java/build.xml?rev=999520&r1=999519&r2=999520&view=diff
==============================================================================
--- incubator/thrift/trunk/contrib/fb303/java/build.xml (original)
+++ incubator/thrift/trunk/contrib/fb303/java/build.xml Tue Sep 21 18:01:43 2010
@@ -21,7 +21,8 @@
<!-- project wide settings. All directories relative to basedir -->
<property name="src.dir" value="java"/>
<property name="if.dir" value="if"/>
- <property name="thrift_home" value="/usr/local"/>
+ <property name="thrift_compiler" value="../../compiler/cpp/thrift" />
+ <property name="thrift_lib" value="../../lib/java/libthrift.jar" />
<!-- temp build directories -->
<property name="build.dir" value="${src.dir}/build"/>
@@ -44,7 +45,7 @@
<!-- generate fb303 thrift code -->
<target name="thriftbuild">
<echo>generating thrift fb303 files</echo>
- <exec executable="${thrift_home}/bin/thrift" failonerror="true">
+ <exec executable="${thrift_compiler}" failonerror="true">
<arg line="--gen java -o ${src.dir} ${src.dir}/../if/fb303.thrift" />
</exec>
<move todir="${src.dir}">
@@ -59,7 +60,10 @@
<echo>Building libfb303.jar .... </echo>
<javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="on">
<classpath>
- <pathelement location="${thrift_home}/lib/libthrift.jar"/>
+ <pathelement location="${thrift_lib}"/>
+ <fileset dir="../../lib/java/build/ivy/lib">
+ <include name="*.jar" />
+ </fileset>
</classpath>
<include name="*.java"/>
<include name="${build.dir}/gen-java/com/facebook/fb303"/>
