Merge branch 'master' of https://github.com/apache/storm into STORM-511-offset-fix
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/588907dd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/588907dd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/588907dd Branch: refs/heads/security Commit: 588907ddc1336356ca01ffaa8b07e2812865a642 Parents: d34037d cfe7e63 Author: Viktor Taranenko <[email protected]> Authored: Thu Oct 23 22:15:20 2014 +0100 Committer: Viktor Taranenko <[email protected]> Committed: Thu Oct 23 22:15:20 2014 +0100 ---------------------------------------------------------------------- CHANGELOG.md | 13 +- LICENSE | 20 +- README.markdown | 1 + bin/storm | 3 +- examples/storm-starter/README.markdown | 9 +- examples/storm-starter/pom.xml | 2 +- external/storm-hbase/LICENSE | 202 +++++++++++ external/storm-hbase/README.md | 215 ++++++++++++ external/storm-hbase/pom.xml | 78 +++++ .../storm/hbase/bolt/AbstractHBaseBolt.java | 69 ++++ .../org/apache/storm/hbase/bolt/HBaseBolt.java | 77 ++++ .../storm/hbase/bolt/HBaseLookupBolt.java | 83 +++++ .../storm/hbase/bolt/mapper/HBaseMapper.java | 48 +++ .../bolt/mapper/HBaseProjectionCriteria.java | 85 +++++ .../hbase/bolt/mapper/HBaseValueMapper.java | 43 +++ .../hbase/bolt/mapper/SimpleHBaseMapper.java | 90 +++++ .../apache/storm/hbase/common/ColumnList.java | 202 +++++++++++ .../apache/storm/hbase/common/HBaseClient.java | 135 +++++++ .../org/apache/storm/hbase/common/IColumn.java | 30 ++ .../org/apache/storm/hbase/common/ICounter.java | 29 ++ .../org/apache/storm/hbase/common/Utils.java | 69 ++++ .../storm/hbase/security/HBaseSecurityUtil.java | 52 +++ .../mapper/SimpleTridentHBaseMapper.java | 89 +++++ .../trident/mapper/TridentHBaseMapper.java | 31 ++ .../hbase/trident/state/HBaseMapState.java | 233 +++++++++++++ .../storm/hbase/trident/state/HBaseQuery.java | 40 +++ .../storm/hbase/trident/state/HBaseState.java | 164 +++++++++ .../hbase/trident/state/HBaseStateFactory.java | 40 +++ .../storm/hbase/trident/state/HBaseUpdater.java | 32 ++ .../storm/hbase/topology/LookupWordCount.java | 79 +++++ .../hbase/topology/PersistentWordCount.java | 81 +++++ .../storm/hbase/topology/TotalWordCounter.java | 70 ++++ .../storm/hbase/topology/WordCountClient.java | 57 +++ .../hbase/topology/WordCountValueMapper.java | 70 ++++ .../storm/hbase/topology/WordCounter.java | 59 ++++ .../apache/storm/hbase/topology/WordSpout.java | 88 +++++ .../storm/hbase/trident/PrintFunction.java | 40 +++ .../storm/hbase/trident/WordCountTrident.java | 104 ++++++ external/storm-hdfs/pom.xml | 2 +- external/storm-kafka/pom.xml | 2 +- .../src/test/storm/kafka/TridentKafkaTest.java | 9 +- pom.xml | 27 +- .../maven-shade-clojure-transformer/pom.xml | 2 +- storm-core/pom.xml | 6 +- .../clj/backtype/storm/daemon/supervisor.clj | 10 +- storm-core/src/clj/backtype/storm/ui/core.clj | 50 +-- storm-core/src/dev/resources/storm.py | 248 ++++++++++++- storm-core/src/dev/resources/storm.rb | 228 +++++++++++- .../src/jvm/backtype/storm/tuple/ITuple.java | 136 ++++++++ .../src/jvm/backtype/storm/tuple/Tuple.java | 113 +----- .../storm/trident/testing/MockTridentTuple.java | 166 --------- .../jvm/storm/trident/tuple/TridentTuple.java | 46 +-- .../storm/trident/tuple/TridentTupleView.java | 35 +- .../jvm/storm/trident/tuple/ValuePointer.java | 1 - storm-core/src/multilang/js/storm.js | 349 +++++++++++++++++++ storm-core/src/ui/public/component.html | 8 +- storm-core/src/ui/public/js/purl.js | 267 -------------- storm-core/src/ui/public/js/script.js | 3 +- storm-core/src/ui/public/js/url.min.js | 1 + storm-core/src/ui/public/js/visualization.js | 2 +- .../templates/component-page-template.html | 6 +- .../public/templates/index-page-template.html | 2 +- .../templates/topology-page-template.html | 14 +- storm-core/src/ui/public/topology.html | 12 +- .../test/clj/backtype/storm/supervisor_test.clj | 16 +- .../test/clj/storm/trident/tuple_test.clj | 28 +- storm-dist/binary/LICENSE | 10 +- storm-dist/binary/pom.xml | 2 +- storm-dist/binary/src/main/assembly/binary.xml | 14 + storm-dist/source/pom.xml | 2 +- 70 files changed, 3935 insertions(+), 714 deletions(-) ----------------------------------------------------------------------
