From: Roger Meier Date: Mon, 22 Oct 2012 19:27:38 +0000 (+0000) Subject: THRIFT-1735 integrate tutorial into regular build X-Git-Tag: 0.9.1~260 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=fa89932a49f80ddea079c783232f6d304c59352e;p=common%2Fthrift.git THRIFT-1735 integrate tutorial into regular build Patch: Roger Meier git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1401032 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Makefile.am b/Makefile.am index f4548e0d..a0f2a88c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I ./aclocal -SUBDIRS = compiler/cpp lib +SUBDIRS = compiler/cpp lib tutorial if WITH_TESTS SUBDIRS += test diff --git a/configure.ac b/configure.ac index 60df237f..de476453 100755 --- a/configure.ac +++ b/configure.ac @@ -611,6 +611,9 @@ AC_CONFIG_FILES([ test/py/Makefile test/py.twisted/Makefile test/rb/Makefile + tutorial/Makefile + tutorial/java/Makefile + tutorial/js/Makefile ]) AC_OUTPUT diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am new file mode 100755 index 00000000..a6ff7c5c --- /dev/null +++ b/tutorial/Makefile.am @@ -0,0 +1,56 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +SUBDIRS = + +if WITH_CPP +#SUBDIRS += cpp +endif + +if WITH_JAVA +SUBDIRS += java +SUBDIRS += js +endif + +if WITH_PERL +#SUBDIRS += perl +endif + +if WITH_PHP +#SUBDIRS += php +endif + +if WITH_PYTHON +#SUBDIRS += py +#SUBDIRS += py.twisted +endif + +if WITH_RUBY +#SUBDIRS += rb +endif + +if WITH_HASKELL +#SUBDIRS += hs +endif + +# +# generate html for ThriftTest.thrift +# +check-local: + $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift diff --git a/tutorial/java/JavaServer b/tutorial/java/Makefile.am similarity index 66% rename from tutorial/java/JavaServer rename to tutorial/java/Makefile.am index cf977caa..16ae399c 100755 --- a/tutorial/java/JavaServer +++ b/tutorial/java/Makefile.am @@ -1,5 +1,3 @@ -#!/bin/sh - # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -19,11 +17,21 @@ # under the License. # -# Optionally the following properties could be set for SSL instead -# of configuring it in the code -# -Djavax.net.ssl.trustStore=../../lib/java/test/.truststore -# -Djavax.net.ssl.trustStorePassword=thrift -# -Djavax.net.ssl.keyStore=../../lib/java/test/.keystore -# -Djavax.net.ssl.keyStorePassword=thrift +export CLASSPATH + +# Make sure this doesn't fail if ant is not configured. +clean-local: + ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ + $$ANT $(ANT_FLAGS) clean + +check-local: all + $(ANT) $(ANT_FLAGS) test + +tutorial: all + $(ANT) $(ANT_FLAGS) tutorial + +tutorialserver: all + $(ANT) $(ANT_FLAGS) tutorialserver -java -cp ../../lib/java/build/lib/*:../../lib/java/build/*:tutorial.jar JavaServer +tutorialclient: all + $(ANT) $(ANT_FLAGS) tutorialclient \ No newline at end of file diff --git a/tutorial/java/README b/tutorial/java/README index 9f03ba7f..c0811f7f 100644 --- a/tutorial/java/README +++ b/tutorial/java/README @@ -1,29 +1,20 @@ -Steps for Java tutorial +Thrift Java Tutorial ================================================== +1) Compile the Java library -1) Make sure thrift is compiled, both the compiler and the Java library. You should -be able to verify the following: +thrift/lib/java$ make +or: +thrift/lib/java$ ant -thrift/tutorial/java$ file ../../lib/java/build/libthrift-${version}-${release}.jar -../../lib/java/libthrift.jar: Zip archive data, at least v1.0 to extract +4) Run the tutorial: -thrift/tutorial/java$ file ../../compiler/cpp/thrift -../../compiler/cpp/thrift: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.15, not stripped +start server and client with one step: +thrift/tutorial/java$ make tutorial -thrift/tutorial/java$ ls ../../lib/java/build/ivy/lib/ -commons-lang-2.5.jar junit-4.4.jar servlet-api-2.5.jar slf4j-api-1.5.8.jar slf4j-simple-1.5.8.jar +or: +thrift/tutorial/java$ make tutorialserver +thrift/tutorial/java$ make tutorialclient - -2) Generate code for java: - -thrift/tutorial/java$ cd .. -thrift/tutorial$ thrift -r -gen java tutorial.thrift - -3) Compile example - -thrift/tutorial/java$ ant - -4) Run example: - -thrift/tutorial/java$ ./JavaServer & -thrift/tutorial/java$ ./JavaClient +or: +thrift/tutorial/java$ ant tutorialserver +thrift/tutorial/java$ ant tutorialclient diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml index 2ee11c0c..28c3bd64 100644 --- a/tutorial/java/build.xml +++ b/tutorial/java/build.xml @@ -18,10 +18,10 @@ --> - Thrift Tutorial + Thrift Java Tutorial - + @@ -37,19 +37,71 @@ - + + + + + + + - + - + + + + + + + + + tutorial client simple: + + + + tutorial client secure: + + + + + + + + + + + + + + + + tutorial client simple: + + + + tutorial client secure: + + + + + + + + diff --git a/tutorial/java/JavaClient b/tutorial/js/Makefile.am similarity index 74% rename from tutorial/java/JavaClient rename to tutorial/js/Makefile.am index dae515e4..1f57f205 100755 --- a/tutorial/java/JavaClient +++ b/tutorial/js/Makefile.am @@ -1,5 +1,3 @@ -#!/bin/sh - # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -19,4 +17,15 @@ # under the License. # -java -cp ../../lib/java/build/lib/*:../../lib/java/build/*:tutorial.jar JavaClient $1 +export CLASSPATH + +# Make sure this doesn't fail if ant is not configured. +clean-local: + ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ + $$ANT $(ANT_FLAGS) clean + +check-local: all + $(ANT) $(ANT_FLAGS) test + +tutorialserver: all + $(ANT) $(ANT_FLAGS) tutorialserver diff --git a/tutorial/js/build.xml b/tutorial/js/build.xml index f7577895..348f2293 100644 --- a/tutorial/js/build.xml +++ b/tutorial/js/build.xml @@ -22,11 +22,12 @@ - + + @@ -61,17 +62,25 @@ + + - + + + + + + + diff --git a/tutorial/js/tutorial.html b/tutorial/js/tutorial.html index a34c9f38..e9004214 100644 --- a/tutorial/js/tutorial.html +++ b/tutorial/js/tutorial.html @@ -23,10 +23,10 @@ Thrift Javascript Bindings - Tutorial Example - - - - + + + +