THRIFT-1133 Java and JavaScript tutorial is broken since we have Java maven deployment

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1090454 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/tutorial/java/JavaClient b/tutorial/java/JavaClient
index bc518cf..dae515e 100755 (executable)
--- a/tutorial/java/JavaClient
+++ b/tutorial/java/JavaClient
@@ -18,8 +18,5 @@
 # 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 $IVY_DIR/*:$LIB_DIR/libthrift.jar:tutorial.jar JavaClient $1
+java -cp ../../lib/java/build/lib/*:../../lib/java/build/*:tutorial.jar JavaClient $1

diff --git a/tutorial/java/JavaServer b/tutorial/java/JavaServer
index d821715..cf977ca 100755 (executable)
--- a/tutorial/java/JavaServer
+++ b/tutorial/java/JavaServer
@@ -18,9 +18,6 @@
 # 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/
 
 # Optionally the following properties could be set for SSL instead
 # of configuring it in the code
@@ -29,4 +26,4 @@ IVY_DIR=$LIB_DIR/build/ivy/lib/
 # -Djavax.net.ssl.keyStore=../../lib/java/test/.keystore
 # -Djavax.net.ssl.keyStorePassword=thrift
 
-java -cp $IVY_DIR/*:$LIB_DIR/libthrift.jar:tutorial.jar JavaServer
+java -cp ../../lib/java/build/lib/*:../../lib/java/build/*:tutorial.jar JavaServer

diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
index e7d5c8b..2ee11c0 100644 (file)
--- a/tutorial/java/build.xml
+++ b/tutorial/java/build.xml
@@ -25,8 +25,11 @@
   <property name="build" location="build" />
 
   <path id="libs.classpath">
-    <pathelement path="../../lib/java/libthrift.jar" />
-    <fileset dir="../../lib/java/build/ivy/lib">
+    <fileset dir="../../lib/java/build">
+      <include name="*.jar" />
+      <exclude name="-test.jar" />
+    </fileset>
+    <fileset dir="../../lib/java/build/lib">
       <include name="*.jar" />
     </fileset>
   </path>

diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml
index f85651a..f757789 100644 (file)
--- a/tutorial/js/build.xml
+++ b/tutorial/js/build.xml
@@ -30,8 +30,11 @@
   <property name="thrift.java.dir" location="${thrift.dir}/lib/java" />
 
   <path id="libs.classpath">
-    <pathelement path="${thrift.java.dir}/libthrift.jar" />
-    <fileset dir="${thrift.java.dir}/build/ivy/lib">
+    <fileset dir="../../lib/java/build">
+      <include name="*.jar" />
+      <exclude name="-test.jar" />
+    </fileset>
+    <fileset dir="../../lib/java/build/lib">
       <include name="*.jar" />
     </fileset>
   </path>