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 2018/07/02 13:41:14 UTC
[1/4] storm git commit: Fixed permission issue when trying to launch
example using flux
Repository: storm
Updated Branches:
refs/heads/master 24a6f4367 -> f57a3e415
Fixed permission issue when trying to launch example using flux
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/86dfce16
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/86dfce16
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/86dfce16
Branch: refs/heads/master
Commit: 86dfce168d8312361606bf51be432e046d9c3d18
Parents: ffb60e0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 7 15:51:09 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 27 13:15:46 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/storm/mqtt/examples/CustomMessageMapper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/86dfce16/examples/storm-mqtt-examples/src/main/java/org/apache/storm/mqtt/examples/CustomMessageMapper.java
----------------------------------------------------------------------
diff --git a/examples/storm-mqtt-examples/src/main/java/org/apache/storm/mqtt/examples/CustomMessageMapper.java b/examples/storm-mqtt-examples/src/main/java/org/apache/storm/mqtt/examples/CustomMessageMapper.java
index fa83bf9..b9a7c1f 100644
--- a/examples/storm-mqtt-examples/src/main/java/org/apache/storm/mqtt/examples/CustomMessageMapper.java
+++ b/examples/storm-mqtt-examples/src/main/java/org/apache/storm/mqtt/examples/CustomMessageMapper.java
@@ -72,8 +72,8 @@ public final class CustomMessageMapper implements MqttMessageMapper {
}
/**
- * Utility constructor.
+ * Constructor.
*/
- private CustomMessageMapper() {
+ public CustomMessageMapper() {
}
}
[4/4] storm git commit: Merge branch 'STORM-3061-rmq' of
https://github.com/revans2/incubator-storm into STORM-3061
Posted by bo...@apache.org.
Merge branch 'STORM-3061-rmq' of https://github.com/revans2/incubator-storm into STORM-3061
STORM-3061: rocket, jms, and mqtt updates
This closes #2689
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f57a3e41
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f57a3e41
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f57a3e41
Branch: refs/heads/master
Commit: f57a3e415b9a28798a9c7e85f70f3a1a5212c6a4
Parents: 24a6f43 86dfce1
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Jul 2 08:15:02 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Jul 2 08:15:02 2018 -0500
----------------------------------------------------------------------
examples/storm-jms-examples/pom.xml | 17 ++------
examples/storm-mqtt-examples/pom.xml | 13 ------
.../mqtt/examples/CustomMessageMapper.java | 4 +-
examples/storm-rocketmq-examples/pom.xml | 2 +-
.../rocketmq/topology/WordCountTopology.java | 29 +++++-------
.../rocketmq/trident/WordCountTrident.java | 29 +++++-------
external/storm-jms/pom.xml | 9 +---
external/storm-mqtt/pom.xml | 6 ---
pom.xml | 46 ++++++++++++++++++++
9 files changed, 78 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
[3/4] storm git commit: STORM-3061: Remove unneeded deps from
rocketmq-examples
Posted by bo...@apache.org.
STORM-3061: Remove unneeded deps from rocketmq-examples
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/95db8fc0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/95db8fc0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/95db8fc0
Branch: refs/heads/master
Commit: 95db8fc039d810e1a609145dc6c5c7aa52b4fbab
Parents: d880767
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 23 09:41:48 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 27 13:15:46 2018 -0500
----------------------------------------------------------------------
examples/storm-rocketmq-examples/pom.xml | 2 +-
.../rocketmq/topology/WordCountTopology.java | 29 ++++++++------------
.../rocketmq/trident/WordCountTrident.java | 29 ++++++++------------
3 files changed, 25 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/95db8fc0/examples/storm-rocketmq-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/pom.xml b/examples/storm-rocketmq-examples/pom.xml
index 772d1d0..0d72034 100644
--- a/examples/storm-rocketmq-examples/pom.xml
+++ b/examples/storm-rocketmq-examples/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.storm</groupId>
- <artifactId>storm-server</artifactId>
+ <artifactId>storm-client</artifactId>
<version>${project.version}</version>
<scope>${provided.scope}</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/95db8fc0/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCountTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCountTopology.java b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCountTopology.java
index 923bfde..40d3eb4 100644
--- a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCountTopology.java
+++ b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/topology/WordCountTopology.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.rocketmq.topology;
+import java.util.Properties;
import org.apache.storm.Config;
-import org.apache.storm.LocalCluster;
-import org.apache.storm.LocalCluster.LocalTopology;
import org.apache.storm.StormSubmitter;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.rocketmq.RocketMqConfig;
@@ -33,8 +33,6 @@ import org.apache.storm.rocketmq.spout.RocketMqSpout;
import org.apache.storm.topology.TopologyBuilder;
import org.apache.storm.tuple.Fields;
-import java.util.Properties;
-
public class WordCountTopology {
private static final String WORD_SPOUT = "WORD_SPOUT";
private static final String COUNT_BOLT = "COUNT_BOLT";
@@ -77,19 +75,16 @@ public class WordCountTopology {
public static void main(String[] args) throws Exception {
Config conf = new Config();
conf.setMaxSpoutPending(5);
- if (args.length == 2) {
- try (LocalCluster cluster = new LocalCluster();
- LocalTopology topo = cluster.submitTopology("wordCounter", conf, buildTopology(args[0], args[1]));) {
- Thread.sleep(120 * 1000);
- }
- System.exit(0);
- }
- else if(args.length == 3) {
- conf.setNumWorkers(3);
- StormSubmitter.submitTopology(args[2], conf, buildTopology(args[0], args[1]));
- } else{
+ conf.setNumWorkers(3);
+
+ String topologyName = "wordCounter";
+ if (args.length < 2) {
System.out.println("Usage: WordCountTopology <nameserver addr> <topic> [topology name]");
+ } else {
+ if (args.length > 3) {
+ topologyName = args[2];
+ }
+ StormSubmitter.submitTopology(topologyName, conf, buildTopology(args[0], args[1]));
}
}
-
}
http://git-wip-us.apache.org/repos/asf/storm/blob/95db8fc0/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/trident/WordCountTrident.java
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/trident/WordCountTrident.java b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/trident/WordCountTrident.java
index 3d1f37c..6b73d3f 100644
--- a/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/trident/WordCountTrident.java
+++ b/examples/storm-rocketmq-examples/src/main/java/org/apache/storm/rocketmq/trident/WordCountTrident.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.rocketmq.trident;
+import java.util.Properties;
import org.apache.storm.Config;
-import org.apache.storm.LocalCluster;
-import org.apache.storm.LocalCluster.LocalTopology;
import org.apache.storm.StormSubmitter;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.rocketmq.RocketMqConfig;
@@ -37,8 +37,6 @@ import org.apache.storm.trident.testing.FixedBatchSpout;
import org.apache.storm.tuple.Fields;
import org.apache.storm.tuple.Values;
-import java.util.Properties;
-
public class WordCountTrident {
public static StormTopology buildTopology(String nameserverAddr, String topic){
@@ -76,19 +74,16 @@ public class WordCountTrident {
public static void main(String[] args) throws Exception {
Config conf = new Config();
conf.setMaxSpoutPending(5);
- if (args.length == 2) {
- try (LocalCluster cluster = new LocalCluster();
- LocalTopology topo = cluster.submitTopology("wordCounter", conf, buildTopology(args[0], args[1]));) {
- Thread.sleep(60 * 1000);
- }
- System.exit(0);
- }
- else if(args.length == 3) {
- conf.setNumWorkers(3);
- StormSubmitter.submitTopology(args[2], conf, buildTopology(args[0], args[1]));
- } else{
+ conf.setNumWorkers(3);
+
+ String topologyName = "wordCounter";
+ if (args.length < 2) {
System.out.println("Usage: WordCountTrident <nameserver addr> <topic> [topology name]");
+ } else {
+ if (args.length > 3) {
+ topologyName = args[2];
+ }
+ StormSubmitter.submitTopology(topologyName, conf, buildTopology(args[0], args[1]));
}
}
-
}
[2/4] storm git commit: STORM-3061: mqtt-update
Posted by bo...@apache.org.
STORM-3061: mqtt-update
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ffb60e0f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ffb60e0f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ffb60e0f
Branch: refs/heads/master
Commit: ffb60e0f9f756b25581df73c1061db5e9b2ad823
Parents: 95db8fc
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 23 12:53:44 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 27 13:15:46 2018 -0500
----------------------------------------------------------------------
examples/storm-jms-examples/pom.xml | 17 ++----------
examples/storm-mqtt-examples/pom.xml | 13 ---------
external/storm-jms/pom.xml | 9 ++----
external/storm-mqtt/pom.xml | 6 ----
pom.xml | 46 +++++++++++++++++++++++++++++++
5 files changed, 51 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ffb60e0f/examples/storm-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml
index db88127..bcdda52 100644
--- a/examples/storm-jms-examples/pom.xml
+++ b/examples/storm-jms-examples/pom.xml
@@ -30,7 +30,7 @@
<artifactId>storm-jms-examples</artifactId>
<properties>
- <spring.version>2.5.6</spring.version>
+ <spring.version>5.0.4.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>3.7</version>
+ <version>4.8</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
@@ -72,18 +72,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>activemq-client</artifactId>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/storm/blob/ffb60e0f/examples/storm-mqtt-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml
index e078637..ef545b9 100644
--- a/examples/storm-mqtt-examples/pom.xml
+++ b/examples/storm-mqtt-examples/pom.xml
@@ -44,16 +44,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.storm</groupId>
<artifactId>flux-core</artifactId>
<version>${project.version}</version>
@@ -66,17 +56,14 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>5.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
- <version>5.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
- <version>5.9.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/storm/blob/ffb60e0f/external/storm-jms/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
index c7bcc51..d5121ab 100644
--- a/external/storm-jms/pom.xml
+++ b/external/storm-jms/pom.xml
@@ -25,12 +25,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
-
-
<artifactId>storm-jms</artifactId>
-
-
<developers>
<developer>
<id>ptgoetz</id>
@@ -59,11 +55,10 @@
<scope>test</scope>
</dependency>
- <!-- Active MQ -->
+ <!-- Active MQ for testing JMS-->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.5.1</version>
+ <artifactId>activemq-all</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/storm/blob/ffb60e0f/external/storm-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml
index 703b5da..2ae9e53 100644
--- a/external/storm-mqtt/pom.xml
+++ b/external/storm-mqtt/pom.xml
@@ -29,9 +29,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
-
-
-
<repositories>
<repository>
<id>bintray</id>
@@ -49,19 +46,16 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
- <version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
- <version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/ffb60e0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa4c77c..a694c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,6 +310,7 @@
<solr.version>5.2.1</solr.version>
<jpmml.version>1.0.22</jpmml.version>
<jedis.version>2.9.0</jedis.version>
+ <activemq.version>5.15.3</activemq.version>
<rocketmq.version>4.2.0</rocketmq.version>
<jackson.version>2.9.4</jackson.version>
@@ -1118,6 +1119,51 @@
<artifactId>rocksdbjni</artifactId>
<version>${rocksdb-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ <version>${activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-mqtt</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-all</artifactId>
+ <version>${activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>