storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [21/50] storm git commit: Merge remote-tracking branch 'upstream/security' into STORM-406
Date Thu, 13 Nov 2014 19:37:16 GMT
Merge remote-tracking branch 'upstream/security' into STORM-406

Conflicts:
	storm-core/pom.xml
	storm-core/src/clj/backtype/storm/ui/core.clj


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

Branch: refs/heads/master
Commit: b62d71d6696163134ca19e71e55cbc96fde0524d
Parents: dd59ad4 7a06ef7
Author: Parth Brahmbhatt <brahmbhatt.parth@gmail.com>
Authored: Tue Aug 26 15:11:21 2014 -0700
Committer: Parth Brahmbhatt <brahmbhatt.parth@gmail.com>
Committed: Tue Aug 26 15:11:21 2014 -0700

----------------------------------------------------------------------
 CHANGELOG.md                                    |  12 +
 README.markdown                                 |   3 +
 SECURITY.md                                     |  25 +-
 bin/storm                                       |   6 +-
 external/storm-hdfs/README.md                   | 343 +++++++++++++++++++
 external/storm-hdfs/pom.xml                     |  68 ++++
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       | 139 ++++++++
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    | 131 +++++++
 .../storm/hdfs/bolt/SequenceFileBolt.java       | 149 ++++++++
 .../hdfs/bolt/format/DefaultFileNameFormat.java |  86 +++++
 .../hdfs/bolt/format/DefaultSequenceFormat.java |  52 +++
 .../hdfs/bolt/format/DelimitedRecordFormat.java |  88 +++++
 .../storm/hdfs/bolt/format/FileNameFormat.java  |  42 +++
 .../storm/hdfs/bolt/format/RecordFormat.java    |  32 ++
 .../storm/hdfs/bolt/format/SequenceFormat.java  |  40 +++
 .../hdfs/bolt/rotation/FileRotationPolicy.java  |  51 +++
 .../bolt/rotation/FileSizeRotationPolicy.java   |  81 +++++
 .../hdfs/bolt/rotation/NoRotationPolicy.java    |  35 ++
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |  55 +++
 .../storm/hdfs/bolt/sync/CountSyncPolicy.java   |  46 +++
 .../apache/storm/hdfs/bolt/sync/SyncPolicy.java |  46 +++
 .../hdfs/common/rotation/MoveFileAction.java    |  27 ++
 .../hdfs/common/rotation/RotationAction.java    |  12 +
 .../hdfs/common/security/HdfsSecurityUtil.java  |  48 +++
 .../apache/storm/hdfs/trident/HdfsState.java    | 317 +++++++++++++++++
 .../storm/hdfs/trident/HdfsStateFactory.java    |  29 ++
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |  14 +
 .../trident/format/DefaultFileNameFormat.java   |  83 +++++
 .../trident/format/DefaultSequenceFormat.java   |  54 +++
 .../trident/format/DelimitedRecordFormat.java   |  83 +++++
 .../hdfs/trident/format/FileNameFormat.java     |  40 +++
 .../storm/hdfs/trident/format/RecordFormat.java |  32 ++
 .../hdfs/trident/format/SequenceFormat.java     |  40 +++
 .../trident/rotation/FileRotationPolicy.java    |  50 +++
 .../rotation/FileSizeRotationPolicy.java        |  81 +++++
 .../hdfs/trident/rotation/NoRotationPolicy.java |  35 ++
 .../trident/rotation/TimedRotationPolicy.java   |  54 +++
 .../hdfs/trident/sync/CountSyncPolicy.java      |  46 +++
 .../storm/hdfs/trident/sync/SyncPolicy.java     |  46 +++
 .../storm/hdfs/bolt/HdfsFileTopology.java       | 198 +++++++++++
 .../storm/hdfs/bolt/SequenceFileTopology.java   | 193 +++++++++++
 .../storm/hdfs/trident/FixedBatchSpout.java     |  80 +++++
 .../storm/hdfs/trident/TridentFileTopology.java |  73 ++++
 .../hdfs/trident/TridentSequenceTopology.java   |  71 ++++
 external/storm-kafka/README.md                  | 197 ++++++++++-
 .../jvm/storm/kafka/DynamicBrokersReader.java   |   5 +
 .../src/jvm/storm/kafka/bolt/KafkaBolt.java     |  49 ++-
 .../FieldNameBasedTupleToKafkaMapper.java       |  48 +++
 .../kafka/bolt/mapper/TupleToKafkaMapper.java   |  32 ++
 .../bolt/selector/DefaultTopicSelector.java     |  34 ++
 .../kafka/bolt/selector/KafkaTopicSelector.java |  26 ++
 .../storm/kafka/trident/TridentKafkaState.java  |  99 ++++++
 .../kafka/trident/TridentKafkaStateFactory.java |  57 +++
 .../kafka/trident/TridentKafkaUpdater.java      |  31 ++
 .../FieldNameBasedTupleToKafkaMapper.java       |  41 +++
 .../mapper/TridentTupleToKafkaMapper.java       |  28 ++
 .../trident/selector/DefaultTopicSelector.java  |  34 ++
 .../trident/selector/KafkaTopicSelector.java    |  26 ++
 .../src/test/storm/kafka/TestUtils.java         |  62 ++++
 .../src/test/storm/kafka/TridentKafkaTest.java  |  89 +++++
 .../test/storm/kafka/TridentKafkaTopology.java  | 100 ++++++
 logback/cluster.xml                             |  12 +-
 pom.xml                                         |  13 +-
 storm-core/pom.xml                              |  70 +++-
 .../clj/backtype/storm/daemon/supervisor.clj    |   9 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |  11 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   | 103 +++---
 .../src/clj/backtype/storm/ui/helpers.clj       |  15 +-
 storm-core/src/clj/backtype/storm/util.clj      |   2 +-
 storm-core/src/jvm/backtype/storm/Config.java   |  33 +-
 .../jvm/backtype/storm/multilang/ShellMsg.java  |  17 +
 .../jvm/backtype/storm/spout/ShellSpout.java    |   3 +
 .../src/jvm/backtype/storm/task/ShellBolt.java  |   6 +
 .../backtype/storm/utils/DisruptorQueue.java    |  56 ++-
 storm-core/src/ui/public/css/style.css          |  67 ++++
 .../public/templates/index-page-template.html   |   2 +-
 .../templates/topology-page-template.html       |   2 +-
 .../test/clj/backtype/storm/supervisor_test.clj |   2 +
 storm-core/test/clj/backtype/storm/ui_test.clj  |  49 ---
 .../storm/utils/DisruptorQueueTest.java         |  25 +-
 storm-dist/binary/src/main/assembly/binary.xml  |  14 +
 81 files changed, 4490 insertions(+), 215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b62d71d6/storm-core/pom.xml
----------------------------------------------------------------------
diff --cc storm-core/pom.xml
index 44bca86,1a676f1..a8641c1
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@@ -60,10 -60,9 +60,15 @@@
              <artifactId>ring-jetty-adapter</artifactId>
          </dependency>
          <dependency>
 +            <groupId>ring</groupId>
 +            <artifactId>ring-anti-forgery</artifactId>
 +            <version>1.0.0</version>
 +        </dependency>
++
++        <dependency>
+             <groupId>org.eclipse.jetty</groupId>
+             <artifactId>jetty-servlet</artifactId>
+         </dependency>
          <dependency>
              <groupId>org.clojure</groupId>
              <artifactId>tools.logging</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/b62d71d6/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/core.clj
index 93adb18,0aea7ec..3c90715
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@@ -20,10 -20,9 +20,10 @@@
    (:use [hiccup core page-helpers])
    (:use [backtype.storm config util log])
    (:use [backtype.storm.ui helpers])
-   (:use [backtype.storm.daemon [common :only [ACKER-COMPONENT-ID ACKER-INIT-STREAM-ID
-                                               ACKER-ACK-STREAM-ID ACKER-FAIL-STREAM-ID system-id?]]])
+   (:use [backtype.storm.daemon [common :only [ACKER-COMPONENT-ID ACKER-INIT-STREAM-ID ACKER-ACK-STREAM-ID
+                                               ACKER-FAIL-STREAM-ID system-id? mk-authorization-handler]]])
    (:use [ring.adapter.jetty :only [run-jetty]])
 +  (:use [ring.middleware.anti-forgery])
    (:use [clojure.string :only [blank? lower-case trim]])
    (:import [backtype.storm.utils Utils])
    (:import [backtype.storm.generated ExecutorSpecificStats
@@@ -687,9 -675,7 +676,8 @@@
          "spouts" (spout-comp id spout-comp-summs (.get_errors summ) window include-sys?)
          "bolts" (bolt-comp id bolt-comp-summs (.get_errors summ) window include-sys?)
          "configuration" topology-conf
 -        "visualizationTable" (stream-boxes visualizer-data)}))))
 +        "visualizationTable" (stream-boxes visualizer-data)
-         "uiActionsEnabled" (ui-actions-enabled?)
 +        "antiForgeryToken" *anti-forgery-token*}))))
  
  (defn spout-output-stats
    [stream-summary window]

http://git-wip-us.apache.org/repos/asf/storm/blob/b62d71d6/storm-core/src/ui/public/css/style.css
----------------------------------------------------------------------


Mime
View raw message