Merge branch 'STORM-2416' of https://github.com/ptgoetz/storm into STORM-2416-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6b2a0bcd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6b2a0bcd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6b2a0bcd Branch: refs/heads/1.x-branch Commit: 6b2a0bcda1ed4460d8a3aca29b90c44a8f373a83 Parents: d6fa3d4 b97ed54 Author: Jungtaek Lim <[email protected]> Authored: Tue Mar 21 07:35:59 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Mar 21 07:35:59 2017 +0900 ---------------------------------------------------------------------- examples/flux-examples/README.md | 93 + examples/flux-examples/pom.xml | 152 + .../flux/examples/StatefulWordCounter.java | 64 + .../storm/flux/examples/TestPrintBolt.java | 39 + .../storm/flux/examples/TestWindowBolt.java | 47 + .../storm/flux/examples/WordCountClient.java | 74 + .../apache/storm/flux/examples/WordCounter.java | 71 + .../src/main/resources/hbase_bolt.properties | 18 + .../src/main/resources/hdfs_bolt.properties | 26 + .../src/main/resources/kafka_spout.yaml | 136 + .../src/main/resources/multilang.yaml | 89 + .../src/main/resources/simple_hbase.yaml | 92 + .../src/main/resources/simple_hdfs.yaml | 105 + .../resources/simple_stateful_wordcount.yaml | 60 + .../src/main/resources/simple_windowing.yaml | 69 + .../src/main/resources/simple_wordcount.yaml | 68 + examples/storm-elasticsearch-examples/pom.xml | 15 - examples/storm-hbase-examples/pom.xml | 14 - examples/storm-hdfs-examples/pom.xml | 14 - examples/storm-hive-examples/pom.xml | 14 - examples/storm-jdbc-examples/pom.xml | 14 - examples/storm-jms-examples/README.markdown | 12 + examples/storm-jms-examples/pom.xml | 151 + .../storm/jms/example/ExampleJmsTopology.java | 131 + .../apache/storm/jms/example/GenericBolt.java | 116 + .../storm/jms/example/JsonTupleProducer.java | 58 + .../storm/jms/example/SpringJmsProvider.java | 74 + .../src/main/resources/jms-activemq.xml | 53 + .../src/main/resources/log4j.properties | 29 + examples/storm-kafka-client-examples/pom.xml | 14 - examples/storm-kafka-examples/pom.xml | 14 - examples/storm-mongodb-examples/pom.xml | 14 - examples/storm-mqtt-examples/pom.xml | 14 - examples/storm-opentsdb-examples/pom.xml | 14 - examples/storm-perf/README.markdown | 50 + examples/storm-perf/pom.xml | 107 + .../main/conf/ConstSpoutIdBoltNullBoltTopo.yaml | 22 + .../src/main/conf/ConstSpoutNullBoltTopo.yaml | 22 + .../src/main/conf/FileReadWordCountTopo.yaml | 23 + .../src/main/conf/HdfsSpoutNullBoltTopo.yaml | 25 + .../storm-perf/src/main/conf/KafkaHdfsTopo.yaml | 26 + .../src/main/conf/KafkaSpoutNullBoltTopo.yaml | 23 + .../src/main/conf/StrGenSpoutHdfsBoltTopo.yaml | 25 + .../perf/ConstSpoutIdBoltNullBoltTopo.java | 101 + .../storm/perf/ConstSpoutNullBoltTopo.java | 107 + .../apache/storm/perf/ConstSpoutOnlyTopo.java | 74 + .../storm/perf/FileReadWordCountTopo.java | 96 + .../storm/perf/HdfsSpoutNullBoltTopo.java | 101 + .../org/apache/storm/perf/KafkaHdfsTopo.java | 168 + .../storm/perf/KafkaSpoutNullBoltTopo.java | 114 + .../storm/perf/StrGenSpoutHdfsBoltTopo.java | 154 + .../org/apache/storm/perf/bolt/CountBolt.java | 58 + .../org/apache/storm/perf/bolt/DevNullBolt.java | 47 + .../java/org/apache/storm/perf/bolt/IdBolt.java | 49 + .../storm/perf/bolt/SplitSentenceBolt.java | 58 + .../org/apache/storm/perf/spout/ConstSpout.java | 70 + .../apache/storm/perf/spout/FileReadSpout.java | 141 + .../apache/storm/perf/spout/StringGenSpout.java | 93 + .../storm/perf/utils/BasicMetricsCollector.java | 309 + .../org/apache/storm/perf/utils/Helper.java | 133 + .../apache/storm/perf/utils/IdentityBolt.java | 51 + .../apache/storm/perf/utils/MetricsSample.java | 248 + .../src/main/sampledata/randomwords.txt | 14049 +++++++++++++++++ examples/storm-pmml-examples/pom.xml | 14 - examples/storm-redis-examples/pom.xml | 14 - examples/storm-solr-examples/pom.xml | 14 - examples/storm-starter/pom.xml | 11 - external/flux/flux-examples/README.md | 93 - external/flux/flux-examples/pom.xml | 146 - .../flux/examples/StatefulWordCounter.java | 64 - .../storm/flux/examples/TestPrintBolt.java | 39 - .../storm/flux/examples/TestWindowBolt.java | 47 - .../storm/flux/examples/WordCountClient.java | 74 - .../apache/storm/flux/examples/WordCounter.java | 71 - .../src/main/resources/hbase_bolt.properties | 18 - .../src/main/resources/hdfs_bolt.properties | 26 - .../src/main/resources/kafka_spout.yaml | 136 - .../src/main/resources/multilang.yaml | 89 - .../src/main/resources/simple_hbase.yaml | 92 - .../src/main/resources/simple_hdfs.yaml | 105 - .../resources/simple_stateful_wordcount.yaml | 60 - .../src/main/resources/simple_windowing.yaml | 69 - .../src/main/resources/simple_wordcount.yaml | 68 - external/flux/pom.xml | 21 - external/sql/storm-sql-core/pom.xml | 4 +- .../storm-sql-external/storm-sql-hdfs/pom.xml | 6 +- .../storm-sql-external/storm-sql-kafka/pom.xml | 6 +- .../storm-sql-mongodb/pom.xml | 6 +- .../storm-sql-external/storm-sql-redis/pom.xml | 6 +- external/sql/storm-sql-runtime/pom.xml | 2 +- external/storm-cassandra/pom.xml | 2 +- external/storm-druid/pom.xml | 42 +- external/storm-elasticsearch/pom.xml | 2 +- external/storm-eventhubs/pom.xml | 42 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs/pom.xml | 2 +- external/storm-hive/pom.xml | 2 +- external/storm-jdbc/pom.xml | 2 +- external/storm-jms/core/pom.xml | 95 - .../apache/storm/jms/JmsMessageProducer.java | 46 - .../java/org/apache/storm/jms/JmsProvider.java | 48 - .../org/apache/storm/jms/JmsTupleProducer.java | 58 - .../java/org/apache/storm/jms/bolt/JmsBolt.java | 219 - .../apache/storm/jms/spout/JmsMessageID.java | 58 - .../org/apache/storm/jms/spout/JmsSpout.java | 382 - .../org/apache/storm/jms/trident/JmsBatch.java | 27 - .../org/apache/storm/jms/trident/JmsState.java | 129 - .../storm/jms/trident/JmsStateFactory.java | 40 - .../apache/storm/jms/trident/JmsUpdater.java | 38 - .../storm/jms/trident/TridentJmsSpout.java | 409 - .../apache/storm/jms/spout/JmsSpoutTest.java | 88 - .../apache/storm/jms/spout/MockJmsProvider.java | 62 - .../jms/spout/MockSpoutOutputCollector.java | 55 - .../storm/jms/spout/MockTupleProducer.java | 47 - .../core/src/test/resources/jndi.properties | 18 - external/storm-jms/examples/README.markdown | 12 - external/storm-jms/examples/pom.xml | 151 - .../storm/jms/example/ExampleJmsTopology.java | 131 - .../apache/storm/jms/example/GenericBolt.java | 116 - .../storm/jms/example/JsonTupleProducer.java | 58 - .../storm/jms/example/SpringJmsProvider.java | 74 - .../src/main/resources/jms-activemq.xml | 53 - .../src/main/resources/log4j.properties | 29 - external/storm-jms/pom.xml | 41 +- .../apache/storm/jms/JmsMessageProducer.java | 46 + .../java/org/apache/storm/jms/JmsProvider.java | 48 + .../org/apache/storm/jms/JmsTupleProducer.java | 58 + .../java/org/apache/storm/jms/bolt/JmsBolt.java | 219 + .../apache/storm/jms/spout/JmsMessageID.java | 58 + .../org/apache/storm/jms/spout/JmsSpout.java | 382 + .../org/apache/storm/jms/trident/JmsBatch.java | 27 + .../org/apache/storm/jms/trident/JmsState.java | 129 + .../storm/jms/trident/JmsStateFactory.java | 40 + .../apache/storm/jms/trident/JmsUpdater.java | 38 + .../storm/jms/trident/TridentJmsSpout.java | 409 + .../apache/storm/jms/spout/JmsSpoutTest.java | 88 + .../apache/storm/jms/spout/MockJmsProvider.java | 62 + .../jms/spout/MockSpoutOutputCollector.java | 55 + .../storm/jms/spout/MockTupleProducer.java | 47 + .../src/test/resources/jndi.properties | 18 + external/storm-kafka-client/pom.xml | 2 +- external/storm-kafka/pom.xml | 2 +- external/storm-kinesis/pom.xml | 2 +- external/storm-metrics/pom.xml | 2 +- external/storm-mongodb/pom.xml | 2 +- external/storm-mqtt/core/pom.xml | 125 - .../java/org/apache/storm/mqtt/MqttLogger.java | 36 - .../java/org/apache/storm/mqtt/MqttMessage.java | 41 - .../apache/storm/mqtt/MqttMessageMapper.java | 44 - .../org/apache/storm/mqtt/MqttTupleMapper.java | 37 - .../org/apache/storm/mqtt/bolt/MqttBolt.java | 105 - .../apache/storm/mqtt/common/MqttOptions.java | 334 - .../apache/storm/mqtt/common/MqttPublisher.java | 67 - .../org/apache/storm/mqtt/common/MqttUtils.java | 88 - .../org/apache/storm/mqtt/common/SslUtils.java | 64 - .../mqtt/mappers/ByteArrayMessageMapper.java | 34 - .../storm/mqtt/mappers/StringMessageMapper.java | 37 - .../apache/storm/mqtt/spout/AckableMessage.java | 71 - .../org/apache/storm/mqtt/spout/MqttSpout.java | 262 - .../storm/mqtt/ssl/DefaultKeyStoreLoader.java | 97 - .../apache/storm/mqtt/ssl/KeyStoreLoader.java | 35 - .../storm/mqtt/trident/MqttPublishFunction.java | 85 - .../storm/mqtt/StormMqttIntegrationTest.java | 152 - external/storm-mqtt/pom.xml | 143 +- .../java/org/apache/storm/mqtt/MqttLogger.java | 36 + .../java/org/apache/storm/mqtt/MqttMessage.java | 41 + .../apache/storm/mqtt/MqttMessageMapper.java | 44 + .../org/apache/storm/mqtt/MqttTupleMapper.java | 37 + .../org/apache/storm/mqtt/bolt/MqttBolt.java | 105 + .../apache/storm/mqtt/common/MqttOptions.java | 334 + .../apache/storm/mqtt/common/MqttPublisher.java | 67 + .../org/apache/storm/mqtt/common/MqttUtils.java | 88 + .../org/apache/storm/mqtt/common/SslUtils.java | 64 + .../mqtt/mappers/ByteArrayMessageMapper.java | 34 + .../storm/mqtt/mappers/StringMessageMapper.java | 37 + .../apache/storm/mqtt/spout/AckableMessage.java | 71 + .../org/apache/storm/mqtt/spout/MqttSpout.java | 262 + .../storm/mqtt/ssl/DefaultKeyStoreLoader.java | 97 + .../apache/storm/mqtt/ssl/KeyStoreLoader.java | 35 + .../storm/mqtt/trident/MqttPublishFunction.java | 85 + .../storm/mqtt/StormMqttIntegrationTest.java | 152 + external/storm-opentsdb/pom.xml | 2 +- external/storm-pmml/pom.xml | 2 +- external/storm-redis/pom.xml | 2 +- external/storm-solr/pom.xml | 2 +- pom.xml | 18 +- storm-dist/binary/src/main/assembly/binary.xml | 236 +- storm-perf/README.markdown | 50 - storm-perf/pom.xml | 122 - .../main/conf/ConstSpoutIdBoltNullBoltTopo.yaml | 22 - .../src/main/conf/ConstSpoutNullBoltTopo.yaml | 22 - .../src/main/conf/FileReadWordCountTopo.yaml | 23 - .../src/main/conf/HdfsSpoutNullBoltTopo.yaml | 25 - storm-perf/src/main/conf/KafkaHdfsTopo.yaml | 26 - .../src/main/conf/KafkaSpoutNullBoltTopo.yaml | 23 - .../src/main/conf/StrGenSpoutHdfsBoltTopo.yaml | 25 - .../perf/ConstSpoutIdBoltNullBoltTopo.java | 101 - .../storm/perf/ConstSpoutNullBoltTopo.java | 107 - .../apache/storm/perf/ConstSpoutOnlyTopo.java | 74 - .../storm/perf/FileReadWordCountTopo.java | 96 - .../storm/perf/HdfsSpoutNullBoltTopo.java | 101 - .../org/apache/storm/perf/KafkaHdfsTopo.java | 168 - .../storm/perf/KafkaSpoutNullBoltTopo.java | 114 - .../storm/perf/StrGenSpoutHdfsBoltTopo.java | 154 - .../org/apache/storm/perf/bolt/CountBolt.java | 58 - .../org/apache/storm/perf/bolt/DevNullBolt.java | 47 - .../java/org/apache/storm/perf/bolt/IdBolt.java | 49 - .../storm/perf/bolt/SplitSentenceBolt.java | 58 - .../org/apache/storm/perf/spout/ConstSpout.java | 70 - .../apache/storm/perf/spout/FileReadSpout.java | 141 - .../apache/storm/perf/spout/StringGenSpout.java | 93 - .../storm/perf/utils/BasicMetricsCollector.java | 309 - .../org/apache/storm/perf/utils/Helper.java | 133 - .../apache/storm/perf/utils/IdentityBolt.java | 51 - .../apache/storm/perf/utils/MetricsSample.java | 248 - storm-perf/src/main/sampledata/randomwords.txt | 14049 ----------------- 216 files changed, 21879 insertions(+), 22515 deletions(-) ----------------------------------------------------------------------
