Merge branch 'thrift-backport' of https://github.com/redsanket/storm into STORM-1258
STORM-1258: port thrift.clj to Thrift.java Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5e4c0a74 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5e4c0a74 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5e4c0a74 Branch: refs/heads/master Commit: 5e4c0a74dbda21d45b2206e929b173fa14833d71 Parents: bb60f11 de9cb10 Author: Robert (Bobby) Evans <[email protected]> Authored: Thu Feb 18 10:00:19 2016 -0600 Committer: Robert (Bobby) Evans <[email protected]> Committed: Thu Feb 18 10:00:19 2016 -0600 ---------------------------------------------------------------------- examples/storm-starter/pom.xml | 10 + .../org/apache/storm/starter/clj/word_count.clj | 3 +- pom.xml | 1 + storm-clojure/pom.xml | 74 ++++ .../src/clj/org/apache/storm/clojure.clj | 207 +++++++++++ .../src/clj/org/apache/storm/thrift.clj | 286 +++++++++++++++ storm-clojure/src/test/clj/clojure_test.clj | 158 +++++++++ storm-core/src/clj/org/apache/storm/clojure.clj | 207 ----------- .../clj/org/apache/storm/command/get_errors.clj | 3 +- .../clj/org/apache/storm/command/monitor.clj | 2 +- .../clj/org/apache/storm/command/rebalance.clj | 3 +- .../org/apache/storm/command/set_log_level.clj | 3 +- .../apache/storm/command/shell_submission.clj | 2 +- .../src/clj/org/apache/storm/daemon/common.clj | 121 ++++--- .../clj/org/apache/storm/daemon/executor.clj | 31 +- .../src/clj/org/apache/storm/daemon/task.clj | 4 +- .../clj/org/apache/storm/internal/clojure.clj | 201 +++++++++++ .../clj/org/apache/storm/internal/thrift.clj | 96 +++++ storm-core/src/clj/org/apache/storm/testing.clj | 29 +- storm-core/src/clj/org/apache/storm/thrift.clj | 286 --------------- storm-core/src/clj/org/apache/storm/ui/core.clj | 2 +- storm-core/src/jvm/org/apache/storm/Thrift.java | 351 +++++++++++++++++++ .../jvm/org/apache/storm/testing/NGrouping.java | 4 +- .../storm/testing/PythonShellMetricsBolt.java | 14 +- .../storm/testing/PythonShellMetricsSpout.java | 8 +- .../src/jvm/org/apache/storm/utils/Utils.java | 7 + .../org/apache/storm/integration_test.clj | 259 +++++++------- .../org/apache/storm/testing4j_test.clj | 72 ++-- .../test/clj/org/apache/storm/clojure_test.clj | 64 ++-- .../test/clj/org/apache/storm/cluster_test.clj | 3 +- .../test/clj/org/apache/storm/drpc_test.clj | 23 +- .../test/clj/org/apache/storm/grouping_test.clj | 56 +-- .../storm/messaging/netty_integration_test.clj | 18 +- .../clj/org/apache/storm/messaging_test.clj | 14 +- .../test/clj/org/apache/storm/metrics_test.clj | 85 +++-- .../test/clj/org/apache/storm/nimbus_test.clj | 257 +++++++++----- .../scheduler/resource_aware_scheduler_test.clj | 3 +- .../clj/org/apache/storm/supervisor_test.clj | 154 ++++---- .../clj/org/apache/storm/tick_tuple_test.clj | 15 +- .../clj/org/apache/storm/transactional_test.clj | 3 +- 40 files changed, 2128 insertions(+), 1011 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/5e4c0a74/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/5e4c0a74/storm-core/src/jvm/org/apache/storm/utils/Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/5e4c0a74/storm-core/test/clj/org/apache/storm/supervisor_test.clj ----------------------------------------------------------------------
