Author: todd
Date: Mon Sep 27 18:26:07 2010
New Revision: 1001856
URL: http://svn.apache.org/viewvc?rev=1001856&view=rev
Log:
THRIFT-890. java: Fix tutorial to build and run in trunk
Modified:
incubator/thrift/trunk/tutorial/java/JavaClient
incubator/thrift/trunk/tutorial/java/JavaServer
incubator/thrift/trunk/tutorial/java/build.xml
incubator/thrift/trunk/tutorial/java/src/JavaServer.java
incubator/thrift/trunk/tutorial/tutorial.thrift
Modified: incubator/thrift/trunk/tutorial/java/JavaClient
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/java/JavaClient?rev=1001856&r1=1001855&r2=1001856&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/java/JavaClient (original)
+++ incubator/thrift/trunk/tutorial/java/JavaClient Mon Sep 27 18:26:07 2010
@@ -18,5 +18,8 @@
# specific language governing permissions and limitations
# under the License.
#
+THIS_DIR=$(dirname $0)
+LIB_DIR=$THIS_DIR/../../lib/java/
+IVY_DIR=$LIB_DIR/build/ivy/lib/
-java -cp tutorial.jar:/usr/local/lib/libthrift.jar JavaClient
+java -cp $IVY_DIR/*:$LIB_DIR/libthrift.jar:tutorial.jar JavaClient
Modified: incubator/thrift/trunk/tutorial/java/JavaServer
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/java/JavaServer?rev=1001856&r1=1001855&r2=1001856&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/java/JavaServer (original)
+++ incubator/thrift/trunk/tutorial/java/JavaServer Mon Sep 27 18:26:07 2010
@@ -18,5 +18,8 @@
# specific language governing permissions and limitations
# under the License.
#
+THIS_DIR=$(dirname $0)
+LIB_DIR=$THIS_DIR/../../lib/java/
+IVY_DIR=$LIB_DIR/build/ivy/lib/
-java -cp tutorial.jar:/usr/local/lib/libthrift.jar JavaServer
+java -cp $IVY_DIR/*:$LIB_DIR/libthrift.jar:tutorial.jar JavaServer
Modified: incubator/thrift/trunk/tutorial/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/java/build.xml?rev=1001856&r1=1001855&r2=1001856&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/java/build.xml (original)
+++ incubator/thrift/trunk/tutorial/java/build.xml Mon Sep 27 18:26:07 2010
@@ -23,7 +23,17 @@
<property name="src" location="src" />
<property name="gen" location="../gen-java" />
<property name="build" location="build" />
- <property name="cpath" location="/usr/local/lib/libthrift.jar" />
+
+ <path id="libs.classpath">
+ <pathelement path="../../lib/java/libthrift.jar" />
+ <fileset dir="../../lib/java/build/ivy/lib">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <path id="build.classpath">
+ <path refid="libs.classpath" />
+ <pathelement path="${gen}" />
+ </path>
<target name="init">
<tstamp />
@@ -31,8 +41,8 @@
</target>
<target name="compile" depends="init">
- <javac srcdir="${gen}" destdir="${build}" classpath="${cpath}" />
- <javac srcdir="${src}" destdir="${build}" classpath="${cpath}:${gen}" />
+ <javac srcdir="${gen}" destdir="${build}" classpathref="libs.classpath" />
+ <javac srcdir="${src}" destdir="${build}" classpathref="build.classpath" />
</target>
<target name="tutorial" depends="compile">
Modified: incubator/thrift/trunk/tutorial/java/src/JavaServer.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/java/src/JavaServer.java?rev=1001856&r1=1001855&r2=1001856&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/java/src/JavaServer.java (original)
+++ incubator/thrift/trunk/tutorial/java/src/JavaServer.java Mon Sep 27
18:26:07 2010
@@ -54,19 +54,19 @@ public class JavaServer {
System.out.println("calculate(" + logid + ", {" + work.op + "," +
work.num1 + "," + work.num2 + "})");
int val = 0;
switch (work.op) {
- case Operation.ADD:
+ case ADD:
val = work.num1 + work.num2;
break;
- case Operation.SUBTRACT:
+ case SUBTRACT:
val = work.num1 - work.num2;
break;
- case Operation.MULTIPLY:
+ case MULTIPLY:
val = work.num1 * work.num2;
break;
- case Operation.DIVIDE:
+ case DIVIDE:
if (work.num2 == 0) {
InvalidOperation io = new InvalidOperation();
- io.what = work.op;
+ io.what = work.op.getValue();
io.why = "Cannot divide by 0";
throw io;
}
@@ -74,7 +74,7 @@ public class JavaServer {
break;
default:
InvalidOperation io = new InvalidOperation();
- io.what = work.op;
+ io.what = work.op.getValue();
io.why = "Unknown operation";
throw io;
}
Modified: incubator/thrift/trunk/tutorial/tutorial.thrift
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/tutorial.thrift?rev=1001856&r1=1001855&r2=1001856&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/tutorial.thrift (original)
+++ incubator/thrift/trunk/tutorial/tutorial.thrift Mon Sep 27 18:26:07 2010
@@ -66,7 +66,6 @@ namespace cpp tutorial
namespace java tutorial
namespace php tutorial
namespace perl tutorial
-namespace smalltalk.category Thrift.Tutorial
/**
* Thrift lets you do typedefs to get pretty names for your types. Standard
