From 2a369e408c18adf1045f57382d30fe18dacdbb19 Mon Sep 17 00:00:00 2001 From: "P. Taylor Goetz" Date: Thu, 16 Mar 2017 15:14:26 -0400 Subject: [PATCH] STORM-2416 Release Packaging Improvements --- .../flux => examples}/flux-examples/README.md | 0 .../flux => examples}/flux-examples/pom.xml | 10 +- .../flux/examples/StatefulWordCounter.java | 0 .../storm/flux/examples/TestPrintBolt.java | 0 .../storm/flux/examples/TestWindowBolt.java | 0 .../storm/flux/examples/WordCountClient.java | 0 .../storm/flux/examples/WordCounter.java | 0 .../src/main/resources/hbase_bolt.properties | 0 .../src/main/resources/hdfs_bolt.properties | 0 .../src/main/resources/kafka_spout.yaml | 0 .../src/main/resources/multilang.yaml | 0 .../src/main/resources/simple_hbase.yaml | 0 .../src/main/resources/simple_hdfs.yaml | 0 .../resources/simple_stateful_wordcount.yaml | 0 .../src/main/resources/simple_windowing.yaml | 0 .../src/main/resources/simple_wordcount.yaml | 0 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 - .../storm-jms-examples}/README.markdown | 0 .../storm-jms-examples}/pom.xml | 6 +- .../storm/jms/example/ExampleJmsTopology.java | 0 .../apache/storm/jms/example/GenericBolt.java | 0 .../storm/jms/example/JsonTupleProducer.java | 0 .../storm/jms/example/SpringJmsProvider.java | 0 .../src/main/resources/jms-activemq.xml | 0 .../src/main/resources/log4j.properties | 0 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 - .../storm-perf}/README.markdown | 0 {storm-perf => examples/storm-perf}/pom.xml | 23 +- .../conf/ConstSpoutIdBoltNullBoltTopo.yaml | 0 .../src/main/conf/ConstSpoutNullBoltTopo.yaml | 0 .../src/main/conf/FileReadWordCountTopo.yaml | 0 .../src/main/conf/HdfsSpoutNullBoltTopo.yaml | 0 .../src/main/conf/KafkaHdfsTopo.yaml | 0 .../src/main/conf/KafkaSpoutNullBoltTopo.yaml | 0 .../main/conf/StrGenSpoutHdfsBoltTopo.yaml | 0 .../perf/ConstSpoutIdBoltNullBoltTopo.java | 0 .../storm/perf/ConstSpoutNullBoltTopo.java | 0 .../apache/storm/perf/ConstSpoutOnlyTopo.java | 0 .../storm/perf/FileReadWordCountTopo.java | 0 .../storm/perf/HdfsSpoutNullBoltTopo.java | 0 .../org/apache/storm/perf/KafkaHdfsTopo.java | 0 .../storm/perf/KafkaSpoutNullBoltTopo.java | 0 .../storm/perf/StrGenSpoutHdfsBoltTopo.java | 0 .../org/apache/storm/perf/bolt/CountBolt.java | 0 .../apache/storm/perf/bolt/DevNullBolt.java | 0 .../org/apache/storm/perf/bolt/IdBolt.java | 0 .../storm/perf/bolt/SplitSentenceBolt.java | 0 .../apache/storm/perf/spout/ConstSpout.java | 0 .../storm/perf/spout/FileReadSpout.java | 0 .../storm/perf/spout/StringGenSpout.java | 0 .../perf/utils/BasicMetricsCollector.java | 0 .../org/apache/storm/perf/utils/Helper.java | 0 .../apache/storm/perf/utils/IdentityBolt.java | 0 .../storm/perf/utils/MetricsSample.java | 0 .../src/main/sampledata/randomwords.txt | 0 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/pom.xml | 21 -- external/sql/storm-sql-core/pom.xml | 4 +- .../storm-sql-external/storm-sql-hdfs/pom.xml | 6 +- .../storm-sql-kafka/pom.xml | 6 +- .../storm-sql-mongodb/pom.xml | 6 +- .../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 | 86 ++---- 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 ------- external/storm-jms/pom.xml | 48 +++- .../apache/storm/jms/JmsMessageProducer.java | 0 .../org/apache/storm/jms/JmsProvider.java | 0 .../apache/storm/jms/JmsTupleProducer.java | 0 .../org/apache/storm/jms/bolt/JmsBolt.java | 0 .../apache/storm/jms/spout/JmsMessageID.java | 0 .../org/apache/storm/jms/spout/JmsSpout.java | 0 .../apache/storm/jms/trident/JmsBatch.java | 0 .../apache/storm/jms/trident/JmsState.java | 0 .../storm/jms/trident/JmsStateFactory.java | 0 .../apache/storm/jms/trident/JmsUpdater.java | 0 .../storm/jms/trident/TridentJmsSpout.java | 0 .../apache/storm/jms/spout/JmsSpoutTest.java | 0 .../storm/jms/spout/MockJmsProvider.java | 0 .../jms/spout/MockSpoutOutputCollector.java | 0 .../storm/jms/spout/MockTupleProducer.java | 0 .../src/test/resources/jndi.properties | 0 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 | 148 +++++----- external/storm-mqtt/core/pom.xml | 126 --------- external/storm-mqtt/pom.xml | 144 +++++++--- .../org/apache/storm/mqtt/MqttLogger.java | 0 .../org/apache/storm/mqtt/MqttMessage.java | 0 .../apache/storm/mqtt/MqttMessageMapper.java | 0 .../apache/storm/mqtt/MqttTupleMapper.java | 0 .../org/apache/storm/mqtt/bolt/MqttBolt.java | 0 .../apache/storm/mqtt/common/MqttOptions.java | 0 .../storm/mqtt/common/MqttPublisher.java | 0 .../apache/storm/mqtt/common/MqttUtils.java | 0 .../apache/storm/mqtt/common/SslUtils.java | 0 .../mqtt/mappers/ByteArrayMessageMapper.java | 0 .../mqtt/mappers/StringMessageMapper.java | 0 .../storm/mqtt/spout/AckableMessage.java | 0 .../apache/storm/mqtt/spout/MqttSpout.java | 0 .../storm/mqtt/ssl/DefaultKeyStoreLoader.java | 0 .../apache/storm/mqtt/ssl/KeyStoreLoader.java | 0 .../mqtt/trident/MqttPublishFunction.java | 0 .../storm/mqtt/StormMqttIntegrationTest.java | 0 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 +- .../src/main/assembly/binary.xml | 254 ++---------------- 130 files changed, 332 insertions(+), 941 deletions(-) rename {external/flux => examples}/flux-examples/README.md (100%) rename {external/flux => examples}/flux-examples/pom.xml (94%) rename {external/flux => examples}/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java (100%) rename {external/flux => examples}/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java (100%) rename {external/flux => examples}/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java (100%) rename {external/flux => examples}/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java (100%) rename {external/flux => examples}/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java (100%) rename {external/flux => examples}/flux-examples/src/main/resources/hbase_bolt.properties (100%) rename {external/flux => examples}/flux-examples/src/main/resources/hdfs_bolt.properties (100%) rename {external/flux => examples}/flux-examples/src/main/resources/kafka_spout.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/multilang.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/simple_hbase.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/simple_hdfs.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/simple_stateful_wordcount.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/simple_windowing.yaml (100%) rename {external/flux => examples}/flux-examples/src/main/resources/simple_wordcount.yaml (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/README.markdown (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/pom.xml (97%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/java/org/apache/storm/jms/example/GenericBolt.java (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/resources/jms-activemq.xml (100%) rename {external/storm-jms/examples => examples/storm-jms-examples}/src/main/resources/log4j.properties (100%) rename {storm-perf => examples/storm-perf}/README.markdown (100%) rename {storm-perf => examples/storm-perf}/pom.xml (86%) rename {storm-perf => examples/storm-perf}/src/main/conf/ConstSpoutIdBoltNullBoltTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/ConstSpoutNullBoltTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/FileReadWordCountTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/HdfsSpoutNullBoltTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/KafkaHdfsTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/KafkaSpoutNullBoltTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/conf/StrGenSpoutHdfsBoltTopo.yaml (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/ConstSpoutIdBoltNullBoltTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/ConstSpoutNullBoltTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/ConstSpoutOnlyTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/FileReadWordCountTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/HdfsSpoutNullBoltTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/KafkaHdfsTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/KafkaSpoutNullBoltTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/StrGenSpoutHdfsBoltTopo.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/bolt/CountBolt.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/bolt/DevNullBolt.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/bolt/IdBolt.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/bolt/SplitSentenceBolt.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/spout/ConstSpout.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/spout/FileReadSpout.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/spout/StringGenSpout.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/utils/BasicMetricsCollector.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/utils/Helper.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/utils/IdentityBolt.java (100%) rename {storm-perf => examples/storm-perf}/src/main/java/org/apache/storm/perf/utils/MetricsSample.java (100%) rename {storm-perf => examples/storm-perf}/src/main/sampledata/randomwords.txt (100%) delete mode 100644 external/storm-jms/core/pom.xml rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/JmsMessageProducer.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/JmsProvider.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/JmsTupleProducer.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/spout/JmsMessageID.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/spout/JmsSpout.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/trident/JmsBatch.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/trident/JmsState.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/trident/JmsUpdater.java (100%) rename external/storm-jms/{core => }/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java (100%) rename external/storm-jms/{core => }/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java (100%) rename external/storm-jms/{core => }/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java (100%) rename external/storm-jms/{core => }/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java (100%) rename external/storm-jms/{core => }/src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java (100%) rename external/storm-jms/{core => }/src/test/resources/jndi.properties (100%) delete mode 100644 external/storm-mqtt/core/pom.xml rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/MqttLogger.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/MqttMessage.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/MqttMessageMapper.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/MqttTupleMapper.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/common/MqttOptions.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/common/MqttPublisher.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/common/MqttUtils.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/common/SslUtils.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/ssl/DefaultKeyStoreLoader.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/ssl/KeyStoreLoader.java (100%) rename external/storm-mqtt/{core => }/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java (100%) rename external/storm-mqtt/{core => }/src/test/java/org/apache/storm/mqtt/StormMqttIntegrationTest.java (100%) diff --git a/external/flux/flux-examples/README.md b/examples/flux-examples/README.md similarity index 100% rename from external/flux/flux-examples/README.md rename to examples/flux-examples/README.md diff --git a/external/flux/flux-examples/pom.xml b/examples/flux-examples/pom.xml similarity index 94% rename from external/flux/flux-examples/pom.xml rename to examples/flux-examples/pom.xml index ef56ebd5712..14ad00c9bd7 100644 --- a/external/flux/flux-examples/pom.xml +++ b/examples/flux-examples/pom.xml @@ -19,10 +19,10 @@ 4.0.0 + storm org.apache.storm - flux 2.0.0-SNAPSHOT - ../pom.xml + ../../pom.xml flux-examples @@ -31,6 +31,12 @@ flux-examples + + org.apache.storm + storm-core + ${project.version} + ${provided.scope} + org.apache.storm flux-core diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java b/examples/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java similarity index 100% rename from external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java rename to examples/flux-examples/src/main/java/org/apache/storm/flux/examples/StatefulWordCounter.java diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java b/examples/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java similarity index 100% rename from external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java rename to examples/flux-examples/src/main/java/org/apache/storm/flux/examples/TestPrintBolt.java diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java b/examples/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java similarity index 100% rename from external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java rename to examples/flux-examples/src/main/java/org/apache/storm/flux/examples/TestWindowBolt.java diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java b/examples/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java similarity index 100% rename from external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java rename to examples/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCountClient.java diff --git a/external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java b/examples/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java similarity index 100% rename from external/flux/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java rename to examples/flux-examples/src/main/java/org/apache/storm/flux/examples/WordCounter.java diff --git a/external/flux/flux-examples/src/main/resources/hbase_bolt.properties b/examples/flux-examples/src/main/resources/hbase_bolt.properties similarity index 100% rename from external/flux/flux-examples/src/main/resources/hbase_bolt.properties rename to examples/flux-examples/src/main/resources/hbase_bolt.properties diff --git a/external/flux/flux-examples/src/main/resources/hdfs_bolt.properties b/examples/flux-examples/src/main/resources/hdfs_bolt.properties similarity index 100% rename from external/flux/flux-examples/src/main/resources/hdfs_bolt.properties rename to examples/flux-examples/src/main/resources/hdfs_bolt.properties diff --git a/external/flux/flux-examples/src/main/resources/kafka_spout.yaml b/examples/flux-examples/src/main/resources/kafka_spout.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/kafka_spout.yaml rename to examples/flux-examples/src/main/resources/kafka_spout.yaml diff --git a/external/flux/flux-examples/src/main/resources/multilang.yaml b/examples/flux-examples/src/main/resources/multilang.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/multilang.yaml rename to examples/flux-examples/src/main/resources/multilang.yaml diff --git a/external/flux/flux-examples/src/main/resources/simple_hbase.yaml b/examples/flux-examples/src/main/resources/simple_hbase.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/simple_hbase.yaml rename to examples/flux-examples/src/main/resources/simple_hbase.yaml diff --git a/external/flux/flux-examples/src/main/resources/simple_hdfs.yaml b/examples/flux-examples/src/main/resources/simple_hdfs.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/simple_hdfs.yaml rename to examples/flux-examples/src/main/resources/simple_hdfs.yaml diff --git a/external/flux/flux-examples/src/main/resources/simple_stateful_wordcount.yaml b/examples/flux-examples/src/main/resources/simple_stateful_wordcount.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/simple_stateful_wordcount.yaml rename to examples/flux-examples/src/main/resources/simple_stateful_wordcount.yaml diff --git a/external/flux/flux-examples/src/main/resources/simple_windowing.yaml b/examples/flux-examples/src/main/resources/simple_windowing.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/simple_windowing.yaml rename to examples/flux-examples/src/main/resources/simple_windowing.yaml diff --git a/external/flux/flux-examples/src/main/resources/simple_wordcount.yaml b/examples/flux-examples/src/main/resources/simple_wordcount.yaml similarity index 100% rename from external/flux/flux-examples/src/main/resources/simple_wordcount.yaml rename to examples/flux-examples/src/main/resources/simple_wordcount.yaml diff --git a/examples/storm-elasticsearch-examples/pom.xml b/examples/storm-elasticsearch-examples/pom.xml index 0c312fc842f..f853ec4af89 100644 --- a/examples/storm-elasticsearch-examples/pom.xml +++ b/examples/storm-elasticsearch-examples/pom.xml @@ -26,21 +26,6 @@ storm-elasticsearch-examples - - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-hbase-examples/pom.xml b/examples/storm-hbase-examples/pom.xml index 1b26e923f2e..8b1c15cf610 100644 --- a/examples/storm-hbase-examples/pom.xml +++ b/examples/storm-hbase-examples/pom.xml @@ -27,20 +27,6 @@ storm-hbase-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml index 78ac00a761b..69b90ef1782 100644 --- a/examples/storm-hdfs-examples/pom.xml +++ b/examples/storm-hdfs-examples/pom.xml @@ -27,20 +27,6 @@ storm-hdfs-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-hive-examples/pom.xml b/examples/storm-hive-examples/pom.xml index a51f597ed62..6f3f6bad7ee 100644 --- a/examples/storm-hive-examples/pom.xml +++ b/examples/storm-hive-examples/pom.xml @@ -27,20 +27,6 @@ storm-hive-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml index fa2cae90eb6..9d488b24187 100644 --- a/examples/storm-jdbc-examples/pom.xml +++ b/examples/storm-jdbc-examples/pom.xml @@ -27,20 +27,6 @@ storm-jdbc-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/external/storm-jms/examples/README.markdown b/examples/storm-jms-examples/README.markdown similarity index 100% rename from external/storm-jms/examples/README.markdown rename to examples/storm-jms-examples/README.markdown diff --git a/external/storm-jms/examples/pom.xml b/examples/storm-jms-examples/pom.xml similarity index 97% rename from external/storm-jms/examples/pom.xml rename to examples/storm-jms-examples/pom.xml index b099b881314..4d232f70675 100644 --- a/external/storm-jms/examples/pom.xml +++ b/examples/storm-jms-examples/pom.xml @@ -20,10 +20,10 @@ 4.0.0 + storm org.apache.storm - storm-jms-parent 2.0.0-SNAPSHOT - ../pom.xml + ../../pom.xml @@ -63,7 +63,7 @@ storm-core ${project.version} - provided + ${provided.scope} org.apache.storm diff --git a/external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java similarity index 100% rename from external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java rename to examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/ExampleJmsTopology.java diff --git a/external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java similarity index 100% rename from external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java rename to examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/GenericBolt.java diff --git a/external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java similarity index 100% rename from external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java rename to examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/JsonTupleProducer.java diff --git a/external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java b/examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java similarity index 100% rename from external/storm-jms/examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java rename to examples/storm-jms-examples/src/main/java/org/apache/storm/jms/example/SpringJmsProvider.java diff --git a/external/storm-jms/examples/src/main/resources/jms-activemq.xml b/examples/storm-jms-examples/src/main/resources/jms-activemq.xml similarity index 100% rename from external/storm-jms/examples/src/main/resources/jms-activemq.xml rename to examples/storm-jms-examples/src/main/resources/jms-activemq.xml diff --git a/external/storm-jms/examples/src/main/resources/log4j.properties b/examples/storm-jms-examples/src/main/resources/log4j.properties similarity index 100% rename from external/storm-jms/examples/src/main/resources/log4j.properties rename to examples/storm-jms-examples/src/main/resources/log4j.properties diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml index 1c4449b2179..554818b72dd 100644 --- a/examples/storm-kafka-client-examples/pom.xml +++ b/examples/storm-kafka-client-examples/pom.xml @@ -31,20 +31,6 @@ storm-kafka-client-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-kafka-examples/pom.xml b/examples/storm-kafka-examples/pom.xml index 8c1e74dbe9d..65eeda65674 100644 --- a/examples/storm-kafka-examples/pom.xml +++ b/examples/storm-kafka-examples/pom.xml @@ -27,20 +27,6 @@ storm-kafka-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-mongodb-examples/pom.xml b/examples/storm-mongodb-examples/pom.xml index 6def9431527..297a6e8df6c 100644 --- a/examples/storm-mongodb-examples/pom.xml +++ b/examples/storm-mongodb-examples/pom.xml @@ -27,20 +27,6 @@ storm-mongodb-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml index ab061c4b8bb..ca2d03b020d 100644 --- a/examples/storm-mqtt-examples/pom.xml +++ b/examples/storm-mqtt-examples/pom.xml @@ -31,20 +31,6 @@ ../../pom.xml - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/examples/storm-opentsdb-examples/pom.xml b/examples/storm-opentsdb-examples/pom.xml index 2a24f8d4c53..9ffd12f38a4 100644 --- a/examples/storm-opentsdb-examples/pom.xml +++ b/examples/storm-opentsdb-examples/pom.xml @@ -27,20 +27,6 @@ storm-opentsdb-examples - - UTF-8 - provided - - - - - intellij - - compile - - - - org.apache.storm diff --git a/storm-perf/README.markdown b/examples/storm-perf/README.markdown similarity index 100% rename from storm-perf/README.markdown rename to examples/storm-perf/README.markdown diff --git a/storm-perf/pom.xml b/examples/storm-perf/pom.xml similarity index 86% rename from storm-perf/pom.xml rename to examples/storm-perf/pom.xml index 8d032d2a7a0..64ae8898819 100644 --- a/storm-perf/pom.xml +++ b/examples/storm-perf/pom.xml @@ -23,7 +23,7 @@ storm org.apache.storm 2.0.0-SNAPSHOT - .. + ../../pom.xml org.apache.storm @@ -32,21 +32,6 @@ Storm Perf Topologies and tools to measure performance. - - UTF-8 - - provided - - - - - intellij - - compile - - - - @@ -99,7 +84,7 @@ org.apache.storm storm-core - 2.0.0-SNAPSHOT + ${project.version} - provided 0.98.4-hadoop2 - - - intellij - - compile - - - - org.hdrhistogram diff --git a/external/flux/pom.xml b/external/flux/pom.xml index b51a505bb16..45a7afbd21b 100644 --- a/external/flux/pom.xml +++ b/external/flux/pom.xml @@ -38,30 +38,9 @@ - - UTF-8 - - provided - - - - - - intellij - - compile - - - - flux-wrappers flux-core - flux-examples diff --git a/external/sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml index 776a54c7b2e..79b109fe0cd 100644 --- a/external/sql/storm-sql-core/pom.xml +++ b/external/sql/storm-sql-core/pom.xml @@ -40,13 +40,13 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.storm storm-sql-runtime ${project.version} - provided + ${provided.scope} org.apache.storm diff --git a/external/sql/storm-sql-external/storm-sql-hdfs/pom.xml b/external/sql/storm-sql-external/storm-sql-hdfs/pom.xml index 9e0a5998cfa..69f214aa288 100644 --- a/external/sql/storm-sql-external/storm-sql-hdfs/pom.xml +++ b/external/sql/storm-sql-external/storm-sql-hdfs/pom.xml @@ -40,7 +40,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} @@ -54,7 +54,7 @@ org.apache.storm storm-sql-runtime ${project.version} - provided + ${provided.scope} org.apache.storm @@ -67,7 +67,7 @@ org.apache.storm storm-hdfs ${project.version} - provided + ${provided.scope} org.apache.hadoop diff --git a/external/sql/storm-sql-external/storm-sql-kafka/pom.xml b/external/sql/storm-sql-external/storm-sql-kafka/pom.xml index a7bdf7abf96..10e2b09d437 100644 --- a/external/sql/storm-sql-external/storm-sql-kafka/pom.xml +++ b/external/sql/storm-sql-external/storm-sql-kafka/pom.xml @@ -40,13 +40,13 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.storm storm-sql-runtime ${project.version} - provided + ${provided.scope} org.apache.storm @@ -59,7 +59,7 @@ org.apache.storm storm-kafka ${project.version} - provided + ${provided.scope} org.apache.kafka diff --git a/external/sql/storm-sql-external/storm-sql-mongodb/pom.xml b/external/sql/storm-sql-external/storm-sql-mongodb/pom.xml index 40fde8a9f0a..6d1580378ec 100644 --- a/external/sql/storm-sql-external/storm-sql-mongodb/pom.xml +++ b/external/sql/storm-sql-external/storm-sql-mongodb/pom.xml @@ -40,13 +40,13 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.storm storm-sql-runtime ${project.version} - provided + ${provided.scope} org.apache.storm @@ -59,7 +59,7 @@ org.apache.storm storm-mongodb ${project.version} - provided + ${provided.scope} junit diff --git a/external/sql/storm-sql-external/storm-sql-redis/pom.xml b/external/sql/storm-sql-external/storm-sql-redis/pom.xml index 19cc6999105..5997376d878 100644 --- a/external/sql/storm-sql-external/storm-sql-redis/pom.xml +++ b/external/sql/storm-sql-external/storm-sql-redis/pom.xml @@ -32,13 +32,13 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.storm storm-sql-runtime ${project.version} - provided + ${provided.scope} org.apache.storm @@ -51,7 +51,7 @@ org.apache.storm storm-redis ${project.version} - provided + ${provided.scope} junit diff --git a/external/sql/storm-sql-runtime/pom.xml b/external/sql/storm-sql-runtime/pom.xml index 4666df4992e..08a776caf06 100644 --- a/external/sql/storm-sql-runtime/pom.xml +++ b/external/sql/storm-sql-runtime/pom.xml @@ -40,7 +40,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.calcite diff --git a/external/storm-cassandra/pom.xml b/external/storm-cassandra/pom.xml index 0eff9f6038f..d912ecc6389 100644 --- a/external/storm-cassandra/pom.xml +++ b/external/storm-cassandra/pom.xml @@ -73,7 +73,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} diff --git a/external/storm-druid/pom.xml b/external/storm-druid/pom.xml index d1949a40ea7..3f9601c5560 100644 --- a/external/storm-druid/pom.xml +++ b/external/storm-druid/pom.xml @@ -34,7 +34,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} io.druid @@ -90,44 +90,4 @@ test - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - com.fasterxml.jackson - org.apache.storm.druid.bolt.com.fasterxml.jackson - - - org.jboss.netty - org.apache.storm.druid.bolt.org.jboss.netty - - - true - - - - - - diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml index 09d479463db..c6761793586 100644 --- a/external/storm-elasticsearch/pom.xml +++ b/external/storm-elasticsearch/pom.xml @@ -50,7 +50,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.elasticsearch diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml index 21738a554cd..05d8c3bd9d4 100755 --- a/external/storm-eventhubs/pom.xml +++ b/external/storm-eventhubs/pom.xml @@ -17,75 +17,37 @@ --> 4.0.0 - + storm org.apache.storm 2.0.0-SNAPSHOT ../../pom.xml - + storm-eventhubs - 2.0.0-SNAPSHOT jar storm-eventhubs EventHubs Storm Spout - + - - org.apache.maven.plugins - maven-shade-plugin - - - - shade - - package - - - - - - - - target/${project.artifactId}-${project.version}-jar-with-dependencies.jar - true - - - *:* - - META-INF/*.SF - META-INF/*.sf - META-INF/*.DSA - META-INF/*.dsa - META-INF/*.RSA - META-INF/*.rsa - META-INF/*.EC - META-INF/*.ec - META-INF/MSFTSIG.SF - META-INF/MSFTSIG.RSA - - - - - - - maven-antrun-plugin - - - package - - - - - - - run - - - - + + maven-antrun-plugin + + + package + + + + + + + run + + + + @@ -100,7 +62,7 @@ ${project.version} jar - provided + ${provided.scope} org.apache.curator @@ -132,5 +94,11 @@ qpid-amqp-1-0-common ${qpid.version} - + + junit + junit + 4.11 + test + + diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml index 293961dbd4f..3d6aa0c66ef 100644 --- a/external/storm-hbase/pom.xml +++ b/external/storm-hbase/pom.xml @@ -46,7 +46,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.hbase diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index aba0da6afe0..281732e52a9 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -47,7 +47,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml index a564e8586e0..d4d076d5f80 100644 --- a/external/storm-hive/pom.xml +++ b/external/storm-hive/pom.xml @@ -42,7 +42,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.storm diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml index a8c3de01b80..1ab2e1cd014 100644 --- a/external/storm-jdbc/pom.xml +++ b/external/storm-jdbc/pom.xml @@ -44,7 +44,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.commons diff --git a/external/storm-jms/core/pom.xml b/external/storm-jms/core/pom.xml deleted file mode 100644 index 2e435e7f56f..00000000000 --- a/external/storm-jms/core/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - 4.0.0 - - org.apache.storm - storm-jms-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - - - storm-jms - - - - - - ptgoetz - P. Taylor Goetz - ptgoetz@gmail.com - - - - - - org.apache.storm - storm-core - ${project.version} - - provided - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 - - - junit - junit - 4.10 - test - - - - - org.apache.activemq - activemq-core - 5.5.1 - test - - - org.slf4j - slf4j-api - - - log4j - log4j - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - -Xdoclint:none - - - - - diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml index 6a6e60a89c0..0e0feb400b1 100644 --- a/external/storm-jms/pom.xml +++ b/external/storm-jms/pom.xml @@ -27,8 +27,9 @@ - storm-jms-parent - pom + storm-jms + + @@ -38,10 +39,45 @@ - - core - examples - + + + org.apache.storm + storm-core + ${project.version} + + ${provided.scope} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1.1 + + + junit + junit + 4.10 + test + + + + + org.apache.activemq + activemq-core + 5.5.1 + test + + + org.slf4j + slf4j-api + + + log4j + log4j + + + + + diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsMessageProducer.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsMessageProducer.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsProvider.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsProvider.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsTupleProducer.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsTupleProducer.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/JmsTupleProducer.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/JmsTupleProducer.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java b/external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/bolt/JmsBolt.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/spout/JmsMessageID.java b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsMessageID.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/spout/JmsMessageID.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsMessageID.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/spout/JmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/spout/JmsSpout.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/spout/JmsSpout.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsBatch.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsBatch.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsBatch.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsBatch.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsState.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsState.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsState.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsState.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsStateFactory.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsUpdater.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsUpdater.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/JmsUpdater.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/trident/JmsUpdater.java diff --git a/external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java similarity index 100% rename from external/storm-jms/core/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java rename to external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java diff --git a/external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java similarity index 100% rename from external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java rename to external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java diff --git a/external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java similarity index 100% rename from external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java rename to external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockJmsProvider.java diff --git a/external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java similarity index 100% rename from external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java rename to external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockSpoutOutputCollector.java diff --git a/external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java similarity index 100% rename from external/storm-jms/core/src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java rename to external/storm-jms/src/test/java/org/apache/storm/jms/spout/MockTupleProducer.java diff --git a/external/storm-jms/core/src/test/resources/jndi.properties b/external/storm-jms/src/test/resources/jndi.properties similarity index 100% rename from external/storm-jms/core/src/test/resources/jndi.properties rename to external/storm-jms/src/test/resources/jndi.properties diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml index 2ff98c12c71..02c282324b6 100644 --- a/external/storm-kafka-client/pom.xml +++ b/external/storm-kafka-client/pom.xml @@ -46,7 +46,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml index 9c69c05286c..6571a21cf49 100644 --- a/external/storm-kafka/pom.xml +++ b/external/storm-kafka/pom.xml @@ -126,7 +126,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} commons-lang diff --git a/external/storm-kinesis/pom.xml b/external/storm-kinesis/pom.xml index f1872dc764e..763d9c2f0f8 100644 --- a/external/storm-kinesis/pom.xml +++ b/external/storm-kinesis/pom.xml @@ -42,7 +42,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} org.apache.curator diff --git a/external/storm-metrics/pom.xml b/external/storm-metrics/pom.xml index 24b34e888ef..ef51c564f93 100644 --- a/external/storm-metrics/pom.xml +++ b/external/storm-metrics/pom.xml @@ -60,7 +60,7 @@ storm-core ${project.version} - provided + ${provided.scope} diff --git a/external/storm-mongodb/pom.xml b/external/storm-mongodb/pom.xml index 7653ac846f5..47b6f63d986 100644 --- a/external/storm-mongodb/pom.xml +++ b/external/storm-mongodb/pom.xml @@ -1,74 +1,74 @@ - - - - 4.0.0 - - - storm - org.apache.storm - 2.0.0-SNAPSHOT - ../../pom.xml - - - storm-mongodb - - - - vesense - Xin Wang - data.xinwang@gmail.com - - - - - 3.2.0 - - - - - org.apache.storm - storm-core - ${project.version} - provided - - - org.mongodb - mongo-java-driver - ${mongodb.version} - - - com.google.guava - guava - - - commons-lang - commons-lang - - - - junit - junit - test - - - org.mockito - mockito-all - test - - - + + + + 4.0.0 + + + storm + org.apache.storm + 2.0.0-SNAPSHOT + ../../pom.xml + + + storm-mongodb + + + + vesense + Xin Wang + data.xinwang@gmail.com + + + + + 3.2.0 + + + + + org.apache.storm + storm-core + ${project.version} + ${provided.scope} + + + org.mongodb + mongo-java-driver + ${mongodb.version} + + + com.google.guava + guava + + + commons-lang + commons-lang + + + + junit + junit + test + + + org.mockito + mockito-all + test + + + diff --git a/external/storm-mqtt/core/pom.xml b/external/storm-mqtt/core/pom.xml deleted file mode 100644 index dbb0396588a..00000000000 --- a/external/storm-mqtt/core/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - 4.0.0 - - storm-mqtt - jar - - storm-mqtt - - - org.apache.storm - storm-mqtt-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - - - - - - bintray - http://dl.bintray.com/andsel/maven/ - - true - - - false - - - - - - - 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 - - - org.apache.storm - storm-core - ${project.version} - ${provided.scope} - - - org.fusesource.mqtt-client - mqtt-client - 1.10 - - - commons-lang - commons-lang - 2.5 - - - - - - maven-surefire-plugin - - perTest - false - true - ${java.unit.test.exclude} - - ${java.unit.test.include} - - -Djava.net.preferIPv4Stack=true -Xmx1536m - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-surefire.version} - - perTest - false - true - - ${java.integration.test.include} - - ${java.integration.test.group} - -Djava.net.preferIPv4Stack=true -Xmx1536m - - - - - integration-test - verify - - - - - - - - diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml index 7b870b22162..37c19d7fe98 100644 --- a/external/storm-mqtt/pom.xml +++ b/external/storm-mqtt/pom.xml @@ -14,44 +14,112 @@ See the License for the specific language governing permissions and limitations under the License. --> + + 4.0.0 - - 4.0.0 - - storm - org.apache.storm - 2.0.0-SNAPSHOT - ../../pom.xml - - - storm-mqtt-parent - pom - - storm-mqtt-parent - - - UTF-8 - - provided - - - - - - intellij - - compile - - - - - - core - + storm-mqtt + jar + + storm-mqtt + + + org.apache.storm + storm + 2.0.0-SNAPSHOT + ../../pom.xml + + + + + + + + bintray + http://dl.bintray.com/andsel/maven/ + + true + + + false + + + + + + + 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 + + + org.apache.storm + storm-core + ${project.version} + ${provided.scope} + + + org.fusesource.mqtt-client + mqtt-client + 1.10 + + + commons-lang + commons-lang + 2.5 + + + + + + maven-surefire-plugin + + perTest + false + true + ${java.unit.test.exclude} + + ${java.unit.test.include} + + -Djava.net.preferIPv4Stack=true -Xmx1536m + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-surefire.version} + + perTest + false + true + + ${java.integration.test.include} + + ${java.integration.test.group} + -Djava.net.preferIPv4Stack=true -Xmx1536m + + + + + integration-test + verify + + + + + + diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttLogger.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttLogger.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttLogger.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttLogger.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttMessage.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttMessage.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttMessage.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttMessage.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttMessageMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttMessageMapper.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttMessageMapper.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttMessageMapper.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttTupleMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttTupleMapper.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/MqttTupleMapper.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/MqttTupleMapper.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/bolt/MqttBolt.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttOptions.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttOptions.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttOptions.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttOptions.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttPublisher.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttPublisher.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttPublisher.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttPublisher.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttUtils.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttUtils.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/MqttUtils.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/MqttUtils.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/SslUtils.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/SslUtils.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/common/SslUtils.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/common/SslUtils.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/ByteArrayMessageMapper.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/mappers/StringMessageMapper.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/AckableMessage.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/spout/MqttSpout.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/ssl/DefaultKeyStoreLoader.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/ssl/DefaultKeyStoreLoader.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/ssl/DefaultKeyStoreLoader.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/ssl/DefaultKeyStoreLoader.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/ssl/KeyStoreLoader.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/ssl/KeyStoreLoader.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/ssl/KeyStoreLoader.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/ssl/KeyStoreLoader.java diff --git a/external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java b/external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java similarity index 100% rename from external/storm-mqtt/core/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java rename to external/storm-mqtt/src/main/java/org/apache/storm/mqtt/trident/MqttPublishFunction.java diff --git a/external/storm-mqtt/core/src/test/java/org/apache/storm/mqtt/StormMqttIntegrationTest.java b/external/storm-mqtt/src/test/java/org/apache/storm/mqtt/StormMqttIntegrationTest.java similarity index 100% rename from external/storm-mqtt/core/src/test/java/org/apache/storm/mqtt/StormMqttIntegrationTest.java rename to external/storm-mqtt/src/test/java/org/apache/storm/mqtt/StormMqttIntegrationTest.java diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml index 0e01cdf27f0..41f7e550a13 100644 --- a/external/storm-opentsdb/pom.xml +++ b/external/storm-opentsdb/pom.xml @@ -44,7 +44,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} com.google.guava diff --git a/external/storm-pmml/pom.xml b/external/storm-pmml/pom.xml index 2ddfeb3bcd0..b44c6f553a9 100644 --- a/external/storm-pmml/pom.xml +++ b/external/storm-pmml/pom.xml @@ -51,7 +51,7 @@ org.apache.storm storm-core ${project.version} - provided + ${provided.scope} diff --git a/pom.xml b/pom.xml index 896d735f52e..0fef7c8166a 100644 --- a/pom.xml +++ b/pom.xml @@ -308,6 +308,9 @@ 0.32 1.0.1 2.24.1 + + + provided @@ -361,7 +364,8 @@ examples/storm-elasticsearch-examples examples/storm-mqtt-examples examples/storm-pmml-examples - storm-perf + examples/storm-jms-examples + examples/storm-perf @@ -374,6 +378,18 @@ + + + intellij + + compile + + + rat diff --git a/storm-dist/binary/final-package/src/main/assembly/binary.xml b/storm-dist/binary/final-package/src/main/assembly/binary.xml index a6aab0768c8..9321ea2a136 100644 --- a/storm-dist/binary/final-package/src/main/assembly/binary.xml +++ b/storm-dist/binary/final-package/src/main/assembly/binary.xml @@ -42,8 +42,8 @@ + $STORM_HOME/bin + --> ${project.basedir}/../../../bin bin @@ -56,7 +56,6 @@ @@ -84,11 +83,14 @@ js/script.js + ${project.basedir}/../../../examples examples **/target/** + **/dependency-reduced-pom.xml + **/*.iml @@ -99,13 +101,7 @@ bin - - ${project.basedir}/../../../external/storm-kafka/target - external/storm-kafka - - storm*jar - - + ${project.basedir}/../../../external/storm-kafka external/storm-kafka @@ -113,13 +109,6 @@ README.* - - ${project.basedir}/../../../external/storm-kinesis/target - external/storm-kinesis - - storm*jar - - ${project.basedir}/../../../external/storm-kinesis external/storm-kinesis @@ -127,13 +116,6 @@ README.* - - ${project.basedir}/../../../external/storm-hdfs/target - external/storm-hdfs - - storm*jar - - ${project.basedir}/../../../external/storm-hdfs external/storm-hdfs @@ -141,13 +123,6 @@ README.* - - ${project.basedir}/../../../external/storm-hbase/target - external/storm-hbase - - storm*jar - - ${project.basedir}/../../../external/storm-hbase external/storm-hbase @@ -155,13 +130,6 @@ README.* - - ${project.basedir}/../../../external/storm-jdbc/target - external/storm-jdbc - - storm*jar - - ${project.basedir}/../../../external/storm-jdbc external/storm-jdbc @@ -169,13 +137,6 @@ README.* - - ${project.basedir}/../../../external/storm-hive/target - external/storm-hive - - storm*jar - - ${project.basedir}/../../../external/storm-hive external/storm-hive @@ -183,13 +144,6 @@ README.* - - ${project.basedir}/../../../external/storm-eventhubs/target - external/storm-eventhubs - - storm*jar - - ${project.basedir}/../../../external/storm-eventhubs external/storm-eventhubs @@ -197,21 +151,6 @@ README.* - - ${project.basedir}/../../../external/storm-eventhubs/src/main/resources - external/storm-eventhubs - - Config.properties - - 0644 - - - ${project.basedir}/../../../external/storm-elasticsearch/target - external/storm-elasticsearch - - storm*jar - - ${project.basedir}/../../../external/storm-elasticsearch external/storm-elasticsearch @@ -220,41 +159,6 @@ - - ${project.basedir}/../../../external/flux/flux-core/target - external/flux - - flux*jar - - - - ${project.basedir}/../../../external/flux/flux-wrappers/target - external/flux - - flux*jar - - - - ${project.basedir}/../../../external/flux/flux-examples/target - external/flux - - flux*jar - - - - ${project.basedir}/../../../external/flux/flux-examples - external/flux/examples - - README.* - - - - ${project.basedir}/../../../external/flux/flux-examples/src/main/resources - external/flux/examples - - * - - ${project.basedir}/../../../external/flux external/flux @@ -262,13 +166,6 @@ README.* - - ${project.basedir}/../../../external/storm-redis/target - external/storm-redis - - storm*jar - - ${project.basedir}/../../../external/storm-redis external/storm-redis @@ -276,13 +173,6 @@ README.* - - ${project.basedir}/../../../external/storm-solr/target - external/storm-solr - - storm*jar - - ${project.basedir}/../../../external/storm-solr external/storm-solr @@ -290,13 +180,7 @@ README.* - - ${project.basedir}/../../../external/storm-cassandra/target - external/storm-cassandra - - storm*jar - - + ${project.basedir}/../../../external/sql/storm-sql-core/target/app-assembler/repo external/sql/storm-sql-core @@ -347,7 +231,7 @@ README.* - + ${project.basedir}/../../../external/storm-mqtt external/storm-mqtt @@ -355,27 +239,6 @@ README.* - - ${project.basedir}/../../../external/storm-mqtt/core/target - external/storm-mqtt - - storm*jar - - - - ${project.basedir}/../../../external/storm-mqtt/examples/target - external/storm-mqtt - - storm*jar - - - - ${project.basedir}/../../../external/storm-mongodb/target - external/storm-mongodb - - storm*jar - - ${project.basedir}/../../../external/storm-mongodb external/storm-mongodb @@ -383,13 +246,6 @@ README.* - - ${project.basedir}/../../../external/storm-kafka-client/target - external/storm-kafka-client - - storm*jar - - ${project.basedir}/../../../external/storm-kafka-client external/storm-kafka-client @@ -404,20 +260,6 @@ README.* - - ${project.basedir}/../../../external/storm-opentsdb/target - external/storm-opentsdb - - storm*jar - - - - ${project.basedir}/../../../external/storm-druid/target - external/storm-druid - - storm*jar - - ${project.basedir}/../../../external/storm-druid external/storm-druid @@ -439,28 +281,6 @@ README.* - - ${project.basedir}/../../../external/storm-jms/core/target - external/storm-jms - - storm*jar - - - - ${project.basedir}/../../../external/storm-jms/examples/target - external/storm-jms - - storm*jar - - - - - ${project.basedir}/../../../external/storm-pmml/target - external/storm-pmml - - storm*jar - - ${project.basedir}/../../../external/storm-pmml external/storm-pmml @@ -468,13 +288,6 @@ README.* - - ${project.basedir}/../../../examples/storm-pmml-examples/target - examples/storm-pmml-examples - - storm*jar - - ${project.basedir}/../../../examples/storm-pmml-examples/src/main/resources examples/storm-pmml-examples @@ -509,47 +322,9 @@ storm*jar - - - ${project.basedir}/../../storm-perf/target - perf - - storm*jar - - - - ${project.basedir}/../../storm-perf/src/main/conf - perf/conf - - *yaml - - - - ${project.basedir}/../../storm-perf/src/main/sampledata - perf/resources - - * - - - - ${project.basedir}/../../storm-perf/ - perf - - README.* - - - - - - ${project.basedir}/../../../examples/storm-starter/target/storm-starter-${project.version}.jar - /examples/storm-starter/ - storm-starter-topologies-${project.version}.jar - - - @@ -565,6 +340,18 @@ storm_env.ini 0644 + + ${project.basedir}/../../../conf/storm-env.sh + /conf + storm-env.sh + 0755 + + + ${project.basedir}/../../../VERSION + / + RELEASE + true + ${project.basedir}/../../../log4j2/cluster.xml @@ -601,4 +388,5 @@ / +