From 95db8fc039d810e1a609145dc6c5c7aa52b4fbab Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Wed, 23 May 2018 09:41:48 -0500 Subject: [PATCH 1/3] STORM-3061: Remove unneeded deps from rocketmq-examples --- examples/storm-rocketmq-examples/pom.xml | 2 +- .../rocketmq/topology/WordCountTopology.java | 29 ++++++++----------- .../rocketmq/trident/WordCountTrident.java | 29 ++++++++----------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/examples/storm-rocketmq-examples/pom.xml b/examples/storm-rocketmq-examples/pom.xml index 772d1d058fa..0d7203416d7 100644 --- a/examples/storm-rocketmq-examples/pom.xml +++ b/examples/storm-rocketmq-examples/pom.xml @@ -30,7 +30,7 @@ org.apache.storm - storm-server + storm-client ${project.version} ${provided.scope} 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 923bfde0088..40d3eb41672 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.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 static StormTopology buildTopology(String nameserverAddr, String topic){ 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 [topology name]"); + } else { + if (args.length > 3) { + topologyName = args[2]; + } + StormSubmitter.submitTopology(topologyName, conf, buildTopology(args[0], args[1])); } } - } 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 3d1f37ca822..6b73d3fe185 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.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 static StormTopology buildTopology(String nameserverAddr, String topic){ 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 [topology name]"); + } else { + if (args.length > 3) { + topologyName = args[2]; + } + StormSubmitter.submitTopology(topologyName, conf, buildTopology(args[0], args[1])); } } - } From ffb60e0f9f756b25581df73c1061db5e9b2ad823 Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Wed, 23 May 2018 12:53:44 -0500 Subject: [PATCH 2/3] STORM-3061: mqtt-update --- 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(-) diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml index db88127267e..bcdda52b717 100644 --- a/examples/storm-jms-examples/pom.xml +++ b/examples/storm-jms-examples/pom.xml @@ -30,7 +30,7 @@ storm-jms-examples - 2.5.6 + 5.0.4.RELEASE @@ -56,7 +56,7 @@ org.apache.xbean xbean-spring - 3.7 + 4.8 org.apache.storm @@ -72,18 +72,7 @@ org.apache.activemq - activemq-core - 5.4.0 - - - org.slf4j - slf4j-api - - - log4j - log4j - - + activemq-client diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml index e078637358d..ef545b905c7 100644 --- a/examples/storm-mqtt-examples/pom.xml +++ b/examples/storm-mqtt-examples/pom.xml @@ -43,16 +43,6 @@ storm-mqtt ${project.version} - - org.apache.logging.log4j - log4j-core - 2.1 - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.1 - org.apache.storm flux-core @@ -66,17 +56,14 @@ org.apache.activemq activemq-broker - 5.9.0 org.apache.activemq activemq-mqtt - 5.9.0 org.apache.activemq activemq-kahadb-store - 5.9.0 diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml index c7bcc51ccda..d5121ab9d7d 100644 --- a/external/storm-jms/pom.xml +++ b/external/storm-jms/pom.xml @@ -25,12 +25,8 @@ ../../pom.xml - - storm-jms - - ptgoetz @@ -59,11 +55,10 @@ test - + org.apache.activemq - activemq-core - 5.5.1 + activemq-all test diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml index 703b5da6180..2ae9e53f89e 100644 --- a/external/storm-mqtt/pom.xml +++ b/external/storm-mqtt/pom.xml @@ -29,9 +29,6 @@ ../../pom.xml - - - bintray @@ -49,19 +46,16 @@ org.apache.activemq activemq-broker - 5.9.0 test org.apache.activemq activemq-mqtt - 5.9.0 test org.apache.activemq activemq-kahadb-store - 5.9.0 test diff --git a/pom.xml b/pom.xml index fa4c77cec57..a694c9c1230 100644 --- a/pom.xml +++ b/pom.xml @@ -310,6 +310,7 @@ 5.2.1 1.0.22 2.9.0 + 5.15.3 4.2.0 2.9.4 @@ -1118,6 +1119,51 @@ rocksdbjni ${rocksdb-version} + + org.apache.activemq + activemq-client + ${activemq.version} + + + org.slf4j + slf4j-api + + + log4j + log4j + + + + + org.apache.activemq + activemq-broker + ${activemq.version} + + + org.apache.activemq + activemq-mqtt + ${activemq.version} + + + org.apache.activemq + activemq-kahadb-store + ${activemq.version} + + + org.apache.activemq + activemq-all + ${activemq.version} + + + org.slf4j + slf4j-api + + + log4j + log4j + + + From 86dfce168d8312361606bf51be432e046d9c3d18 Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Thu, 7 Jun 2018 15:51:09 -0500 Subject: [PATCH 3/3] Fixed permission issue when trying to launch example using flux --- .../org/apache/storm/mqtt/examples/CustomMessageMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fa83bf9a97a..b9a7c1fb0ae 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 Fields outputFields() { } /** - * Utility constructor. + * Constructor. */ - private CustomMessageMapper() { + public CustomMessageMapper() { } }