Merge branch 'master' into 0.10.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ea81f96d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ea81f96d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ea81f96d Branch: refs/heads/0.10.x-branch Commit: ea81f96df6eedffe668b44201c441095760c74da Parents: efdf949 285d943 Author: P. Taylor Goetz <[email protected]> Authored: Wed Jun 3 13:38:51 2015 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Jun 3 13:38:51 2015 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 3 + external/flux/.gitignore | 15 + external/flux/LICENSE | 202 +++++ external/flux/README.md | 834 +++++++++++++++++++ external/flux/flux-core/pom.xml | 92 ++ .../main/java/org/apache/storm/flux/Flux.java | 263 ++++++ .../java/org/apache/storm/flux/FluxBuilder.java | 591 +++++++++++++ .../apache/storm/flux/api/TopologySource.java | 39 + .../org/apache/storm/flux/model/BeanDef.java | 39 + .../apache/storm/flux/model/BeanReference.java | 39 + .../org/apache/storm/flux/model/BoltDef.java | 24 + .../storm/flux/model/ConfigMethodDef.java | 62 ++ .../storm/flux/model/ExecutionContext.java | 77 ++ .../apache/storm/flux/model/GroupingDef.java | 77 ++ .../org/apache/storm/flux/model/IncludeDef.java | 54 ++ .../org/apache/storm/flux/model/ObjectDef.java | 90 ++ .../apache/storm/flux/model/PropertyDef.java | 58 ++ .../org/apache/storm/flux/model/SpoutDef.java | 24 + .../org/apache/storm/flux/model/StreamDef.java | 64 ++ .../apache/storm/flux/model/TopologyDef.java | 216 +++++ .../storm/flux/model/TopologySourceDef.java | 36 + .../org/apache/storm/flux/model/VertexDef.java | 36 + .../apache/storm/flux/parser/FluxParser.java | 202 +++++ .../flux-core/src/main/resources/splash.txt | 9 + .../org/apache/storm/flux/FluxBuilderTest.java | 31 + .../org/apache/storm/flux/IntegrationTest.java | 39 + .../java/org/apache/storm/flux/TCKTest.java | 234 ++++++ .../multilang/MultilangEnvirontmentTest.java | 89 ++ .../apache/storm/flux/test/SimpleTopology.java | 42 + .../storm/flux/test/SimpleTopologySource.java | 35 + .../test/SimpleTopologyWithConfigParam.java | 38 + .../org/apache/storm/flux/test/TestBolt.java | 63 ++ .../storm/flux/test/TridentTopologySource.java | 54 ++ .../src/test/resources/configs/bad_hbase.yaml | 98 +++ .../resources/configs/config-methods-test.yaml | 70 ++ .../existing-topology-method-override.yaml | 10 + .../existing-topology-reflection-config.yaml | 9 + .../configs/existing-topology-reflection.yaml | 9 + .../configs/existing-topology-trident.yaml | 9 + .../resources/configs/existing-topology.yaml | 8 + .../src/test/resources/configs/hdfs_test.yaml | 97 +++ .../test/resources/configs/include_test.yaml | 25 + .../configs/invalid-existing-topology.yaml | 17 + .../src/test/resources/configs/kafka_test.yaml | 126 +++ .../src/test/resources/configs/shell_test.yaml | 104 +++ .../test/resources/configs/simple_hbase.yaml | 120 +++ .../resources/configs/substitution-test.yaml | 106 +++ .../src/test/resources/configs/tck.yaml | 95 +++ .../src/test/resources/configs/test.properties | 2 + .../flux-core/src/test/resources/logback.xml | 30 + external/flux/flux-examples/README.md | 66 ++ external/flux/flux-examples/pom.xml | 105 +++ .../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 +++ .../src/main/resources/simple_wordcount.yaml | 68 ++ external/flux/flux-ui/README.md | 3 + external/flux/flux-wrappers/pom.xml | 51 ++ .../flux/wrappers/bolts/FluxShellBolt.java | 56 ++ .../storm/flux/wrappers/bolts/LogInfoBolt.java | 44 + .../flux/wrappers/spouts/FluxShellSpout.java | 55 ++ .../main/resources/resources/randomsentence.js | 93 +++ .../main/resources/resources/splitsentence.py | 24 + external/flux/pom.xml | 119 +++ external/storm-eventhubs/pom.xml | 38 +- .../eventhubs/bolt/DefaultEventDataFormat.java | 47 ++ .../storm/eventhubs/bolt/EventHubBolt.java | 56 +- .../eventhubs/bolt/EventHubBoltConfig.java | 109 +++ .../storm/eventhubs/bolt/IEventDataFormat.java | 28 + .../client/ConnectionStringBuilder.java | 116 --- .../storm/eventhubs/client/Constants.java | 32 - .../storm/eventhubs/client/EventHubClient.java | 92 -- .../eventhubs/client/EventHubConsumerGroup.java | 72 -- .../eventhubs/client/EventHubException.java | 37 - .../eventhubs/client/EventHubReceiver.java | 139 ---- .../eventhubs/client/EventHubSendClient.java | 70 -- .../storm/eventhubs/client/EventHubSender.java | 95 --- .../storm/eventhubs/client/SelectorFilter.java | 38 - .../eventhubs/client/SelectorFilterWriter.java | 64 -- .../storm/eventhubs/samples/EventCount.java | 5 +- .../storm/eventhubs/samples/EventHubLoop.java | 9 +- .../eventhubs/spout/EventHubReceiverFilter.java | 56 -- .../eventhubs/spout/EventHubReceiverImpl.java | 49 +- .../storm/eventhubs/spout/EventHubSpout.java | 5 + .../eventhubs/spout/EventHubSpoutConfig.java | 126 +-- .../eventhubs/spout/IEventHubReceiver.java | 5 +- .../spout/IEventHubReceiverFilter.java | 35 - .../eventhubs/spout/SimplePartitionManager.java | 11 +- .../spout/StaticPartitionCoordinator.java | 2 +- .../TransactionalTridentEventHubEmitter.java | 2 +- .../trident/TridentPartitionManager.java | 12 +- .../src/main/resources/config.properties | 5 +- .../eventhubs/spout/EventHubReceiverMock.java | 18 +- .../eventhubs/spout/TestEventHubSpout.java | 4 +- pom.xml | 5 +- storm-dist/binary/src/main/assembly/binary.xml | 44 + 101 files changed, 6424 insertions(+), 1003 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ea81f96d/CHANGELOG.md ---------------------------------------------------------------------- diff --cc CHANGELOG.md index 09f2e94,aa390f1..34b2e57 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -1,4 -1,7 +1,5 @@@ -## 0.11.0 - ## 0.10.0 + * STORM-842: Drop Support for Java 1.6 * STORM-835: Netty Client hold batch object until io operation complete * STORM-827: Allow AutoTGT to work with storm-hdfs too. * STORM-821: Adding connection provider interface to decouple jdbc connector from a single connection pooling implementation.
