diff options
| author | Todd Lipcon <todd@apache.org> | 2010-09-21 18:01:43 +0000 |
|---|---|---|
| committer | Todd Lipcon <todd@apache.org> | 2010-09-21 18:01:43 +0000 |
| commit | 61934780c6fd534015fdd568e85e8ee8d5b07dbe (patch) | |
| tree | 7fe1a5ab41a98dbc740d32f91f6af485736636ae /contrib/fb303 | |
| parent | 6a1fb17a25ce7b52b7c5e396adf86ceb96606d64 (diff) | |
| download | thrift-61934780c6fd534015fdd568e85e8ee8d5b07dbe.tar.gz | |
THRIFT-907. java: update fb303 to compile on trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@999520 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'contrib/fb303')
| -rw-r--r-- | contrib/fb303/java/FacebookBase.java | 2 | ||||
| -rwxr-xr-x | contrib/fb303/java/build.xml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/fb303/java/FacebookBase.java b/contrib/fb303/java/FacebookBase.java index 5778cc8bd..f84e98bb1 100644 --- a/contrib/fb303/java/FacebookBase.java +++ b/contrib/fb303/java/FacebookBase.java @@ -44,7 +44,7 @@ public abstract class FacebookBase implements FacebookService.Iface { return name_; } - public abstract int getStatus(); + public abstract fb_status getStatus(); public String getStatusDetails() { return ""; diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml index 4ad30e53f..48e747097 100755 --- a/contrib/fb303/java/build.xml +++ b/contrib/fb303/java/build.xml @@ -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"/> |