Merge branch 'STORM-561'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb370a99 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb370a99 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb370a99 Branch: refs/heads/master Commit: cb370a99a12a8466b4acd644bfe4eba00ee26107 Parents: 2313775 b90ec78 Author: P. Taylor Goetz <ptgo...@gmail.com> Authored: Wed Jun 3 13:21:16 2015 -0400 Committer: P. Taylor Goetz <ptgo...@gmail.com> Committed: Wed Jun 3 13:21:16 2015 -0400 ---------------------------------------------------------------------- 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 +++ pom.xml | 1 + storm-dist/binary/src/main/assembly/binary.xml | 44 + 70 files changed, 6043 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/cb370a99/pom.xml ----------------------------------------------------------------------