You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/04/26 19:46:30 UTC
[2/6] storm git commit: Merge remote-tracking branch
'upstream/master' into STORM-721
Merge remote-tracking branch 'upstream/master' into STORM-721
Conflicts:
storm-core/src/clj/backtype/storm/ui/helpers.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/604026f3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/604026f3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/604026f3
Branch: refs/heads/master
Commit: 604026f38b25fdc796b4162b8d6919ecf3eeca68
Parents: e86b924 2aaa718
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Wed Apr 1 10:06:05 2015 -0700
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Wed Apr 1 10:06:05 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 13 ++
README.markdown | 2 +
STORM-UI-REST-API.md | 30 +++
docs/_posts/2015-03-25-storm094-released.md | 24 ++
docs/downloads.html | 64 +++--
examples/storm-starter/pom.xml | 2 +-
external/storm-hbase/pom.xml | 2 +-
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 4 +-
.../hbase/trident/state/HBaseMapState.java | 2 +
.../storm/hbase/trident/state/HBaseState.java | 2 +-
external/storm-hdfs/pom.xml | 2 +-
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 2 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 2 +-
external/storm-hive/pom.xml | 2 +-
external/storm-jdbc/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 16 +-
external/storm-redis/README.md | 108 ++++++++-
external/storm-redis/pom.xml | 2 +-
.../storm/redis/bolt/AbstractRedisBolt.java | 8 +-
.../storm/redis/bolt/RedisLookupBolt.java | 112 +++++++++
.../apache/storm/redis/bolt/RedisStoreBolt.java | 100 ++++++++
.../redis/common/config/JedisClusterConfig.java | 82 +++++++
.../redis/common/config/JedisPoolConfig.java | 97 ++++++++
.../common/container/JedisClusterContainer.java | 47 ++++
.../JedisCommandsContainerBuilder.java | 38 +++
.../JedisCommandsInstanceContainer.java | 25 ++
.../redis/common/container/JedisContainer.java | 65 ++++++
.../common/mapper/RedisDataTypeDescription.java | 50 ++++
.../redis/common/mapper/RedisLookupMapper.java | 40 ++++
.../storm/redis/common/mapper/RedisMapper.java | 22 ++
.../redis/common/mapper/RedisStoreMapper.java | 21 ++
.../storm/redis/common/mapper/TupleMapper.java | 27 +++
.../trident/mapper/TridentTupleMapper.java | 27 ---
.../trident/state/RedisClusterMapState.java | 2 +-
.../redis/trident/state/RedisClusterState.java | 2 +-
.../trident/state/RedisClusterStateQuerier.java | 10 +-
.../trident/state/RedisClusterStateUpdater.java | 10 +-
.../redis/trident/state/RedisMapState.java | 21 +-
.../storm/redis/trident/state/RedisState.java | 2 +-
.../redis/trident/state/RedisStateQuerier.java | 10 +-
.../state/RedisStateSetCountQuerier.java | 74 ------
.../trident/state/RedisStateSetUpdater.java | 80 -------
.../redis/trident/state/RedisStateUpdater.java | 10 +-
.../redis/util/config/JedisClusterConfig.java | 82 -------
.../redis/util/config/JedisPoolConfig.java | 97 --------
.../util/container/JedisClusterContainer.java | 47 ----
.../JedisCommandsContainerBuilder.java | 38 ---
.../JedisCommandsInstanceContainer.java | 25 --
.../redis/util/container/JedisContainer.java | 65 ------
.../storm/redis/topology/LookupWordCount.java | 115 ++++++---
.../redis/topology/PersistentWordCount.java | 81 ++++---
.../storm/redis/topology/WordCounter.java | 19 +-
.../redis/trident/WordCountTridentRedis.java | 7 +-
.../trident/WordCountTridentRedisCluster.java | 6 +-
.../WordCountTridentRedisClusterMap.java | 8 +-
.../redis/trident/WordCountTridentRedisMap.java | 9 +-
.../redis/trident/WordCountTupleMapper.java | 10 +-
pom.xml | 2 +-
.../maven-shade-clojure-transformer/pom.xml | 2 +-
storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 62 ++++-
.../src/clj/backtype/storm/ui/helpers.clj | 15 +-
storm-core/src/jvm/backtype/storm/Config.java | 6 +
.../jvm/backtype/storm/utils/NimbusClient.java | 7 +
storm-core/src/ui/public/css/style.css | 62 +++++
.../storm/security/auth/nimbus_auth_test.clj | 231 ++++++++++---------
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
71 files changed, 1420 insertions(+), 851 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/604026f3/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/604026f3/storm-core/src/clj/backtype/storm/ui/helpers.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/helpers.clj
index e6cbb8c,6f5ca86..1eae3ac
--- a/storm-core/src/clj/backtype/storm/ui/helpers.clj
+++ b/storm-core/src/clj/backtype/storm/ui/helpers.clj
@@@ -20,14 -20,16 +20,17 @@@
[string :only [blank? join]]
[walk :only [keywordize-keys]]])
(:use [backtype.storm config log])
- (:use [backtype.storm.util :only [clojurify-structure uuid defnk url-encode]])
+ (:use [backtype.storm.util :only [clojurify-structure uuid defnk url-encode not-nil?]])
(:use [clj-time coerce format])
(:import [backtype.storm.generated ExecutorInfo ExecutorSummary])
+ (:import [java.util EnumSet])
(:import [org.eclipse.jetty.server Server]
[org.eclipse.jetty.server.nio SelectChannelConnector]
[org.eclipse.jetty.server.ssl SslSocketConnector]
[org.eclipse.jetty.servlet ServletHolder FilterMapping]
- [org.eclipse.jetty.util.ssl SslContextFactory])
++ [org.eclipse.jetty.util.ssl SslContextFactory]
+ [org.eclipse.jetty.server DispatcherType]
+ [org.eclipse.jetty.servlets CrossOriginFilter])
(:require [ring.util servlet])
(:require [compojure.route :as route]
[compojure.handler :as handler]))
@@@ -133,23 -135,30 +136,32 @@@
(defn unauthorized-user-html [user]
[[:h2 "User '" (escape-html user) "' is not authorized."]])
-(defn- mk-ssl-connector [port ks-path ks-password ks-type]
- (doto (SslSocketConnector.)
- (.setExcludeCipherSuites (into-array String ["SSL_RSA_WITH_RC4_128_MD5" "SSL_RSA_WITH_RC4_128_SHA"]))
- (.setExcludeProtocols (into-array String ["SSLv3"]))
- (.setAllowRenegotiate false)
- (.setKeystore ks-path)
- (.setKeystoreType ks-type)
- (.setKeyPassword ks-password)
- (.setPassword ks-password)
- (.setPort port)))
-
-(defn config-ssl [server port ks-path ks-password ks-type]
+(defn- mk-ssl-connector [port ks-path ks-password ks-type key-password]
+ (let [sslContextFactory (doto (SslContextFactory.)
+ (.setExcludeCipherSuites (into-array String ["SSL_RSA_WITH_RC4_128_MD5" "SSL_RSA_WITH_RC4_128_SHA"]))
+ (.setExcludeProtocols (into-array String ["SSLv3"]))
+ (.setAllowRenegotiate false)
+ (.setKeyStorePath ks-path)
+ (.setKeyStoreType ks-type)
+ (.setKeyStorePassword ks-password)
+ (.setKeyManagerPassword key-password))]
+ (doto (SslSocketConnector. sslContextFactory)
+ (.setPort port))))
+
+
+(defn config-ssl [server port ks-path ks-password ks-type key-password]
(when (> port 0)
- (.addConnector server (mk-ssl-connector port ks-path ks-password ks-type))))
+ (.addConnector server (mk-ssl-connector port ks-path ks-password ks-type key-password))))
+ (defn cors-filter-handler
+ []
+ (doto (org.eclipse.jetty.servlet.FilterHolder. (CrossOriginFilter.))
+ (.setInitParameter CrossOriginFilter/ALLOWED_ORIGINS_PARAM "*")
+ (.setInitParameter CrossOriginFilter/ALLOWED_METHODS_PARAM "GET, POST, PUT")
+ (.setInitParameter CrossOriginFilter/ALLOWED_HEADERS_PARAM "X-Requested-With, X-Requested-By, Access-Control-Allow-Origin, Content-Type, Content-Length, Accept, Origin")
+ (.setInitParameter CrossOriginFilter/ACCESS_CONTROL_ALLOW_ORIGIN_HEADER "*")
+ ))
+
(defn config-filter [server handler filters-confs]
(if filters-confs
(let [servlet-holder (ServletHolder.
http://git-wip-us.apache.org/repos/asf/storm/blob/604026f3/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------