You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/02/23 17:16:03 UTC

[2/7] storm git commit: Merge remote-tracking branch 'community/master' into STORM-441

Merge remote-tracking branch 'community/master' into STORM-441

Conflicts:
	storm-core/src/clj/backtype/storm/bootstrap.clj
	storm-core/src/clj/backtype/storm/daemon/drpc.clj
	storm-core/src/clj/backtype/storm/daemon/executor.clj
	storm-core/src/clj/backtype/storm/daemon/nimbus.clj
	storm-core/src/clj/backtype/storm/daemon/supervisor.clj
	storm-core/src/clj/backtype/storm/daemon/worker.clj


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8358bdee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8358bdee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8358bdee

Branch: refs/heads/master
Commit: 8358bdeee00512b7d628c37cd53116556d379ef3
Parents: 6c50461 8491151
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Tue Feb 3 15:35:55 2015 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Tue Feb 3 15:35:55 2015 -0600

----------------------------------------------------------------------
 .gitignore                                      |    2 +
 CHANGELOG.md                                    |  104 +-
 DEVELOPER.md                                    |   35 +-
 LICENSE                                         |   59 +-
 README.markdown                                 |   44 +-
 SECURITY.md                                     |  351 +-
 STORM-UI-REST-API.md                            |  203 +-
 bin/storm                                       |   95 +-
 bin/storm-config.cmd                            |   32 +-
 bin/storm.cmd                                   |   36 +-
 conf/defaults.yaml                              |   51 +-
 conf/jaas_digest.conf                           |    8 +-
 conf/jaas_kerberos.conf                         |   15 +
 dev-tools/jira-github-join.py                   |    2 +-
 doap_Storm.rdf                                  |   57 +
 docs/README.md                                  |   47 +
 docs/_config.yml                                |   11 +
 docs/_includes/footer.html                      |   16 +
 docs/_includes/head.html                        |   31 +
 docs/_includes/header.html                      |   25 +
 docs/_layouts/about.html                        |   40 +
 docs/_layouts/default.html                      |   19 +
 docs/_layouts/documentation.html                |   16 +
 docs/_layouts/page.html                         |   14 +
 docs/_layouts/post.html                         |   15 +
 docs/_posts/2012-08-02-storm080-released.md     |  120 +
 docs/_posts/2012-09-06-storm081-released.md     |   47 +
 docs/_posts/2013-01-11-storm082-released.md     |   82 +
 docs/_posts/2013-12-08-storm090-released.md     |  127 +
 docs/_posts/2014-04-10-storm-logo-contest.md    |   66 +
 docs/_posts/2014-04-17-logo-pforrest.md         |   10 +
 docs/_posts/2014-04-17-logo-squinones.md        |    9 +
 docs/_posts/2014-04-19-logo-ssuleman.md         |    8 +
 docs/_posts/2014-04-21-logo-rmarshall.md        |   12 +
 docs/_posts/2014-04-22-logo-zsayari.md          |    9 +
 docs/_posts/2014-04-23-logo-abartos.md          |   15 +
 docs/_posts/2014-04-27-logo-cboustead.md        |   12 +
 docs/_posts/2014-04-27-logo-sasili.md           |   10 +
 docs/_posts/2014-04-29-logo-jlee1.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee2.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee3.md            |   10 +
 docs/_posts/2014-05-27-round1-results.md        |   38 +
 docs/_posts/2014-06-17-contest-results.md       |   24 +
 docs/_posts/2014-06-25-storm092-released.md     |  137 +
 .../2014-10-20-storm093-release-candidate.md    |   11 +
 docs/_posts/2014-11-25-storm093-released.md     |  164 +
 docs/_sass/_syntax-highlighting.scss            |   70 +
 docs/about.md                                   |    7 +
 docs/about/deployment.md                        |    9 +
 docs/about/fault-tolerant.md                    |    9 +
 docs/about/free-and-open-source.md              |   15 +
 docs/about/guarantees-data-processing.md        |   10 +
 docs/about/integrates.md                        |   13 +
 docs/about/multi-language.md                    |    9 +
 docs/about/scalable.md                          |   10 +
 docs/about/simple-api.md                        |   15 +
 docs/assets/css/bootstrap-theme.css             |  470 ++
 docs/assets/css/bootstrap-theme.css.map         |    1 +
 docs/assets/css/bootstrap-theme.min.css         |    5 +
 docs/assets/css/bootstrap.css                   | 6332 ++++++++++++++++++
 docs/assets/css/bootstrap.css.map               |    1 +
 docs/assets/css/bootstrap.min.css               |    5 +
 docs/assets/css/theme.css                       |   18 +
 docs/assets/favicon.ico                         |  Bin 0 -> 1150 bytes
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 0 -> 20335 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 0 -> 41280 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 0 -> 23320 bytes
 docs/assets/js/bootstrap.js                     | 2320 +++++++
 docs/assets/js/bootstrap.min.js                 |    7 +
 docs/assets/js/npm.js                           |   13 +
 docs/css/main.scss                              |   47 +
 docs/doc-index.html                             |   11 +
 .../Acking-framework-implementation.md          |   38 +
 docs/documentation/Clojure-DSL.md               |  266 +
 docs/documentation/Command-line-client.md       |  102 +
 docs/documentation/Common-patterns.md           |   88 +
 docs/documentation/Concepts.md                  |  117 +
 docs/documentation/Configuration.md             |   31 +
 docs/documentation/Contributing-to-Storm.md     |   33 +
 .../Creating-a-new-Storm-project.md             |   25 +
 .../DSLs-and-multilang-adapters.md              |   10 +
 ...Defining-a-non-jvm-language-dsl-for-storm.md |   38 +
 docs/documentation/Distributed-RPC.md           |  199 +
 docs/documentation/Documentation.md             |   52 +
 docs/documentation/FAQ.md                       |  123 +
 docs/documentation/Fault-tolerance.md           |   30 +
 .../Guaranteeing-message-processing.md          |  181 +
 docs/documentation/Home.md                      |   69 +
 docs/documentation/Hooks.md                     |    9 +
 docs/documentation/Implementation-docs.md       |   20 +
 .../Installing-native-dependencies.md           |   38 +
 docs/documentation/Kestrel-and-Storm.md         |  200 +
 docs/documentation/Lifecycle-of-a-topology.md   |   82 +
 docs/documentation/Local-mode.md                |   29 +
 docs/documentation/Maven.md                     |   20 +
 .../Message-passing-implementation.md           |   30 +
 docs/documentation/Metrics.md                   |   36 +
 docs/documentation/Multilang-protocol.md        |  251 +
 docs/documentation/Powered-By.md                |  936 +++
 docs/documentation/Project-ideas.md             |    6 +
 docs/documentation/Rationale.md                 |   33 +
 ...unning-topologies-on-a-production-cluster.md |   77 +
 .../Serialization-(prior-to-0.6.0).md           |   52 +
 docs/documentation/Serialization.md             |   62 +
 docs/documentation/Serializers.md               |    4 +
 .../documentation/Setting-up-a-Storm-cluster.md |   85 +
 .../Setting-up-a-Storm-project-in-Eclipse.md    |    1 +
 .../Setting-up-development-environment.md       |   41 +
 docs/documentation/Spout-implementations.md     |   10 +
 ...guage-protocol-(versions-0.7.0-and-below).md |  124 +
 docs/documentation/Structure-of-the-codebase.md |  142 +
 .../Support-for-non-java-languages.md           |    9 +
 docs/documentation/Transactional-topologies.md  |  361 +
 docs/documentation/Trident-API-Overview.md      |  312 +
 docs/documentation/Trident-spouts.md            |   44 +
 docs/documentation/Trident-state.md             |  331 +
 docs/documentation/Trident-tutorial.md          |  254 +
 docs/documentation/Troubleshooting.md           |  145 +
 docs/documentation/Tutorial.md                  |  312 +
 ...nding-the-parallelism-of-a-Storm-topology.md |  123 +
 .../Using-non-JVM-languages-with-Storm.md       |   52 +
 docs/documentation/images/ack_tree.png          |  Bin 0 -> 31463 bytes
 docs/documentation/images/batched-stream.png    |  Bin 0 -> 66336 bytes
 docs/documentation/images/drpc-workflow.png     |  Bin 0 -> 66199 bytes
 .../images/eclipse-project-properties.png       |  Bin 0 -> 80810 bytes
 .../images/example-of-a-running-topology.png    |  Bin 0 -> 81430 bytes
 docs/documentation/images/grouping.png          |  Bin 0 -> 39701 bytes
 .../images/ld-library-path-eclipse-linux.png    |  Bin 0 -> 114597 bytes
 ...onships-worker-processes-executors-tasks.png |  Bin 0 -> 54804 bytes
 docs/documentation/images/spout-vs-state.png    |  Bin 0 -> 24804 bytes
 docs/documentation/images/storm-cluster.png     |  Bin 0 -> 34604 bytes
 docs/documentation/images/topology-tasks.png    |  Bin 0 -> 45960 bytes
 docs/documentation/images/topology.png          |  Bin 0 -> 23147 bytes
 .../images/transactional-batches.png            |  Bin 0 -> 23293 bytes
 .../images/transactional-commit-flow.png        |  Bin 0 -> 17725 bytes
 .../images/transactional-design-2.png           |  Bin 0 -> 13537 bytes
 .../images/transactional-spout-structure.png    |  Bin 0 -> 25067 bytes
 docs/documentation/images/trident-to-storm1.png |  Bin 0 -> 67173 bytes
 docs/documentation/images/trident-to-storm2.png |  Bin 0 -> 68943 bytes
 docs/documentation/images/tuple-dag.png         |  Bin 0 -> 18849 bytes
 docs/documentation/images/tuple_tree.png        |  Bin 0 -> 58186 bytes
 docs/downloads.html                             |  158 +
 docs/feed.xml                                   |   30 +
 docs/images/bullet.gif                          |  Bin 0 -> 82 bytes
 docs/images/download.png                        |  Bin 0 -> 16272 bytes
 docs/images/incubator-logo.png                  |  Bin 0 -> 11651 bytes
 .../logocontest/abartos/stationery_mockup.jpg   |  Bin 0 -> 146498 bytes
 docs/images/logocontest/abartos/storm_logo.png  |  Bin 0 -> 153974 bytes
 docs/images/logocontest/abartos/storm_logo2.png |  Bin 0 -> 115425 bytes
 docs/images/logocontest/abartos/storm_logo3.png |  Bin 0 -> 94950 bytes
 .../images/logocontest/cboustead/storm_logo.png |  Bin 0 -> 67149 bytes
 .../logocontest/cboustead/storm_logo1.png       |  Bin 0 -> 16327 bytes
 docs/images/logocontest/jlee1/storm_logo.jpg    |  Bin 0 -> 189382 bytes
 docs/images/logocontest/jlee2/storm_logo.jpg    |  Bin 0 -> 155666 bytes
 docs/images/logocontest/jlee3/storm_logo.jpg    |  Bin 0 -> 158134 bytes
 docs/images/logocontest/pforrest/storm1.png     |  Bin 0 -> 84569 bytes
 .../pforrest/storm_logo_composite.png           |  Bin 0 -> 139223 bytes
 .../rmarshall/StormLogo_Horizontal.png          |  Bin 0 -> 16481 bytes
 .../rmarshall/StormLogo_Horizontal_NoColour.png |  Bin 0 -> 14358 bytes
 .../logocontest/rmarshall/StormLogo_Square.png  |  Bin 0 -> 14392 bytes
 docs/images/logocontest/sasili/storm_logo.png   |  Bin 0 -> 92196 bytes
 .../images/logocontest/squinones/storm_logo.png |  Bin 0 -> 203263 bytes
 .../logocontest/squinones/storm_logo1.png       |  Bin 0 -> 53325 bytes
 docs/images/logocontest/ssuleman/storm_logo.png |  Bin 0 -> 95509 bytes
 docs/images/logocontest/storm_logo_winner.png   |  Bin 0 -> 34490 bytes
 docs/images/logocontest/zsayari/storm_logo.png  |  Bin 0 -> 120794 bytes
 docs/images/logos/8digits.png                   |  Bin 0 -> 19557 bytes
 docs/images/logos/Yahoo_Japan_logo.png          |  Bin 0 -> 3707 bytes
 docs/images/logos/aeris.png                     |  Bin 0 -> 6268 bytes
 docs/images/logos/alibaba.jpg                   |  Bin 0 -> 43703 bytes
 docs/images/logos/baidu.jpeg                    |  Bin 0 -> 3413 bytes
 docs/images/logos/cerner.gif                    |  Bin 0 -> 2591 bytes
 docs/images/logos/flipboard.jpeg                |  Bin 0 -> 2909 bytes
 docs/images/logos/fullcontact.png               |  Bin 0 -> 24567 bytes
 docs/images/logos/groupon.jpg                   |  Bin 0 -> 41413 bytes
 docs/images/logos/holidaycheck.png              |  Bin 0 -> 3129 bytes
 docs/images/logos/idexx.gif                     |  Bin 0 -> 38689 bytes
 docs/images/logos/mercadolibre.png              |  Bin 0 -> 73388 bytes
 docs/images/logos/navisite.jpg                  |  Bin 0 -> 9358 bytes
 docs/images/logos/ooyala.gif                    |  Bin 0 -> 7830 bytes
 docs/images/logos/parc.png                      |  Bin 0 -> 7256 bytes
 docs/images/logos/quicklizard.png               |  Bin 0 -> 5667 bytes
 docs/images/logos/rocketfuel.png                |  Bin 0 -> 9719 bytes
 docs/images/logos/rubicon.png                   |  Bin 0 -> 10663 bytes
 docs/images/logos/spiderio.png                  |  Bin 0 -> 46790 bytes
 docs/images/logos/spotify.jpeg                  |  Bin 0 -> 3282 bytes
 docs/images/logos/taobao.gif                    |  Bin 0 -> 3262 bytes
 docs/images/logos/twitter.png                   |  Bin 0 -> 4392 bytes
 docs/images/logos/weatherchannel.gif            |  Bin 0 -> 3425 bytes
 docs/images/logos/webmd.jpg                     |  Bin 0 -> 6193 bytes
 docs/images/logos/yelp.png                      |  Bin 0 -> 98431 bytes
 docs/images/mailinglist.png                     |  Bin 0 -> 4245 bytes
 docs/images/storm_header.png                    |  Bin 0 -> 17291 bytes
 docs/images/storm_logo_tagline_color copy.png   |  Bin 0 -> 67928 bytes
 docs/images/storm_logo_tagline_color.png        |  Bin 0 -> 33568 bytes
 docs/images/top_bg.gif                          |  Bin 0 -> 113 bytes
 docs/images/topology.png                        |  Bin 0 -> 59837 bytes
 docs/images/ui_topology_viz.png                 |  Bin 0 -> 112831 bytes
 docs/index.html                                 |  104 +
 docs/news.html                                  |   12 +
 examples/storm-starter/README.markdown          |    9 +-
 .../multilang/resources/asyncSplitsentence.js   |   50 +
 .../multilang/resources/randomsentence.js       |   93 +
 .../multilang/resources/splitsentence.js        |   44 +
 .../storm-starter/multilang/resources/storm.js  |  373 ++
 .../storm-starter/multilang/resources/storm.py  |   87 +-
 .../storm-starter/multilang/resources/storm.rb  |   90 +-
 examples/storm-starter/pom.xml                  |    2 +-
 .../jvm/storm/starter/PrintSampleStream.java    |    4 +-
 .../storm/starter/WordCountTopologyNode.java    |  121 +
 .../src/jvm/storm/starter/util/StormRunner.java |    3 +-
 external/storm-hbase/LICENSE                    |  202 +
 external/storm-hbase/README.md                  |  262 +
 external/storm-hbase/pom.xml                    |   92 +
 .../storm/hbase/bolt/AbstractHBaseBolt.java     |   76 +
 .../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 +
 .../apache/storm/hbase/security/AutoHBase.java  |  243 +
 .../storm/hbase/security/HBaseSecurityUtil.java |   64 +
 .../mapper/SimpleTridentHBaseMapper.java        |   89 +
 .../trident/mapper/TridentHBaseMapper.java      |   49 +
 .../hbase/trident/state/HBaseMapState.java      |  250 +
 .../storm/hbase/trident/state/HBaseQuery.java   |   40 +
 .../storm/hbase/trident/state/HBaseState.java   |  171 +
 .../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/README.md                   |   45 +
 external/storm-hdfs/pom.xml                     |    4 +-
 .../hdfs/bolt/format/DefaultSequenceFormat.java |   17 +
 .../storm/hdfs/bolt/format/SequenceFormat.java  |   22 +-
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |   17 +
 .../hdfs/common/rotation/MoveFileAction.java    |   17 +
 .../hdfs/common/rotation/RotationAction.java    |   17 +
 .../storm/hdfs/common/security/AutoHDFS.java    |  281 +
 .../hdfs/common/security/HdfsSecurityUtil.java  |   30 +-
 .../apache/storm/hdfs/trident/HdfsState.java    |   17 +
 .../storm/hdfs/trident/HdfsStateFactory.java    |   17 +
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |   17 +
 .../trident/format/DefaultSequenceFormat.java   |   17 +
 .../hdfs/trident/format/SequenceFormat.java     |   17 +
 .../trident/rotation/TimedRotationPolicy.java   |   17 +
 .../storm/hdfs/trident/FixedBatchSpout.java     |   17 +
 .../storm/hdfs/trident/TridentFileTopology.java |   17 +
 .../hdfs/trident/TridentSequenceTopology.java   |   17 +
 external/storm-kafka/README.md                  |   35 +-
 external/storm-kafka/pom.xml                    |   23 +-
 .../jvm/storm/kafka/DynamicBrokersReader.java   |    2 +-
 .../ExponentialBackoffMsgRetryManager.java      |  167 +
 .../jvm/storm/kafka/FailedMsgRetryManager.java  |   26 +
 .../src/jvm/storm/kafka/KafkaUtils.java         |   68 +-
 .../src/jvm/storm/kafka/PartitionManager.java   |   56 +-
 .../src/jvm/storm/kafka/SpoutConfig.java        |    8 +
 .../kafka/TopicOffsetOutOfRangeException.java   |   25 +
 .../FieldNameBasedTupleToKafkaMapper.java       |    2 +-
 .../kafka/trident/TridentKafkaEmitter.java      |   43 +-
 .../storm/kafka/DynamicBrokersReaderTest.java   |    1 +
 .../ExponentialBackoffMsgRetryManagerTest.java  |  194 +
 .../src/test/storm/kafka/KafkaUtilsTest.java    |    7 +-
 .../src/test/storm/kafka/TridentKafkaTest.java  |    9 +-
 logback/cluster.xml                             |    6 +-
 logback/worker.xml                              |   41 +
 pom.xml                                         |  102 +-
 .../maven-shade-clojure-transformer/pom.xml     |    4 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |   81 +
 .../storm/maven/plugin/util/CommandExec.java    |   89 +
 .../plugin/versioninfo/VersionInfoMojo.java     |  304 +
 storm-core/pom.xml                              |  403 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |    8 +-
 storm-core/src/clj/backtype/storm/LocalDRPC.clj |    4 +-
 .../src/clj/backtype/storm/MockAutoCred.clj     |   58 +
 storm-core/src/clj/backtype/storm/cluster.clj   |  189 +-
 .../storm/command/upload_credentials.clj        |   35 +
 storm-core/src/clj/backtype/storm/config.clj    |   40 +-
 .../backtype/storm/daemon/builtin_metrics.clj   |   21 +-
 .../src/clj/backtype/storm/daemon/common.clj    |   21 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |  174 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |  143 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  288 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  285 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  234 +-
 .../src/clj/backtype/storm/daemon/task.clj      |    7 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  116 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |   11 +-
 storm-core/src/clj/backtype/storm/event.clj     |    3 +
 .../src/clj/backtype/storm/messaging/loader.clj |   16 +-
 .../backtype/storm/scheduler/EvenScheduler.clj  |    2 +-
 storm-core/src/clj/backtype/storm/testing.clj   |   65 +-
 storm-core/src/clj/backtype/storm/testing4j.clj |   28 +-
 storm-core/src/clj/backtype/storm/thrift.clj    |   28 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  277 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   69 +-
 storm-core/src/clj/backtype/storm/util.clj      |  108 +-
 storm-core/src/clj/backtype/storm/zookeeper.clj |   19 +-
 storm-core/src/clj/storm/trident/testing.clj    |    1 +
 .../src/dev/drpc-simple-acl-test-scenario.yaml  |   11 +
 storm-core/src/dev/resources/storm.js           |  373 ++
 storm-core/src/dev/resources/storm.py           |  261 +-
 storm-core/src/dev/resources/storm.rb           |  237 +-
 storm-core/src/dev/resources/tester_bolt.js     |   44 +
 storm-core/src/dev/resources/tester_spout.js    |   75 +
 storm-core/src/jvm/backtype/storm/Config.java   |  579 +-
 .../jvm/backtype/storm/ConfigValidation.java    |  156 +-
 .../src/jvm/backtype/storm/Constants.java       |    3 +-
 .../backtype/storm/ICredentialsListener.java    |   32 +
 .../src/jvm/backtype/storm/ILocalCluster.java   |    2 +
 .../src/jvm/backtype/storm/StormSubmitter.java  |  178 +-
 .../storm/drpc/DRPCInvocationsClient.java       |   91 +-
 .../src/jvm/backtype/storm/drpc/DRPCSpout.java  |  100 +-
 .../jvm/backtype/storm/drpc/ReturnResults.java  |   35 +-
 .../storm/generated/AuthorizationException.java |  345 +
 .../backtype/storm/generated/Credentials.java   |  390 ++
 .../storm/generated/DistributedRPC.java         |  110 +-
 .../generated/DistributedRPCInvocations.java    |  352 +-
 .../storm/generated/GetInfoOptions.java         |  350 +
 .../jvm/backtype/storm/generated/Nimbus.java    | 5262 ++++++++++++---
 .../storm/generated/NumErrorsChoice.java        |   64 +
 .../backtype/storm/generated/SubmitOptions.java |   98 +-
 .../backtype/storm/generated/TopologyInfo.java  |  192 +-
 .../storm/generated/TopologySummary.java        |  192 +-
 .../storm/grouping/PartialKeyGrouping.java      |   57 +
 .../backtype/storm/messaging/netty/Client.java  |   98 +-
 .../storm/messaging/netty/ControlMessage.java   |    4 +-
 .../storm/messaging/netty/MessageDecoder.java   |   32 +-
 .../storm/messaging/netty/MessageEncoder.java   |    4 +
 .../storm/messaging/netty/SaslMessageToken.java |   99 +
 .../storm/messaging/netty/SaslNettyClient.java  |  166 +
 .../messaging/netty/SaslNettyClientState.java   |   31 +
 .../storm/messaging/netty/SaslNettyServer.java  |  165 +
 .../messaging/netty/SaslNettyServerState.java   |   31 +
 .../messaging/netty/SaslStormClientHandler.java |  158 +
 .../netty/SaslStormServerAuthorizeHandler.java  |   83 +
 .../messaging/netty/SaslStormServerHandler.java |  155 +
 .../storm/messaging/netty/SaslUtils.java        |   74 +
 .../backtype/storm/messaging/netty/Server.java  |  106 +-
 .../netty/StormClientPipelineFactory.java       |   12 +-
 .../messaging/netty/StormServerHandler.java     |    2 +-
 .../netty/StormServerPipelineFactory.java       |   20 +-
 .../storm/multilang/JsonSerializer.java         |   14 +-
 .../jvm/backtype/storm/scheduler/Cluster.java   |   13 +
 .../scheduler/multitenant/DefaultPool.java      |  219 +
 .../storm/scheduler/multitenant/FreePool.java   |  125 +
 .../scheduler/multitenant/IsolatedPool.java     |  346 +
 .../multitenant/MultitenantScheduler.java       |   98 +
 .../storm/scheduler/multitenant/Node.java       |  343 +
 .../storm/scheduler/multitenant/NodePool.java   |  296 +
 .../storm/security/INimbusCredentialPlugin.java |   47 +
 .../backtype/storm/security/auth/AuthUtils.java |  228 +-
 .../auth/DefaultHttpCredentialsPlugin.java      |   87 +
 .../security/auth/DefaultPrincipalToLocal.java  |   43 +
 .../storm/security/auth/IAutoCredentials.java   |   55 +
 .../security/auth/ICredentialsRenewer.java      |   41 +
 .../auth/IGroupMappingServiceProvider.java      |   42 +
 .../security/auth/IHttpCredentialsPlugin.java   |   50 +
 .../storm/security/auth/IPrincipalToLocal.java  |   41 +
 .../storm/security/auth/ITransportPlugin.java   |   14 +-
 .../security/auth/KerberosPrincipalToLocal.java |   45 +
 .../storm/security/auth/ReqContext.java         |   10 +-
 .../security/auth/SaslTransportPlugin.java      |   44 +-
 .../security/auth/ShellBasedGroupsMapping.java  |   94 +
 .../security/auth/SimpleTransportPlugin.java    |   61 +-
 .../security/auth/SingleUserPrincipal.java      |   56 +
 .../storm/security/auth/TBackoffConnect.java    |   77 +
 .../storm/security/auth/ThriftClient.java       |   85 +-
 .../security/auth/ThriftConnectionType.java     |   77 +
 .../storm/security/auth/ThriftServer.java       |   19 +-
 .../auth/authorizer/DRPCAuthorizerBase.java     |   46 +
 .../authorizer/DRPCSimpleACLAuthorizer.java     |  157 +
 .../auth/authorizer/DenyAuthorizer.java         |    4 +-
 .../auth/authorizer/NoopAuthorizer.java         |    6 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |  131 +
 .../authorizer/SimpleWhitelistAuthorizer.java   |   70 +
 .../auth/digest/DigestSaslTransportPlugin.java  |    1 +
 .../storm/security/auth/kerberos/AutoTGT.java   |  281 +
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |  108 +
 .../kerberos/AutoTGTKrb5LoginModuleTest.java    |   44 +
 .../auth/kerberos/ClientCallbackHandler.java    |  104 +
 .../kerberos/KerberosSaslTransportPlugin.java   |  206 +
 .../auth/kerberos/ServerCallbackHandler.java    |   86 +
 .../auth/kerberos/jaas_kerberos_cluster.conf    |   31 +
 .../auth/kerberos/jaas_kerberos_launcher.conf   |   12 +
 .../DefaultSerializationDelegate.java           |   61 +
 .../GzipBridgeSerializationDelegate.java        |   64 +
 .../GzipSerializationDelegate.java              |   68 +
 .../serialization/SerializationDelegate.java    |   35 +
 .../jvm/backtype/storm/spout/ShellSpout.java    |   65 +-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |  218 +-
 .../storm/testing/CompleteTopologyParam.java    |   22 +-
 .../testing/ForwardingMetricsConsumer.java      |   95 +
 .../storm/testing/PythonShellMetricsBolt.java   |   17 +
 .../storm/testing/PythonShellMetricsSpout.java  |   17 +
 .../testing/SingleUserSimpleTransport.java      |   37 +
 .../state/TestTransactionalState.java           |   47 +
 .../transactional/state/TransactionalState.java |   56 +-
 .../src/jvm/backtype/storm/tuple/ITuple.java    |  136 +
 .../src/jvm/backtype/storm/tuple/Tuple.java     |  113 +-
 .../storm/ui/InvalidRequestException.java       |   17 +
 .../jvm/backtype/storm/utils/DRPCClient.java    |   63 +-
 .../backtype/storm/utils/DisruptorQueue.java    |   56 +-
 .../jvm/backtype/storm/utils/LocalState.java    |   44 +-
 .../src/jvm/backtype/storm/utils/Monitor.java   |    8 +-
 .../jvm/backtype/storm/utils/NimbusClient.java  |   11 +-
 .../jvm/backtype/storm/utils/ShellProcess.java  |   11 +-
 .../jvm/backtype/storm/utils/ShellUtils.java    |  498 ++
 .../StormBoundedExponentialBackoffRetry.java    |   74 +
 .../src/jvm/backtype/storm/utils/TestUtils.java |   34 +
 .../src/jvm/backtype/storm/utils/Utils.java     |  213 +-
 .../jvm/backtype/storm/utils/VersionInfo.java   |  131 +
 .../backtype/storm/utils/ZookeeperAuthInfo.java |    9 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |   84 +
 .../trident/drpc/ReturnResultsReducer.java      |   13 +-
 .../storm/trident/testing/MockTridentTuple.java |  166 -
 .../topology/state/TestTransactionalState.java  |   47 +
 .../topology/state/TransactionalState.java      |   58 +-
 .../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            |  366 +
 storm-core/src/multilang/py/storm.py            |   25 +-
 storm-core/src/multilang/rb/storm.rb            |   55 +-
 .../src/native/worker-launcher/.autom4te.cfg    |   42 +
 .../worker-launcher/.deps/worker-launcher.Po    |    1 +
 .../src/native/worker-launcher/Makefile.am      |   32 +
 .../src/native/worker-launcher/configure.ac     |   50 +
 .../native/worker-launcher/impl/configuration.c |  340 +
 .../native/worker-launcher/impl/configuration.h |   45 +
 .../src/native/worker-launcher/impl/main.c      |  210 +
 .../worker-launcher/impl/worker-launcher.c      |  782 +++
 .../worker-launcher/impl/worker-launcher.h      |  129 +
 .../worker-launcher/test/test-worker-launcher.c |  340 +
 storm-core/src/py/__init__.py                   |   16 +
 storm-core/src/py/storm/DistributedRPC-remote   |   18 +
 storm-core/src/py/storm/DistributedRPC.py       |   37 +-
 .../py/storm/DistributedRPCInvocations-remote   |   18 +
 .../src/py/storm/DistributedRPCInvocations.py   |   96 +-
 storm-core/src/py/storm/Nimbus-remote           |   32 +
 storm-core/src/py/storm/Nimbus.py               |  878 ++-
 storm-core/src/py/storm/__init__.py             |   16 +
 storm-core/src/py/storm/constants.py            |   16 +
 storm-core/src/py/storm/ttypes.py               | 1323 +++-
 .../storm-core-version-info.properties          |   24 +
 storm-core/src/storm.thrift                     |   69 +-
 storm-core/src/ui/public/component.html         |   37 +-
 storm-core/src/ui/public/css/style.css          |    9 +
 storm-core/src/ui/public/favicon.ico            |  Bin 0 -> 18280 bytes
 storm-core/src/ui/public/images/spinner.gif     |  Bin 0 -> 23470 bytes
 storm-core/src/ui/public/index.html             |   18 +-
 .../src/ui/public/js/jquery.blockUI.min.js      |    6 +
 storm-core/src/ui/public/js/purl.js             |  267 -
 storm-core/src/ui/public/js/script.js           |   17 +-
 storm-core/src/ui/public/js/url.min.js          |    1 +
 storm-core/src/ui/public/js/visualization.js    |   16 +-
 .../public/templates/anti-forgery-template.html |   19 +
 .../templates/component-page-template.html      |  593 +-
 .../public/templates/index-page-template.html   |  231 +-
 .../templates/topology-page-template.html       |  216 +-
 .../src/ui/public/templates/user-template.html  |   25 +
 storm-core/src/ui/public/topology.html          |   37 +-
 .../test/clj/backtype/storm/cluster_test.clj    |   93 +-
 .../test/clj/backtype/storm/config_test.clj     |   11 +
 .../test/clj/backtype/storm/drpc_test.clj       |   14 +-
 .../clj/backtype/storm/integration_test.clj     |   10 +-
 .../clj/backtype/storm/local_state_test.clj     |   14 +-
 .../test/clj/backtype/storm/logviewer_test.clj  |  210 +
 .../storm/messaging/netty_integration_test.clj  |    4 +-
 .../storm/messaging/netty_unit_test.clj         |   32 +-
 .../test/clj/backtype/storm/multilang_test.clj  |   55 +-
 .../test/clj/backtype/storm/nimbus_test.clj     |  377 +-
 .../scheduler/multitenant_scheduler_test.clj    |  833 +++
 .../test/clj/backtype/storm/scheduler_test.clj  |   21 +
 .../storm/security/auth/AuthUtils_test.clj      |   16 +-
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |   40 +
 .../storm/security/auth/ThriftClient_test.clj   |   28 +-
 .../storm/security/auth/ThriftServer_test.clj   |    8 +-
 .../backtype/storm/security/auth/auth_test.clj  |  374 +-
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |  226 +
 .../security/auth/auto_login_module_test.clj    |   91 +
 .../storm/security/auth/drpc-auth-alice.jaas    |    5 +
 .../storm/security/auth/drpc-auth-bob.jaas      |    5 +
 .../storm/security/auth/drpc-auth-charlie.jaas  |    5 +
 .../storm/security/auth/drpc-auth-server.jaas   |    6 +
 .../storm/security/auth/drpc_auth_test.clj      |  315 +
 .../storm/security/auth/nimbus_auth_test.clj    |  181 +
 .../test/clj/backtype/storm/submitter_test.clj  |   75 +
 .../test/clj/backtype/storm/supervisor_test.clj |  282 +-
 .../test/clj/backtype/storm/testing4j_test.clj  |   32 +
 .../clj/backtype/storm/transactional_test.clj   |   27 +-
 .../utils/ZookeeperServerCnxnFactory_test.clj   |   35 +
 .../test/clj/backtype/storm/utils_test.clj      |   61 +-
 .../test/clj/storm/trident/state_test.clj       |   25 +-
 .../test/clj/storm/trident/tuple_test.clj       |   28 +-
 .../storm/grouping/PartialKeyGroupingTest.java  |   46 +
 .../GzipBridgeSerializationDelegateTest.java    |   82 +
 .../storm/utils/DisruptorQueueTest.java         |   25 +-
 ...StormBoundedExponentialBackoffRetryTest.java |  101 +
 storm-dist/binary/LICENSE                       |   25 +-
 storm-dist/binary/pom.xml                       |    2 +-
 storm-dist/binary/src/main/assembly/binary.xml  |   23 +-
 storm-dist/source/pom.xml                       |    2 +-
 517 files changed, 50619 insertions(+), 3530 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/drpc.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/drpc.clj
index ec7e60e,95fa1be..7fee7f0
--- a/storm-core/src/clj/backtype/storm/daemon/drpc.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/drpc.clj
@@@ -29,9 -24,17 +24,15 @@@
              ThreadPoolExecutor ArrayBlockingQueue TimeUnit])
    (:import [backtype.storm.daemon Shutdownable])
    (:import [java.net InetAddress])
+   (:import [backtype.storm.generated AuthorizationException])
 -  (:use [backtype.storm bootstrap config log])
 +  (:use [backtype.storm config log util])
+   (:use [backtype.storm.daemon common])
+   (:use [backtype.storm.ui helpers])
+   (:use compojure.core)
+   (:use ring.middleware.reload)
+   (:require [compojure.handler :as handler])
    (:gen-class))
  
 -(bootstrap)
 -
  (defn timeout-check-secs [] 5)
  
  (defn acquire-queue [queues-atom function]

http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/executor.clj
index 28a4c75,a6e606d..f0bef92
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@@ -15,27 -15,21 +15,29 @@@
  ;; limitations under the License.
  (ns backtype.storm.daemon.executor
    (:use [backtype.storm.daemon common])
 -  (:use [backtype.storm bootstrap])
 +  (:use [backtype.storm util config log timer stats])
 +  (:import [java.util List Random HashMap ArrayList LinkedList Map])
+   (:import [backtype.storm ICredentialsListener])
    (:import [backtype.storm.hooks ITaskHook])
 -  (:import [backtype.storm.tuple Tuple])
 -  (:import [backtype.storm.spout ISpoutWaitStrategy])
 +  (:import [backtype.storm.tuple Tuple Fields TupleImpl MessageId])
 +  (:import [backtype.storm.spout ISpoutWaitStrategy ISpout SpoutOutputCollector ISpoutOutputCollector])
    (:import [backtype.storm.hooks.info SpoutAckInfo SpoutFailInfo
              EmitInfo BoltFailInfo BoltAckInfo BoltExecuteInfo])
-   (:import [backtype.storm.metric.api IMetric IMetricsConsumer$TaskInfo IMetricsConsumer$DataPoint StateMetric])
-   (:import [backtype.storm Config Constants])
 -  (:import [backtype.storm.metric.api IMetric IMetricsConsumer$TaskInfo IMetricsConsumer$DataPoint])
 -  (:import [backtype.storm Config])
 +  (:import [backtype.storm.grouping CustomStreamGrouping])
 +  (:import [backtype.storm.task WorkerTopologyContext IBolt OutputCollector IOutputCollector])
 +  (:import [backtype.storm.generated GlobalStreamId])
 +  (:import [backtype.storm.utils Utils MutableObject RotatingMap RotatingMap$ExpiredCallback MutableLong Time])
 +  (:import [com.lmax.disruptor InsufficientCapacityException])
 +  (:import [backtype.storm.serialization KryoTupleSerializer KryoTupleDeserializer])
 +  (:import [backtype.storm.daemon Shutdownable])
++  (:import [backtype.storm.metric.api IMetric IMetricsConsumer$TaskInfo IMetricsConsumer$DataPoint StateMetric])
++  (:import [backtype.storm Config Constants])
+   (:import [java.util.concurrent ConcurrentLinkedQueue])
 -  (:require [backtype.storm [tuple :as tuple]])
 +  (:require [backtype.storm [tuple :as tuple] [thrift :as thrift]
 +             [cluster :as cluster] [disruptor :as disruptor] [stats :as stats]])
    (:require [backtype.storm.daemon [task :as task]])
 -  (:require [backtype.storm.daemon.builtin-metrics :as builtin-metrics]))
 -
 -(bootstrap)
 +  (:require [backtype.storm.daemon.builtin-metrics :as builtin-metrics])
 +  (:require [clojure.set :as set]))
  
  (defn- mk-fields-grouper [^Fields out-fields ^Fields group-fields ^List target-tasks]
    (let [num-tasks (count target-tasks)
@@@ -58,7 -52,7 +60,7 @@@
      ))
  
  (defn- mk-grouper
--  "Returns a function that returns a vector of which task indices to send tuple to, or just a single task index."
++  "returns a function that returns a vector of which task indices to send tuple to, or just a single task index."
    [^WorkerTopologyContext context component-id stream-id ^Fields out-fields thrift-grouping ^List target-tasks]
    (let [num-tasks (count target-tasks)
          random (Random.)

http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index c4d0adc,0c7612b..a65dd8a
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@@ -14,29 -14,20 +14,34 @@@
  ;; See the License for the specific language governing permissions and
  ;; limitations under the License.
  (ns backtype.storm.daemon.nimbus
 +  (:import [org.apache.thrift.server THsHaServer THsHaServer$Args])
 +  (:import [org.apache.thrift.protocol TBinaryProtocol TBinaryProtocol$Factory])
 +  (:import [org.apache.thrift.exception])
 +  (:import [org.apache.thrift.transport TNonblockingServerTransport TNonblockingServerSocket])
 +  (:import [org.apache.commons.io FileUtils])
-   (:import [java.nio ByteBuffer])
+   (:import [java.nio ByteBuffer]
+            [java.util Collections])
 -  (:import [java.io FileNotFoundException])
 +  (:import [java.io FileNotFoundException File FileOutputStream])
    (:import [java.nio.channels Channels WritableByteChannel])
+   (:import [backtype.storm.security.auth ThriftServer ThriftConnectionType ReqContext AuthUtils])
    (:use [backtype.storm.scheduler.DefaultScheduler])
    (:import [backtype.storm.scheduler INimbus SupervisorDetails WorkerSlot TopologyDetails
              Cluster Topologies SchedulerAssignment SchedulerAssignmentImpl DefaultScheduler ExecutorDetails])
 -  (:import [backtype.storm.generated AuthorizationException GetInfoOptions
 -                                     NumErrorsChoice])
 -  (:use [backtype.storm bootstrap util])
 -  (:use [backtype.storm.config :only [validate-configs-with-schemas]])
++<<<<<<< HEAD
 +  (:import [backtype.storm.utils TimeCacheMap TimeCacheMap$ExpiredCallback Utils ThriftTopologyUtils
 +            BufferFileInputStream])
 +  (:import [backtype.storm.generated NotAliveException AlreadyAliveException StormTopology ErrorInfo
 +            ExecutorInfo InvalidTopologyException Nimbus$Iface Nimbus$Processor SubmitOptions TopologyInitialStatus
 +            KillOptions RebalanceOptions ClusterSummary SupervisorSummary TopologySummary TopologyInfo
-             ExecutorSummary])
++            ExecutorSummary AuthorizationException GetInfoOptions NumErrorsChoice])
 +  (:import [backtype.storm.daemon Shutdownable])
 +  (:use [backtype.storm util config log timer])
-   (:use [backtype.storm.daemon common])
 +  (:require [backtype.storm [cluster :as cluster] [stats :as stats]])
 +  (:require [clojure.set :as set])
 +  (:import [backtype.storm.daemon.common StormBase Assignment])
++;  (:use [backtype.storm.config :only [validate-configs-with-schemas]])
+   (:use [backtype.storm.daemon common])
+   (:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms])
    (:gen-class
      :methods [^{:static true} [launch [backtype.storm.scheduler.INimbus] void]]))
  

http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 0dc578a,a5d5aef..b6063e2
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@@ -14,20 -14,16 +14,24 @@@
  ;; See the License for the specific language governing permissions and
  ;; limitations under the License.
  (ns backtype.storm.daemon.supervisor
+   (:import [java.io OutputStreamWriter BufferedWriter IOException])
    (:import [backtype.storm.scheduler ISupervisor]
 +           [backtype.storm.utils LocalState Time Utils]
 +           [backtype.storm.daemon Shutdownable]
 +           [backtype.storm.daemon.common SupervisorInfo]
 +           [backtype.storm Constants]
             [java.net JarURLConnection]
 -           [java.net URI])
 -  (:use [backtype.storm bootstrap])
 +           [java.net URI]
 +           [org.apache.commons.io FileUtils]
 +           [java.io File])
 +  (:use [backtype.storm config util log timer])
    (:use [backtype.storm.daemon common])
 -  (:require [backtype.storm.daemon [worker :as worker]])
 +  (:require [backtype.storm.daemon [worker :as worker]]
 +            [backtype.storm [process-simulator :as psim] [cluster :as cluster] [event :as event]]
 +            [clojure.set :as set])
+   (:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms])
+   (:import [org.yaml.snakeyaml Yaml]
+            [org.yaml.snakeyaml.constructor SafeConstructor])
    (:gen-class
      :methods [^{:static true} [launch [backtype.storm.scheduler.ISupervisor] void]]))
  

http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/task.clj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/8358bdee/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/worker.clj
index cf14b27,8bba5e4..acda96d
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@@ -15,25 -15,20 +15,28 @@@
  ;; limitations under the License.
  (ns backtype.storm.daemon.worker
    (:use [backtype.storm.daemon common])
 -  (:use [backtype.storm bootstrap])
 +  (:use [backtype.storm config log util timer])
    (:require [backtype.storm.daemon [executor :as executor]])
 +  (:require [backtype.storm [disruptor :as disruptor] [cluster :as cluster]])
 +  (:require [clojure.set :as set])
 +  (:require [backtype.storm.messaging.loader :as msg-loader])
    (:import [java.util.concurrent Executors])
    (:import [java.util ArrayList HashMap])
 -  (:import [backtype.storm.utils TransferDrainer])
 +  (:import [backtype.storm.utils TransferDrainer ThriftTopologyUtils])
    (:import [backtype.storm.messaging TransportFactory])
    (:import [backtype.storm.messaging TaskMessage IContext IConnection])
 +  (:import [backtype.storm.daemon.common WorkerHeartbeat])
 +  (:import [backtype.storm.daemon Shutdownable])
 +  (:import [backtype.storm.serialization KryoTupleSerializer])
 +  (:import [backtype.storm.generated StormTopology])
 +  (:import [backtype.storm.tuple Fields])
 +  (:import [backtype.storm.task WorkerTopologyContext])
 +  (:import [backtype.storm Constants])
+   (:import [backtype.storm.security.auth AuthUtils])
+   (:import [javax.security.auth Subject])
+   (:import [java.security PrivilegedExceptionAction])
    (:gen-class))
  
 -(bootstrap)
 -
  (defmulti mk-suicide-fn cluster-mode)
  
  (defn read-worker-executors [storm-conf storm-cluster-state storm-id assignment-id port assignment-versions]