Author: roger
Date: Fri Apr 8 21:28:50 2011
New Revision: 1090454
URL: http://svn.apache.org/viewvc?rev=1090454&view=rev
Log:
THRIFT-1133 Java and JavaScript tutorial is broken since we have Java maven
deployment
Modified:
thrift/trunk/tutorial/java/JavaClient
thrift/trunk/tutorial/java/JavaServer
thrift/trunk/tutorial/java/build.xml
thrift/trunk/tutorial/js/build.xml
Modified: thrift/trunk/tutorial/java/JavaClient
URL:
http://svn.apache.org/viewvc/thrift/trunk/tutorial/java/JavaClient?rev=1090454&r1=1090453&r2=1090454&view=diff
==============================================================================
--- thrift/trunk/tutorial/java/JavaClient (original)
+++ thrift/trunk/tutorial/java/JavaClient Fri Apr 8 21:28:50 2011
@@ -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
Modified: thrift/trunk/tutorial/java/JavaServer
URL:
http://svn.apache.org/viewvc/thrift/trunk/tutorial/java/JavaServer?rev=1090454&r1=1090453&r2=1090454&view=diff
==============================================================================
--- thrift/trunk/tutorial/java/JavaServer (original)
+++ thrift/trunk/tutorial/java/JavaServer Fri Apr 8 21:28:50 2011
@@ -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
Modified: thrift/trunk/tutorial/java/build.xml
URL:
http://svn.apache.org/viewvc/thrift/trunk/tutorial/java/build.xml?rev=1090454&r1=1090453&r2=1090454&view=diff
==============================================================================
--- thrift/trunk/tutorial/java/build.xml (original)
+++ thrift/trunk/tutorial/java/build.xml Fri Apr 8 21:28:50 2011
@@ -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>
Modified: thrift/trunk/tutorial/js/build.xml
URL:
http://svn.apache.org/viewvc/thrift/trunk/tutorial/js/build.xml?rev=1090454&r1=1090453&r2=1090454&view=diff
==============================================================================
--- thrift/trunk/tutorial/js/build.xml (original)
+++ thrift/trunk/tutorial/js/build.xml Fri Apr 8 21:28:50 2011
@@ -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>
