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 2014/04/22 18:39:19 UTC
[07/10] git commit: Merge remote-tracking branch 'apache/master' into
d2r-worker-lancher-args
Merge remote-tracking branch 'apache/master' into d2r-worker-lancher-args
Conflicts:
pom.xml
storm-core/src/clj/backtype/storm/ui/core.clj
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/bf557f89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/bf557f89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/bf557f89
Branch: refs/heads/master
Commit: bf557f892702551f33733b95c29c431df5c9816c
Parents: 2fb66fa 1a0b46e
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Apr 15 13:33:20 2014 +0000
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Apr 15 13:33:20 2014 +0000
----------------------------------------------------------------------
.gitignore | 2 +-
CHANGELOG.md | 29 +
DISCLAIMER | 10 +
NOTICE | 9 +-
README.markdown | 5 +-
bin/storm | 19 +-
bin/storm-config.cmd | 19 +-
bin/storm.cmd | 14 +-
examples/storm-starter/README.markdown | 108 +
.../multilang/resources/splitsentence.py | 24 +
.../multilang/resources/splitsentence.rb | 26 +
.../storm-starter/multilang/resources/storm.py | 221 ++
.../storm-starter/multilang/resources/storm.rb | 200 ++
examples/storm-starter/pom.xml | 161 ++
.../src/clj/storm/starter/clj/word_count.clj | 95 +
.../jvm/storm/starter/BasicDRPCTopology.java | 78 +
.../jvm/storm/starter/ExclamationTopology.java | 87 +
.../src/jvm/storm/starter/ManualDRPC.java | 68 +
.../jvm/storm/starter/PrintSampleStream.java | 54 +
.../src/jvm/storm/starter/ReachTopology.java | 196 ++
.../src/jvm/storm/starter/RollingTopWords.java | 78 +
.../jvm/storm/starter/SingleJoinExample.java | 64 +
.../storm/starter/TransactionalGlobalCount.java | 173 ++
.../jvm/storm/starter/TransactionalWords.java | 246 ++
.../jvm/storm/starter/WordCountTopology.java | 107 +
.../storm/starter/bolt/AbstractRankerBolt.java | 110 +
.../starter/bolt/IntermediateRankingsBolt.java | 58 +
.../src/jvm/storm/starter/bolt/PrinterBolt.java | 37 +
.../storm/starter/bolt/RollingCountBolt.java | 142 ++
.../jvm/storm/starter/bolt/SingleJoinBolt.java | 114 +
.../storm/starter/bolt/TotalRankingsBolt.java | 59 +
.../starter/spout/RandomSentenceSpout.java | 64 +
.../storm/starter/spout/TwitterSampleSpout.java | 122 +
.../tools/NthLastModifiedTimeTracker.java | 70 +
.../src/jvm/storm/starter/tools/Rankable.java | 32 +
.../starter/tools/RankableObjectWithFields.java | 148 ++
.../src/jvm/storm/starter/tools/Rankings.java | 156 ++
.../starter/tools/SlidingWindowCounter.java | 119 +
.../storm/starter/tools/SlotBasedCounter.java | 118 +
.../jvm/storm/starter/trident/TridentReach.java | 156 ++
.../storm/starter/trident/TridentWordCount.java | 85 +
.../src/jvm/storm/starter/util/StormRunner.java | 39 +
.../jvm/storm/starter/util/TupleHelpers.java | 33 +
.../bolt/IntermediateRankingsBoltTest.java | 146 ++
.../starter/bolt/RollingCountBoltTest.java | 113 +
.../starter/bolt/TotalRankingsBoltTest.java | 147 ++
.../storm/starter/tools/MockTupleHelpers.java | 40 +
.../tools/NthLastModifiedTimeTrackerTest.java | 125 +
.../tools/RankableObjectWithFieldsTest.java | 252 ++
.../jvm/storm/starter/tools/RankingsTest.java | 368 +++
.../starter/tools/SlidingWindowCounterTest.java | 106 +
.../starter/tools/SlotBasedCounterTest.java | 181 ++
pom.xml | 121 +-
.../maven-shade-clojure-transformer/pom.xml | 39 +
.../maven/shade/clojure/ClojureTransformer.java | 72 +
storm-core/pom.xml | 77 +-
.../src/clj/backtype/storm/daemon/drpc.clj | 8 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 8 +-
storm-core/src/clj/backtype/storm/thrift.clj | 4 +-
storm-core/src/clj/backtype/storm/timer.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 28 +-
storm-core/src/clj/backtype/storm/util.clj | 5 +-
storm-core/src/clj/backtype/storm/zookeeper.clj | 4 +-
.../src/jvm/backtype/storm/StormSubmitter.java | 6 +-
.../storm/drpc/DRPCInvocationsClient.java | 10 +-
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 4 +-
.../jvm/backtype/storm/drpc/ReturnResults.java | 2 +-
.../storm/generated/AlreadyAliveException.java | 46 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 60 +-
.../jvm/backtype/storm/generated/BoltStats.java | 182 +-
.../storm/generated/ClusterSummary.java | 86 +-
.../storm/generated/ComponentCommon.java | 100 +-
.../storm/generated/ComponentObject.java | 66 +-
.../storm/generated/DRPCExecutionException.java | 46 +-
.../backtype/storm/generated/DRPCRequest.java | 60 +-
.../storm/generated/DistributedRPC.java | 180 +-
.../generated/DistributedRPCInvocations.java | 384 +--
.../jvm/backtype/storm/generated/ErrorInfo.java | 60 +-
.../backtype/storm/generated/ExecutorInfo.java | 60 +-
.../storm/generated/ExecutorSpecificStats.java | 56 +-
.../backtype/storm/generated/ExecutorStats.java | 106 +-
.../storm/generated/ExecutorSummary.java | 114 +-
.../storm/generated/GlobalStreamId.java | 60 +-
.../jvm/backtype/storm/generated/Grouping.java | 112 +-
.../generated/InvalidTopologyException.java | 46 +-
.../backtype/storm/generated/JavaObject.java | 66 +-
.../backtype/storm/generated/JavaObjectArg.java | 90 +-
.../backtype/storm/generated/KillOptions.java | 44 +-
.../jvm/backtype/storm/generated/Nimbus.java | 2368 +++++++++---------
.../storm/generated/NotAliveException.java | 46 +-
.../backtype/storm/generated/NullStruct.java | 32 +-
.../storm/generated/RebalanceOptions.java | 76 +-
.../storm/generated/ShellComponent.java | 56 +-
.../jvm/backtype/storm/generated/SpoutSpec.java | 60 +-
.../backtype/storm/generated/SpoutStats.java | 122 +-
.../storm/generated/StateSpoutSpec.java | 60 +-
.../backtype/storm/generated/StormTopology.java | 98 +-
.../backtype/storm/generated/StreamInfo.java | 66 +-
.../backtype/storm/generated/SubmitOptions.java | 46 +-
.../storm/generated/SupervisorSummary.java | 102 +-
.../backtype/storm/generated/TopologyInfo.java | 136 +-
.../storm/generated/TopologyInitialStatus.java | 4 +-
.../storm/generated/TopologySummary.java | 130 +-
.../backtype/storm/messaging/netty/Client.java | 195 +-
.../backtype/storm/messaging/netty/Context.java | 30 +-
.../storm/messaging/netty/MessageBatch.java | 55 +-
.../backtype/storm/messaging/netty/Server.java | 2 +-
.../messaging/netty/StormClientHandler.java | 80 +-
.../storm/security/auth/ITransportPlugin.java | 8 +-
.../security/auth/SaslTransportPlugin.java | 24 +-
.../security/auth/SimpleTransportPlugin.java | 24 +-
.../storm/security/auth/ThriftClient.java | 10 +-
.../storm/security/auth/ThriftServer.java | 4 +-
.../auth/digest/DigestSaslTransportPlugin.java | 10 +-
.../jvm/backtype/storm/utils/DRPCClient.java | 10 +-
.../jvm/backtype/storm/utils/NimbusClient.java | 2 +-
.../src/jvm/backtype/storm/utils/Time.java | 18 +-
.../src/jvm/backtype/storm/utils/Utils.java | 37 +-
.../trident/drpc/ReturnResultsReducer.java | 2 +-
.../jvm/storm/trident/state/map/OpaqueMap.java | 6 +-
.../trident/state/map/RemovableMapState.java | 8 +
.../storm/trident/testing/MemoryMapState.java | 27 +-
.../jvm/storm/trident/util/TridentUtils.java | 8 +-
.../storm/security/auth/ThriftClient_test.clj | 2 +-
.../storm/security/auth/ThriftServer_test.clj | 2 +-
.../backtype/storm/security/auth/auth_test.clj | 4 +-
.../test/clj/backtype/storm/utils_test.clj | 13 +-
.../test/clj/storm/trident/state_test.clj | 33 +-
storm-deps/libthrift/pom.xml | 87 -
storm-dist/LICENSE | 297 ---
storm-dist/NOTICE | 36 -
storm-dist/binary/LICENSE | 297 +++
storm-dist/binary/NOTICE | 31 +
storm-dist/binary/pom.xml | 78 +
storm-dist/binary/src/main/assembly/binary.xml | 117 +
storm-dist/pom.xml | 90 -
storm-dist/source/pom.xml | 77 +
storm-dist/source/src/main/assembly/source.xml | 42 +
storm-dist/src/main/assembly/binary.xml | 100 -
storm-dist/src/main/assembly/source.xml | 42 -
140 files changed, 9210 insertions(+), 3747 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bf557f89/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3a0c26b,8894aaf..4b35ab4
--- a/pom.xml
+++ b/pom.xml
@@@ -166,8 -176,7 +176,8 @@@
<clojure-complete.version>0.2.3</clojure-complete.version>
<mockito.version>1.9.5</mockito.version>
<reply.version>0.3.0</reply.version>
+ <conjure.version>2.1.3</conjure.version>
-
+ <zookeeper.version>3.4.5</zookeeper.version>
</properties>
@@@ -412,23 -444,18 +445,24 @@@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.clojars.runa</groupId>
+ <artifactId>conjure</artifactId>
+ <version>${conjure.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>libthrift7</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.7.0</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <!-- used by examples/storm-starter -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bf557f89/storm-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bf557f89/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/core.clj
index e46871a,ad4b97f..87e79fa
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@@ -1017,9 -1016,10 +1017,10 @@@
(-> (main-page)
ui-template))
(GET "/topology/:id" [:as {cookies :cookies} id & m]
- (let [include-sys? (get-include-sys? cookies)]
+ (let [include-sys? (get-include-sys? cookies)
+ id (java.net.URLDecoder/decode id)]
(try
- (-> (topology-page id (:window m) include-sys?)
+ (-> (topology-page (URLDecoder/decode id) (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)
(catch Exception e (resp/redirect "/")))))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/bf557f89/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------