You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by df...@apache.org on 2013/03/14 15:12:37 UTC
[1/2] git commit: Update doc: twitter, minor fixes, RC announce
Update doc: twitter, minor fixes, RC announce
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/ff6f7e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/ff6f7e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/ff6f7e28
Branch: refs/heads/dev
Commit: ff6f7e28eda821ba84e8333022d9252da96d0934
Parents: 0638a2a
Author: Daniel Gómez Ferro <df...@apache.org>
Authored: Thu Mar 14 12:11:45 2013 +0100
Committer: Daniel Gómez Ferro <df...@apache.org>
Committed: Thu Mar 14 12:11:45 2013 +0100
----------------------------------------------------------------------
website/content/doc/0.6.0/overview.md | 2 +-
.../content/doc/0.6.0/twitter_trending_example.md | 24 ++++++++++-----
website/content/index.haml | 3 ++
3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ff6f7e28/website/content/doc/0.6.0/overview.md
----------------------------------------------------------------------
diff --git a/website/content/doc/0.6.0/overview.md b/website/content/doc/0.6.0/overview.md
index b4d6840..76e70e2 100644
--- a/website/content/doc/0.6.0/overview.md
+++ b/website/content/doc/0.6.0/overview.md
@@ -65,7 +65,7 @@ S4 0.6 builds on this basis and brings plenty of exciting features, in particula
* by default, the size of the cluster is fixed
* the size of an S4 cluster corresponds to the number of logical **partitions** (sometimes referred to as **tasks**)
-> an ongoing integration with [Apache Helix](http://helix.apache.org) will these limitations and allows a variable number of nodes and a rebalancing of partitions
+> an ongoing integration with [Apache Helix](http://helix.apache.org) will remove these limitations and allow a variable number of nodes and rebalancing the partitions
**Applications**
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ff6f7e28/website/content/doc/0.6.0/twitter_trending_example.md
----------------------------------------------------------------------
diff --git a/website/content/doc/0.6.0/twitter_trending_example.md b/website/content/doc/0.6.0/twitter_trending_example.md
index a870f68..0787d89 100644
--- a/website/content/doc/0.6.0/twitter_trending_example.md
+++ b/website/content/doc/0.6.0/twitter_trending_example.md
@@ -27,9 +27,9 @@ Have a look at the code in these directories. You'll note that:
user=<a twitter username>
password=<matching password>
-* Start a Zookeeper instance. From the S4 base directory, do:
+* Start a Zookeeper clean instance. From the S4 base directory, do:
- ./s4 zkServer
+ ./s4 zkServer -clean
* Define 2 clusters : 1 for deploying the twitter-counter app, and 1 for the adapter app
@@ -42,15 +42,17 @@ Have a look at the code in these directories. You'll note that:
* Start 1 node for the adapter app:
- ./s4 node -c=cluster2 -p=s4.adapter.output.stream=RawStatus
+ ./s4 node -c=cluster2
-* Deploy twitter-counter app (you may also first build the s4r then publish it, as described in the previous section)
+* Build and deploy twitter-counter app
- ./s4 deploy -appName=twitter-counter -c=cluster1 -b=`pwd`/test-apps/twitter-counter/build.gradle
+ ./s4 s4r -b=`pwd`/test-apps/twitter-counter/build.gradle -appClass=org.apache.s4.example.twitter.TwitterCounterApp twitter-counter
+ ./s4 deploy -appName=twitter-counter -c=cluster1 -s4r=`pwd`/test-apps/twitter-counter/build/libs/twitter-counter.s4r
-* Deploy twitter-adapter app. In this example, we don't directly specify the app class of the adapter, we use the deployment approach for apps (remember, the adapter is also an app).
+* Build and deploy twitter-adapter app. In this example, we don't directly specify the app class of the adapter, we use the deployment approach for apps (remember, the adapter is also an app). Notice that the twitter-adapter package also has a different naming scheme. [^1]
- ./s4 deploy -appName=twitter-adapter -c=cluster2 -b=`pwd`/test-apps/twitter-adapter/build.gradle
+ ./s4 s4r -b=`pwd`/test-apps/twitter-adapter/build.gradle -appClass=org.apache.s4.example.twitter.TwitterInputAdapter twitter-adapter
+ ./s4 deploy -appName=twitter-adapter -c=cluster2 -s4r=`pwd`/test-apps/twitter-adapter/build/libs/twitter-adapter-0.0.0-SNAPSHOT.s4r -p=s4.adapter.output.stream=RawStatus
* Observe the current 10 most popular topics in file TopNTopics.txt. The file gets updated at regular intervals, and only outputs topics with a minimum of 10 occurrences, so you may have to wait a little before the file is updated :
@@ -74,4 +76,10 @@ You may also customize the communication and the core layers of S4 by tweaking c
Last, the [javadoc](http://people.apache.org/~mmorel/apache-s4-0.6.0-incubating-doc/javadoc/) will help you when writing applications.
-We hope this will help you start rapidly, and remember: we're happy to help!
\ No newline at end of file
+We hope this will help you start rapidly, and remember: we're happy to help!
+
+----
+
+###Footnotes
+
+[^1]: Modifying the `build.gradle` script you can change several aspects of the build process. By default the name of the `s4r` package is the application name provided in the packaging step, but you can attach the version automatically as in this example.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ff6f7e28/website/content/index.haml
----------------------------------------------------------------------
diff --git a/website/content/index.haml b/website/content/index.haml
index 3962218..5318e4b 100644
--- a/website/content/index.haml
+++ b/website/content/index.haml
@@ -5,6 +5,9 @@ title: Distributed Stream Computing Platform
#about{:class=>"span-18 last"}
#notice{:class=>"span-17 last"}
+ #notice_text= "March 2013: <b>S4 0.6.0 Release Candidate</b> <a href='http://people.apache.org/~mmorel/s4-0.6.0-incubating-release-candidate-2/'>available for download</a>. Check the <a href='/doc/0.6.0'>improved documentation</a>!."
+
+ #notice{:class=>"span-17 last"}
#notice_text= "August 2012: <b>S4 0.5.0 has been released!</b> Get it <a href='/download'>here</a>!."
#notice{:class=>"span-17 last"}