You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/05/28 15:49:59 UTC
[01/12] git commit: Remove trailing whitespace
Repository: incubator-storm
Updated Branches:
refs/heads/security ce6e5d263 -> 698bb9c97
Remove trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2d0b9ad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2d0b9ad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2d0b9ad7
Branch: refs/heads/security
Commit: 2d0b9ad75aaba788d4f60d3b3070e334bba8b922
Parents: 4ac0bec
Author: Michael G. Noll <mi...@apache.org>
Authored: Thu May 22 10:32:06 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Thu May 22 10:32:06 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2d0b9ad7/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index f7f763c..7fcd68b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
<version>0.9.2-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<packaging>jar</packaging>
<artifactId>storm-kafka</artifactId>
<name>storm-kafka</name>
[05/12] git commit: Use descriptive names for hyperlinks to mailing
list archives
Posted by bo...@apache.org.
Use descriptive names for hyperlinks to mailing list archives
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/021f5d5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/021f5d5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/021f5d5d
Branch: refs/heads/security
Commit: 021f5d5d55eb91137bda2b1f5be316ed60a5140c
Parents: 36ce171
Author: Michael G. Noll <mi...@apache.org>
Authored: Thu May 22 11:10:58 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Thu May 22 11:10:58 2014 +0200
----------------------------------------------------------------------
README.markdown | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/021f5d5d/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 820b388..603fe93 100644
--- a/README.markdown
+++ b/README.markdown
@@ -20,14 +20,14 @@ Storm users should send messages and subscribe to [user@storm.incubator.apache.o
You can subscribe to this list by sending an email to [user-subscribe@storm.incubator.apache.org](mailto:user-subscribe@storm.incubator.apache.org). Likewise, you can cancel a subscription by sending an email to [user-unsubscribe@storm.incubator.apache.org](mailto:user-unsubscribe@storm.incubator.apache.org).
-You can view the archives of the mailing list [here](http://mail-archives.apache.org/mod_mbox/incubator-storm-user/).
+You can also [browse the archives of the storm-user mailing list](http://mail-archives.apache.org/mod_mbox/incubator-storm-user/).
### Storm Developers
Storm developers should send messages and subscribe to [dev@storm.incubator.apache.org](mailto:dev@storm.incubator.apache.org).
You can subscribe to this list by sending an email to [dev-subscribe@storm.incubator.apache.org](mailto:dev-subscribe@storm.incubator.apache.org). Likewise, you can cancel a subscription by sending an email to [dev-unsubscribe@storm.incubator.apache.org](mailto:dev-unsubscribe@storm.incubator.apache.org).
-You can view the archives of the mailing list [here](http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/).
+You can also [browse the archives of the storm-dev mailing list](http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/).
### Which list should I send/subscribe to?
If you are using a pre-built binary distribution of Storm, then chances are you should send questions, comments, storm-related announcements, etc. to [user@storm.apache.incubator.org](user@storm.apache.incubator.org).
[10/12] git commit: storm-starter: explain how to build/install Storm
locally to run storm-starter from master branch
Posted by bo...@apache.org.
storm-starter: explain how to build/install Storm locally to run
storm-starter from master branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/452838f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/452838f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/452838f2
Branch: refs/heads/security
Commit: 452838f2ab5f2dbe72a77ab6bfc57529da1f4e0c
Parents: ddc6705
Author: Michael G. Noll <mi...@apache.org>
Authored: Tue May 27 18:31:03 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Tue May 27 18:31:03 2014 +0200
----------------------------------------------------------------------
examples/storm-starter/README.markdown | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/452838f2/examples/storm-starter/README.markdown
----------------------------------------------------------------------
diff --git a/examples/storm-starter/README.markdown b/examples/storm-starter/README.markdown
index e62cc34..b7c1798 100644
--- a/examples/storm-starter/README.markdown
+++ b/examples/storm-starter/README.markdown
@@ -31,6 +31,7 @@ code.
## storm-starter overview
+
storm-starter contains a variety of examples of using Storm. If this is your first time working with Storm, check out
these topologies first:
@@ -57,6 +58,20 @@ Install [Maven](http://maven.apache.org/) (preferably version 3.x) by following
the [Maven installation instructions](http://maven.apache.org/download.cgi).
+## Build and install Storm jars locally
+
+If you are using the latest development version of Storm, e.g. by having cloned the Storm git repository,
+then you must first perform a local build of Storm itself. Otherwise you will run into Maven errors such as
+`Could not resolve dependencies for project `org.apache.storm:storm-starter:<storm-version>-SNAPSHOT`.
+
+ # Must be run from the top-level directory of the Storm code repository
+ $ mvn clean install -DskipTests=true
+
+This command will build Storm locally and install its jar files to your user's `$HOME/.m2/repository/`. When you run
+the Maven command to build and run storm-starter (see below), Maven will then be able to find the corresponding version
+of Storm in this local Maven repository at `$HOME/.m2/repository`.
+
+
## Running topologies with Maven
storm-starter topologies can be run with the maven-exec-plugin. For example, to
[06/12] git commit: STORM-331: Update version of Kafka dependency to
0.8.1.1
Posted by bo...@apache.org.
STORM-331: Update version of Kafka dependency to 0.8.1.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/3bf4475e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/3bf4475e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/3bf4475e
Branch: refs/heads/security
Commit: 3bf4475ef88cea2fdc70e85051b5f8301ec4a12c
Parents: 36ce171
Author: Michael G. Noll <mn...@verisign.com>
Authored: Thu May 22 11:12:17 2014 +0200
Committer: Michael G. Noll <mn...@verisign.com>
Committed: Thu May 22 11:12:17 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/3bf4475e/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index fef74e8..1210dcd 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>${kafkaArtifact}</artifactId>
- <version>0.8.1</version>
+ <version>0.8.1.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
[11/12] git commit: Fix markdown syntax in storm-starter README
Posted by bo...@apache.org.
Fix markdown syntax in storm-starter README
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/bfdce7aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/bfdce7aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/bfdce7aa
Branch: refs/heads/security
Commit: bfdce7aae74c2b467f71228a00c30fb3281eea7a
Parents: 452838f
Author: Michael G. Noll <mi...@apache.org>
Authored: Wed May 28 08:59:11 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Wed May 28 08:59:11 2014 +0200
----------------------------------------------------------------------
examples/storm-starter/README.markdown | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bfdce7aa/examples/storm-starter/README.markdown
----------------------------------------------------------------------
diff --git a/examples/storm-starter/README.markdown b/examples/storm-starter/README.markdown
index b7c1798..98a9749 100644
--- a/examples/storm-starter/README.markdown
+++ b/examples/storm-starter/README.markdown
@@ -62,7 +62,7 @@ the [Maven installation instructions](http://maven.apache.org/download.cgi).
If you are using the latest development version of Storm, e.g. by having cloned the Storm git repository,
then you must first perform a local build of Storm itself. Otherwise you will run into Maven errors such as
-`Could not resolve dependencies for project `org.apache.storm:storm-starter:<storm-version>-SNAPSHOT`.
+"Could not resolve dependencies for project `org.apache.storm:storm-starter:<storm-version>-SNAPSHOT`".
# Must be run from the top-level directory of the Storm code repository
$ mvn clean install -DskipTests=true
[03/12] git commit: Improve Markdown formatting
Posted by bo...@apache.org.
Improve Markdown formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/60c472f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/60c472f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/60c472f9
Branch: refs/heads/security
Commit: 60c472f9049e86d565ff6cf6e22ed355c6366f58
Parents: 4f0d45e
Author: Michael G. Noll <mi...@apache.org>
Authored: Thu May 22 10:54:18 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Thu May 22 10:54:18 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/README.md | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/60c472f9/external/storm-kafka/README.md
----------------------------------------------------------------------
diff --git a/external/storm-kafka/README.md b/external/storm-kafka/README.md
index 726cff6..00eb238 100644
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@ -4,22 +4,17 @@ Storm Kafka
Provides core storm and Trident spout implementations for consuming data from Apache Kafka 0.8.x.
-
-##Usage Example
+## Usage Example
```java
-
- TridentTopology topology = new TridentTopology();
-
- BrokerHosts zk = new ZkHosts("localhost");
-
- TridentKafkaConfig spoutConf = new TridentKafkaConfig(zk, "test-topic");
- spoutConf.scheme = new SchemeAsMultiScheme(new StringScheme());
- OpaqueTridentKafkaSpout spout = new OpaqueTridentKafkaSpout(spoutConf);
-
-
+TridentTopology topology = new TridentTopology();
+BrokerHosts zk = new ZkHosts("localhost");
+TridentKafkaConfig spoutConf = new TridentKafkaConfig(zk, "test-topic");
+spoutConf.scheme = new SchemeAsMultiScheme(new StringScheme());
+OpaqueTridentKafkaSpout spout = new OpaqueTridentKafkaSpout(spoutConf);
```
+
## Committer Sponsors
- * P. Taylor Goetz ([ptgoetz@apache.org](mailto:ptgoetz@apache.org))
\ No newline at end of file
+ * P. Taylor Goetz ([ptgoetz@apache.org](mailto:ptgoetz@apache.org))
[09/12] git commit: Remove trailing whitespace
Posted by bo...@apache.org.
Remove trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/ddc67051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/ddc67051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/ddc67051
Branch: refs/heads/security
Commit: ddc67051745c383b84fc0ec64b48a44b84ba1668
Parents: 4091e4b
Author: Michael G. Noll <mi...@apache.org>
Authored: Tue May 27 18:22:52 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Tue May 27 18:22:52 2014 +0200
----------------------------------------------------------------------
examples/storm-starter/README.markdown | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/ddc67051/examples/storm-starter/README.markdown
----------------------------------------------------------------------
diff --git a/examples/storm-starter/README.markdown b/examples/storm-starter/README.markdown
index 88dd3af..e62cc34 100644
--- a/examples/storm-starter/README.markdown
+++ b/examples/storm-starter/README.markdown
@@ -67,8 +67,8 @@ compile and run `WordCountTopology` in local mode, use the command:
You can also run clojure topologies with Maven:
$ mvn compile exec:java -Dstorm.topology=storm.starter.clj.word_count
-
-In Windows parameter should be quoted, like this:
+
+In Windows parameter should be quoted, like this:
$ mvn compile exec:java "-Dstorm.topology=storm.starter.clj.word_count"
[07/12] git commit: Merge branch 'STORM-331' of
github.com:miguno/incubator-storm into STORM-331
Posted by bo...@apache.org.
Merge branch 'STORM-331' of github.com:miguno/incubator-storm into STORM-331
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/76c5a6c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/76c5a6c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/76c5a6c2
Branch: refs/heads/security
Commit: 76c5a6c2911c7b2524bd563d0e63d1a2d8ab228c
Parents: 021f5d5 3bf4475
Author: Michael G. Noll <mi...@apache.org>
Authored: Tue May 27 10:20:08 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Tue May 27 10:20:08 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[04/12] git commit: Explain how to build storm-kafka for Scala 2.10
Posted by bo...@apache.org.
Explain how to build storm-kafka for Scala 2.10
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/36ce1712
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/36ce1712
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/36ce1712
Branch: refs/heads/security
Commit: 36ce17126159e47e316bb4b1b5e6984faf04f841
Parents: 60c472f
Author: Michael G. Noll <mi...@apache.org>
Authored: Thu May 22 10:55:05 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Thu May 22 10:55:05 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/README.md | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/36ce1712/external/storm-kafka/README.md
----------------------------------------------------------------------
diff --git a/external/storm-kafka/README.md b/external/storm-kafka/README.md
index 00eb238..5714cd5 100644
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@ -15,6 +15,14 @@ OpaqueTridentKafkaSpout spout = new OpaqueTridentKafkaSpout(spoutConf);
```
+## Building storm-kafka for Scala 2.10
+
+By default storm-kafka is built against Scala 2.9.2 (see [pom.xml](pom.xml)). You can build storm-kafka for Scala 2.10
+by activating the `Scala-2.10` maven profile:
+
+ $ mvn install -P Scala-2.10
+
+
## Committer Sponsors
* P. Taylor Goetz ([ptgoetz@apache.org](mailto:ptgoetz@apache.org))
[02/12] git commit: Replace tabs with spaces
Posted by bo...@apache.org.
Replace tabs with spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4f0d45e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4f0d45e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4f0d45e4
Branch: refs/heads/security
Commit: 4f0d45e4e9b4cb5c926c514e026ab836fb951a62
Parents: 2d0b9ad
Author: Michael G. Noll <mi...@apache.org>
Authored: Thu May 22 10:32:22 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Thu May 22 10:32:22 2014 +0200
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4f0d45e4/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 7fcd68b..fef74e8 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -27,7 +27,7 @@
</parent>
<packaging>jar</packaging>
- <artifactId>storm-kafka</artifactId>
+ <artifactId>storm-kafka</artifactId>
<name>storm-kafka</name>
<description>Storm Spouts for Apache Kafka</description>
<properties>
[08/12] git commit: STORM-331: Add CHANGELOG entry
Posted by bo...@apache.org.
STORM-331: Add CHANGELOG entry
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4091e4b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4091e4b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4091e4b3
Branch: refs/heads/security
Commit: 4091e4b3a758b7718a0f27aa0a61a9d2b8561d21
Parents: 76c5a6c
Author: Michael G. Noll <mi...@apache.org>
Authored: Tue May 27 10:25:09 2014 +0200
Committer: Michael G. Noll <mi...@apache.org>
Committed: Tue May 27 10:25:09 2014 +0200
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4091e4b3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a1ab8d..960473c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-331: Update the Kafka dependency of storm-kafka to 0.8.1.1
* STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
* STORM-309: storm-starter Readme: windows documentation update
* STORM-318: update storm-kafka to use apache curator-2.4.0
[12/12] git commit: Merge branch 'master' into security
Posted by bo...@apache.org.
Merge branch 'master' into security
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/698bb9c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/698bb9c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/698bb9c9
Branch: refs/heads/security
Commit: 698bb9c9788b82d4127d861fb3ecf06a06b683c2
Parents: ce6e5d2 bfdce7a
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed May 28 08:45:22 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed May 28 08:45:22 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 4 ++--
examples/storm-starter/README.markdown | 19 +++++++++++++++++--
external/storm-kafka/README.md | 23 +++++++++++++----------
external/storm-kafka/pom.xml | 8 ++++----
5 files changed, 37 insertions(+), 18 deletions(-)
----------------------------------------------------------------------