You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/04/24 22:32:42 UTC
[4/4] storm git commit: STORM-583: incorporate storm-eventhubs into
build (this closes #336)
STORM-583: incorporate storm-eventhubs into build (this closes #336)
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/38638474
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/38638474
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/38638474
Branch: refs/heads/master
Commit: 38638474ef6b045f9e61942b2fd882a8ed4ed8e9
Parents: eff6cfa
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 24 16:29:04 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 24 16:29:04 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
external/storm-eventhubs/README.md | 4 ++++
external/storm-eventhubs/pom.xml | 4 ++--
pom.xml | 1 +
storm-dist/binary/src/main/assembly/binary.xml | 25 +++++++++++++++++++--
5 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/38638474/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd140ea..23920e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-583: Add Microsoft Azure Event Hub spout implementations
* STORM-712: Storm daemons shutdown if OutOfMemoryError occurs in any thread
* STORM-730: remove extra curly brace
* STORM-735: [storm-redis] Upgrade Jedis to 2.7.0
http://git-wip-us.apache.org/repos/asf/storm/blob/38638474/external/storm-eventhubs/README.md
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/README.md b/external/storm-eventhubs/README.md
index ea8076b..1586ca8 100755
--- a/external/storm-eventhubs/README.md
+++ b/external/storm-eventhubs/README.md
@@ -35,3 +35,7 @@ If you want to send messages to all partitions, use "-1" as partitionId.
### Windows Azure Eventhubs ###
http://azure.microsoft.com/en-us/services/event-hubs/
+## Committer Sponsors
+
+ * P. Taylor Goetz ([ptgoetz@apache.org](mailto:ptgoetz@apache.org))
+
http://git-wip-us.apache.org/repos/asf/storm/blob/38638474/external/storm-eventhubs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index bc11dd1..5ed65c7 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,12 +21,12 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>storm-eventhubs</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>storm-eventhubs</name>
<description>EventHubs Storm Spout</description>
http://git-wip-us.apache.org/repos/asf/storm/blob/38638474/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 95aa46d..2e0c898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,7 @@
<module>external/storm-hive</module>
<module>external/storm-jdbc</module>
<module>external/storm-redis</module>
+ <module>external/storm-eventhubs</module>
</modules>
<scm>
http://git-wip-us.apache.org/repos/asf/storm/blob/38638474/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index 61a8027..fef56bb 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -136,7 +136,28 @@
<includes>
<include>README.*</include>
</includes>
- </fileSet>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../../external/storm-eventhubs/target</directory>
+ <outputDirectory>external/storm-eventhubs</outputDirectory>
+ <includes>
+ <include>storm*jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../../external/storm-eventhubs</directory>
+ <outputDirectory>external/storm-eventhubs</outputDirectory>
+ <includes>
+ <include>README.*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../../external/storm-eventhubs/src/main/resources</directory>
+ <outputDirectory>external/storm-eventhubs</outputDirectory>
+ <includes>
+ <include>Config.properties</include>
+ </includes>
+ </fileSet>
<!-- $STORM_HOME/extlib -->
<fileSet>
@@ -160,7 +181,7 @@
<files>
<!-- EXAMPLES -->
<file>
- <source>${project.basedir}/../../examples/storm-starter/target/storm-starter-${project.version}-jar-with-dependencies.jar</source>
+ <source>${project.basedir}/../../examples/storm-starter/target/storm-starter-${project.version}.jar</source>
<outputDirectory>/examples/storm-starter/</outputDirectory>
<destName>storm-starter-topologies-${project.version}.jar</destName>
</file>