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/08/28 22:04:02 UTC
[50/50] git commit: Fixed some merge issues.
Fixed some merge issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b19fdbb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b19fdbb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b19fdbb7
Branch: refs/heads/security
Commit: b19fdbb7444e9d3ea38ede9d186055319df4751d
Parents: 84b7dea
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Aug 28 15:02:27 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Aug 28 15:02:27 2014 -0500
----------------------------------------------------------------------
pom.xml | 5 +++++
storm-core/pom.xml | 4 ++++
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 4 +---
storm-core/src/ui/public/templates/index-page-template.html | 2 +-
storm-core/src/ui/public/templates/topology-page-template.html | 2 --
5 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b19fdbb7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d31916..2ee56fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,6 +397,11 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.logging</artifactId>
<version>${clojure.tools.logging.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b19fdbb7/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 1a676f1..3785858 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -64,6 +64,10 @@
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.logging</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b19fdbb7/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
index 36a737f..c3868eb 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -348,15 +348,13 @@ Note that if anything goes wrong, this will throw an Error and exit."
:filter-params (or (conf UI-FILTER-PARAMS) {})}]
[])
filters-confs (concat filters-confs
- [{:filter-class "org.mortbay.servlet.GzipFilter"
+ [{:filter-class "org.eclipse.jetty.servlets.GzipFilter"
:filter-name "Gzipper"
:filter-params {}}])]
(run-jetty middle
{:port (int (conf LOGVIEWER-PORT))
:join? false
:configurator (fn [server]
- (doseq [connector (.getConnectors server)]
- (.setHeaderBufferSize connector header-buffer-size))
(config-filter server middle filters-confs))}))
(catch Exception ex
(log-error ex))))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b19fdbb7/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index 8f1c29b..dfe9446 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -53,8 +53,8 @@
<td>{{uptime}}</td>
<td>{{workersTotal}}</td>
<td>{{executorsTotal}}</td>
- <td>{{schedulerInfo}}</td>
<td>{{tasksTotal}}</td>
+ <td>{{schedulerInfo}}</td>
</tr>
{{/topologies}}
</tbody>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b19fdbb7/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html
index ddf3c17..d442107 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -160,7 +160,6 @@
</script>
<script id="topology-actions-template" type="text/html">
- {{#uiActionsEnabled}}
<h2>Topology actions</h2>
<p id="topology-actions">
<input {{activateStatus}} onclick="confirmAction('{{id}}', '{{name}}', 'activate', false, 0)" type="button" value="Activate">
@@ -168,5 +167,4 @@
<input {{rebalanceStatus}} onclick="confirmAction('{{id}}', '{{name}}', 'rebalance', true, {{msgTimeout}})" type="button" value="Rebalance">
<input {{killStatus}} onclick="confirmAction('{{id}}', '{{name}}', 'kill', true, 30)" type="button" value="Kill">
</p>
- {{/uiActionsEnabled}}
</script>