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/07/31 02:36:52 UTC
[2/4] git commit: Upmerging with master and fixing merge conflicts
Upmerging with master and fixing merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8c89d188
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8c89d188
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8c89d188
Branch: refs/heads/master
Commit: 8c89d188a910a57a4e10bc956206c0f16e5d827d
Parents: dcd4bf7 7ac24b8
Author: Adrian Petrescu <ap...@gmail.com>
Authored: Thu Jul 24 16:53:59 2014 -0400
Committer: Adrian Petrescu <ap...@gmail.com>
Committed: Thu Jul 24 16:53:59 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 9 +
LICENSE | 30 ++-
README.markdown | 6 +
STORM-UI-REST-API.md | 23 +-
bin/storm | 20 +-
storm-core/src/clj/backtype/storm/cluster.clj | 29 +++
.../src/clj/backtype/storm/command/monitor.clj | 37 +++
.../clj/backtype/storm/daemon/supervisor.clj | 49 ++--
.../src/clj/backtype/storm/daemon/worker.clj | 16 +-
storm-core/src/clj/backtype/storm/testing.clj | 48 ++--
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
.../src/clj/backtype/storm/ui/helpers.clj | 5 -
storm-core/src/clj/backtype/storm/zookeeper.clj | 25 ++
storm-core/src/jvm/backtype/storm/Config.java | 121 +++++----
.../jvm/backtype/storm/ConfigValidation.java | 70 ++++++
.../backtype/storm/task/TopologyContext.java | 4 +
.../src/jvm/backtype/storm/utils/Monitor.java | 249 +++++++++++++++++++
.../src/jvm/backtype/storm/utils/Utils.java | 23 +-
storm-core/src/ui/public/component.html | 3 +-
.../src/ui/public/js/jquery.tablesorter.min.js | 9 +-
storm-core/src/ui/public/js/moment.min.js | 6 +
storm-core/src/ui/public/js/script.js | 9 +
.../test/clj/backtype/storm/config_test.clj | 41 ++-
.../test/clj/backtype/storm/supervisor_test.clj | 20 +-
24 files changed, 713 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8c89d188/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index d9ff3f3,573b3d7..2545283
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@@ -14,8 -14,8 +14,9 @@@
;; See the License for the specific language governing permissions and
;; limitations under the License.
(ns backtype.storm.daemon.supervisor
- (:import [backtype.storm.scheduler ISupervisor])
- (:import [java.net URI])
+ (:import [backtype.storm.scheduler ISupervisor]
- [java.net JarURLConnection])
++ [java.net JarURLConnection]
++ [java.net URI])
(:use [backtype.storm bootstrap])
(:use [backtype.storm.daemon common])
(:require [backtype.storm.daemon [worker :as worker]])
@@@ -532,11 -545,14 +546,14 @@@
(do
(log-message "Extracting resources from jar at " resources-jar " to " target-dir)
(extract-dir-from-jar resources-jar RESOURCES-SUBDIR stormroot))
- uri
+ url
(do
- (log-message "Copying resources at " (.getPath uri) " to " target-dir)
- (FileUtils/copyDirectory (File. (.getPath uri)) (File. target-dir))
- ))
- (log-message "Copying resources at " (str url) " to " target-dir)
++ (log-message "Copying resources at " (URI. (str url)) " to " target-dir)
+ (if (= (.getProtocol url) "jar" )
+ (extract-dir-from-jar (.getFile (.getJarFileURL (.openConnection url))) RESOURCES-SUBDIR stormroot)
- (FileUtils/copyDirectory (File. (.getFile url)) (File. target-dir)))
++ (FileUtils/copyDirectory (File. (.getPath (URI. (str url)))) (File. target-dir)))
+ )
+ )
)))
(defmethod launch-worker