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 2018/08/03 20:46:24 UTC
[35/36] storm git commit: STORM-1311: UI Migration from clj to java
STORM-1311: UI Migration from clj to java
STORM-1311: Using Jetty instead of Grizzly
STORM-1311: Adding all GET routes
STORM-1311: Leftover from merge
STORM-1311: Added rest of puts and made static file serving configuration generic
STORM-1311: Cleaning up POM files
STORM-1311: Added request meters, callbacks and changed packaging
STORM-1311: Fixing logviewer, drpc startup issues due to conflicting dependencies and other feedback
STORM-1311: Checkstyle
STORM-1311: Moving UI Server to storm-webapp module
STORM-1311: Addressing review comments
STORM-1311: Fixing Checkstlye
STORM-1311: Fixing RAT exclusions
STORM-1311: Fixing DRPC Tests
STORM-1311: Returning callback in Exception mapper and other feedback comments
STORM-1311: Fixing visualization and adding default exception mapper with json response
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/034ac677
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/034ac677
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/034ac677
Branch: refs/heads/master
Commit: 034ac677eb486a5bd07da28246d7682730cb5072
Parents: d644636
Author: Govind Menon <go...@gmail.com>
Authored: Tue May 29 14:57:41 2018 -0500
Committer: Govind Menon <go...@gmail.com>
Committed: Fri Aug 3 15:13:10 2018 -0500
----------------------------------------------------------------------
bin/storm.py | 7 +-
external/storm-opentsdb/pom.xml | 2 +-
pom.xml | 49 +-
storm-core/pom.xml | 7 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 1641 ---------------
.../src/clj/org/apache/storm/ui/helpers.clj | 62 -
.../apache/storm/command/BasicDrpcClient.java | 2 +-
.../jvm/org/apache/storm/command/GetErrors.java | 5 +
.../jvm/org/apache/storm/command/Rebalance.java | 5 +-
.../org/apache/storm/command/SetLogLevel.java | 2 -
.../apache/storm/command/UploadCredentials.java | 5 +
.../apache/storm/ui/FilterConfiguration.java | 58 -
.../jvm/org/apache/storm/ui/IConfigurator.java | 19 -
.../storm/ui/InvalidRequestException.java | 38 -
.../src/jvm/org/apache/storm/ui/UIHelpers.java | 303 ---
.../src/jvm/org/apache/storm/utils/Monitor.java | 6 +-
storm-core/src/ui/public/component.html | 569 -----
.../src/ui/public/css/bootstrap-3.3.1.min.css | 5 -
.../src/ui/public/css/dataTables.bootstrap.css | 319 ---
.../public/css/jquery.dataTables.1.10.4.min.css | 1 -
.../src/ui/public/css/jsonFormatter.min.css | 1 -
storm-core/src/ui/public/css/style.css | 263 ---
storm-core/src/ui/public/css/vis.min.css | 1 -
.../src/ui/public/deep_search_result.html | 177 --
storm-core/src/ui/public/favicon.ico | Bin 18280 -> 0 bytes
storm-core/src/ui/public/flux.html | 157 --
.../src/ui/public/images/back_disabled.png | Bin 1361 -> 0 bytes
.../src/ui/public/images/back_enabled.png | Bin 1379 -> 0 bytes
.../src/ui/public/images/back_enabled_hover.png | Bin 1375 -> 0 bytes
storm-core/src/ui/public/images/bolt.png | Bin 6019 -> 0 bytes
storm-core/src/ui/public/images/bug.png | Bin 4045 -> 0 bytes
storm-core/src/ui/public/images/component.png | Bin 699 -> 0 bytes
storm-core/src/ui/public/images/flux.png | Bin 5328 -> 0 bytes
.../src/ui/public/images/forward_disabled.png | Bin 1363 -> 0 bytes
.../src/ui/public/images/forward_enabled.png | Bin 1380 -> 0 bytes
.../ui/public/images/forward_enabled_hover.png | Bin 1379 -> 0 bytes
storm-core/src/ui/public/images/search.png | Bin 2354 -> 0 bytes
storm-core/src/ui/public/images/sort_asc.png | Bin 1118 -> 0 bytes
.../src/ui/public/images/sort_asc_disabled.png | Bin 2916 -> 0 bytes
storm-core/src/ui/public/images/sort_both.png | Bin 1136 -> 0 bytes
storm-core/src/ui/public/images/sort_desc.png | Bin 1127 -> 0 bytes
.../src/ui/public/images/sort_desc_disabled.png | Bin 1045 -> 0 bytes
storm-core/src/ui/public/images/spinner.gif | Bin 23470 -> 0 bytes
storm-core/src/ui/public/images/spout.png | Bin 5255 -> 0 bytes
storm-core/src/ui/public/images/statistic.png | Bin 488 -> 0 bytes
storm-core/src/ui/public/images/streams.png | Bin 903 -> 0 bytes
storm-core/src/ui/public/index.html | 208 --
.../src/ui/public/js/bootstrap-3.3.1.min.js | 7 -
storm-core/src/ui/public/js/cytoscape-dagre.js | 192 --
storm-core/src/ui/public/js/cytoscape.min.js | 63 -
storm-core/src/ui/public/js/dagre.min.js | 6 -
.../ui/public/js/dataTables.bootstrap.min.js | 8 -
storm-core/src/ui/public/js/esprima.min.js | 2 -
.../src/ui/public/js/jquery-1.11.1.min.js | 4 -
.../src/ui/public/js/jquery.blockUI.min.js | 6 -
.../ui/public/js/jquery.cookies.2.2.0.min.js | 18 -
.../public/js/jquery.dataTables.1.10.4.min.js | 157 --
storm-core/src/ui/public/js/jquery.mustache.js | 592 ------
storm-core/src/ui/public/js/js-yaml.min.js | 3 -
.../src/ui/public/js/jsonFormatter.min.js | 2 -
storm-core/src/ui/public/js/moment.min.js | 6 -
storm-core/src/ui/public/js/script.js | 586 ------
.../src/ui/public/js/typeahead.jquery.min.js | 7 -
storm-core/src/ui/public/js/url.min.js | 1 -
storm-core/src/ui/public/js/vis.min.js | 45 -
storm-core/src/ui/public/js/visualization.js | 367 ----
storm-core/src/ui/public/logviewer.html | 27 -
storm-core/src/ui/public/logviewer_search.html | 72 -
storm-core/src/ui/public/owner.html | 211 --
storm-core/src/ui/public/search_result.html | 108 -
storm-core/src/ui/public/supervisor.html | 138 --
.../templates/component-page-template.html | 591 ------
.../deep-search-result-page-template.html | 72 -
.../public/templates/index-page-template.html | 446 ----
.../public/templates/json-error-template.html | 20 -
.../logviewer-search-page-template.html | 45 -
.../public/templates/owner-page-template.html | 239 ---
.../templates/search-result-page-template.html | 60 -
.../templates/supervisor-page-template.html | 161 --
.../templates/topology-page-template.html | 700 -------
.../src/ui/public/templates/user-template.html | 38 -
storm-core/src/ui/public/topology.html | 463 -----
storm-core/src/ui/public/visualize.html | 124 --
.../final-package/src/main/assembly/binary.xml | 4 +-
.../src/main/assembly/storm-webapp.xml | 4 +
storm-webapp/pom.xml | 172 +-
.../common/AuthorizationExceptionMapper.java | 13 +-
.../daemon/common/JsonResponseBuilder.java | 2 +-
.../apache/storm/daemon/drpc/DRPCServer.java | 13 +-
.../daemon/drpc/webapp/ReqContextFilter.java | 4 +
.../storm/daemon/logviewer/LogviewerServer.java | 4 +-
.../handler/LogviewerLogPageHandler.java | 8 +-
.../handler/LogviewerLogSearchHandler.java | 6 +-
.../utils/LogviewerResponseBuilder.java | 8 +-
.../logviewer/webapp/LogviewerResource.java | 13 +-
.../storm/daemon/ui/FilterConfiguration.java | 68 +
.../apache/storm/daemon/ui/IConfigurator.java | 19 +
.../daemon/ui/InvalidRequestException.java | 38 +
.../org/apache/storm/daemon/ui/UIHelpers.java | 1944 ++++++++++++++++++
.../org/apache/storm/daemon/ui/UIServer.java | 151 ++
.../storm/daemon/ui/WEB-INF/component.html | 569 +++++
.../ui/WEB-INF/css/bootstrap-3.3.1.min.css | 5 +
.../ui/WEB-INF/css/dataTables.bootstrap.css | 319 +++
.../css/jquery.dataTables.1.10.4.min.css | 1 +
.../daemon/ui/WEB-INF/css/jsonFormatter.min.css | 1 +
.../storm/daemon/ui/WEB-INF/css/style.css | 263 +++
.../storm/daemon/ui/WEB-INF/css/vis.min.css | 1 +
.../daemon/ui/WEB-INF/deep_search_result.html | 177 ++
.../apache/storm/daemon/ui/WEB-INF/favicon.ico | Bin 0 -> 18280 bytes
.../apache/storm/daemon/ui/WEB-INF/flux.html | 157 ++
.../daemon/ui/WEB-INF/images/back_disabled.png | Bin 0 -> 1361 bytes
.../daemon/ui/WEB-INF/images/back_enabled.png | Bin 0 -> 1379 bytes
.../ui/WEB-INF/images/back_enabled_hover.png | Bin 0 -> 1375 bytes
.../storm/daemon/ui/WEB-INF/images/bolt.png | Bin 0 -> 6019 bytes
.../storm/daemon/ui/WEB-INF/images/bug.png | Bin 0 -> 4045 bytes
.../daemon/ui/WEB-INF/images/component.png | Bin 0 -> 699 bytes
.../storm/daemon/ui/WEB-INF/images/flux.png | Bin 0 -> 5328 bytes
.../ui/WEB-INF/images/forward_disabled.png | Bin 0 -> 1363 bytes
.../ui/WEB-INF/images/forward_enabled.png | Bin 0 -> 1380 bytes
.../ui/WEB-INF/images/forward_enabled_hover.png | Bin 0 -> 1379 bytes
.../storm/daemon/ui/WEB-INF/images/search.png | Bin 0 -> 2354 bytes
.../storm/daemon/ui/WEB-INF/images/sort_asc.png | Bin 0 -> 1118 bytes
.../ui/WEB-INF/images/sort_asc_disabled.png | Bin 0 -> 2916 bytes
.../daemon/ui/WEB-INF/images/sort_both.png | Bin 0 -> 1136 bytes
.../daemon/ui/WEB-INF/images/sort_desc.png | Bin 0 -> 1127 bytes
.../ui/WEB-INF/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes
.../storm/daemon/ui/WEB-INF/images/spinner.gif | Bin 0 -> 23470 bytes
.../storm/daemon/ui/WEB-INF/images/spout.png | Bin 0 -> 5255 bytes
.../daemon/ui/WEB-INF/images/statistic.png | Bin 0 -> 488 bytes
.../storm/daemon/ui/WEB-INF/images/streams.png | Bin 0 -> 903 bytes
.../apache/storm/daemon/ui/WEB-INF/index.html | 208 ++
.../daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js | 7 +
.../daemon/ui/WEB-INF/js/cytoscape-dagre.js | 192 ++
.../storm/daemon/ui/WEB-INF/js/cytoscape.min.js | 63 +
.../storm/daemon/ui/WEB-INF/js/dagre.min.js | 6 +
.../ui/WEB-INF/js/dataTables.bootstrap.min.js | 8 +
.../storm/daemon/ui/WEB-INF/js/esprima.min.js | 2 +
.../daemon/ui/WEB-INF/js/jquery-1.11.1.min.js | 4 +
.../daemon/ui/WEB-INF/js/jquery.blockUI.min.js | 6 +
.../ui/WEB-INF/js/jquery.cookies.2.2.0.min.js | 18 +
.../WEB-INF/js/jquery.dataTables.1.10.4.min.js | 157 ++
.../daemon/ui/WEB-INF/js/jquery.mustache.js | 592 ++++++
.../storm/daemon/ui/WEB-INF/js/js-yaml.min.js | 3 +
.../daemon/ui/WEB-INF/js/jsonFormatter.min.js | 2 +
.../storm/daemon/ui/WEB-INF/js/moment.min.js | 6 +
.../apache/storm/daemon/ui/WEB-INF/js/script.js | 586 ++++++
.../ui/WEB-INF/js/typeahead.jquery.min.js | 7 +
.../storm/daemon/ui/WEB-INF/js/url.min.js | 1 +
.../storm/daemon/ui/WEB-INF/js/vis.min.js | 45 +
.../storm/daemon/ui/WEB-INF/js/visualization.js | 367 ++++
.../storm/daemon/ui/WEB-INF/logviewer.html | 27 +
.../daemon/ui/WEB-INF/logviewer_search.html | 72 +
.../apache/storm/daemon/ui/WEB-INF/owner.html | 211 ++
.../storm/daemon/ui/WEB-INF/search_result.html | 108 +
.../storm/daemon/ui/WEB-INF/supervisor.html | 138 ++
.../templates/component-page-template.html | 591 ++++++
.../deep-search-result-page-template.html | 72 +
.../WEB-INF/templates/index-page-template.html | 446 ++++
.../WEB-INF/templates/json-error-template.html | 20 +
.../logviewer-search-page-template.html | 45 +
.../WEB-INF/templates/owner-page-template.html | 239 +++
.../templates/search-result-page-template.html | 60 +
.../templates/supervisor-page-template.html | 161 ++
.../templates/topology-page-template.html | 700 +++++++
.../ui/WEB-INF/templates/user-template.html | 38 +
.../storm/daemon/ui/WEB-INF/topology.html | 463 +++++
.../storm/daemon/ui/WEB-INF/visualize.html | 124 ++
.../AuthorizationExceptionMapper.java | 40 +
.../DefaultExceptionMapper.java | 48 +
.../exceptionmappers/ExceptionMapperUtils.java | 70 +
.../NotAliveExceptionMapper.java | 40 +
.../daemon/ui/filters/AuthorizedUserFilter.java | 177 ++
.../daemon/ui/filters/HeaderResponseFilter.java | 44 +
.../ui/filters/HeaderResponseServletFilter.java | 66 +
.../storm/daemon/ui/resources/AuthNimbusOp.java | 39 +
.../daemon/ui/resources/StormApiResource.java | 711 +++++++
.../handler/LogviewerLogSearchHandlerTest.java | 2 +-
177 files changed, 11012 insertions(+), 9483 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/034ac677/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index f19519f..a764d3d 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -787,12 +787,15 @@ def ui():
"-Dlogfile.name=ui.log",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j2_conf_dir(), "cluster.xml")
]
+
+ allextrajars = get_wildcard_dir(STORM_WEBAPP_LIB_DIR)
+ allextrajars.append(CLUSTER_CONF_DIR)
exec_storm_class(
- "org.apache.storm.ui.core",
+ "org.apache.storm.daemon.ui.UIServer",
jvmtype="-server",
daemonName="ui",
jvmopts=jvmopts,
- extrajars=[STORM_DIR, CLUSTER_CONF_DIR])
+ extrajars=allextrajars)
def logviewer():
"""Syntax: [storm logviewer]
http://git-wip-us.apache.org/repos/asf/storm/blob/034ac677/external/storm-opentsdb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml
index 84c8e68..cd372ce 100644
--- a/external/storm-opentsdb/pom.xml
+++ b/external/storm-opentsdb/pom.xml
@@ -36,7 +36,7 @@
</developers>
<properties>
- <jersey.version>2.23</jersey.version>
+ <jersey.version>2.27</jersey.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/storm/blob/034ac677/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ea5b616..19b6d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,8 +329,8 @@
<mavenVersion>3.1.0</mavenVersion>
<wagonVersion>1.0</wagonVersion>
<azure-eventhubs.version>0.13.1</azure-eventhubs.version>
- <jersey.version>2.24.1</jersey.version>
- <dropwizard.version>1.3.0</dropwizard.version>
+ <jersey.version>2.27</jersey.version>
+ <dropwizard.version>1.3.5</dropwizard.version>
<j2html.version>1.0.0</j2html.version>
<jool.version>0.9.12</jool.version>
<caffeine.version>2.3.5</caffeine.version>
@@ -492,30 +492,29 @@
<!-- Used as part of travis-ci build -->
<exclude>install.txt</exclude>
<exclude>shaded-deps/install-shade.txt</exclude>
-
<!-- the following are in the LICENSE file -->
- <exclude>**/src/ui/public/js/jquery.dataTables.1.10.4.min.js</exclude>
- <exclude>**/src/ui/public/css/jquery.dataTables.1.10.4.min.css</exclude>
- <exclude>**/src/ui/public/images/*</exclude>
- <exclude>**/src/ui/public/js/bootstrap-3.3.1.min.js</exclude>
- <exclude>**/src/ui/public/css/bootstrap-3.3.1.min.css</exclude>
- <exclude>**/src/ui/public/js/dataTables.bootstrap.min.js</exclude>
- <exclude>**/src/ui/public/css/dataTables.bootstrap.css</exclude>
- <exclude>**/src/ui/public/js/jsonFormatter.min.js</exclude>
- <exclude>**/src/ui/public/css/jsonFormatter.min.css</exclude>
- <exclude>**/src/ui/public/js/jquery-1.11.1.min.js</exclude>
- <exclude>**/src/ui/public/js/jquery.cookies.2.2.0.min.js</exclude>
- <exclude>**/src/ui/public/js/moment.min.js</exclude>
- <exclude>**/src/ui/public/js/jquery.blockUI.min.js</exclude>
- <exclude>**/src/ui/public/js/url.min.js</exclude>
- <exclude>**/src/ui/public/js/jquery.mustache.js</exclude>
- <exclude>**/src/ui/public/js/typeahead.jquery.min.js</exclude>
- <exclude>**/src/ui/public/js/cytoscape-dagre.js</exclude>
- <exclude>**/src/ui/public/js/dagre.min.js</exclude>
- <exclude>**/src/ui/public/js/esprima.min.js</exclude>
- <exclude>**/src/ui/public/js/js-yaml.min.js</exclude>
- <exclude>**/src/ui/public/js/vis.min.js</exclude>
- <exclude>**/src/ui/public/css/vis.min.css</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jquery.dataTables.1.10.4.min.css</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/*</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/bootstrap-3.3.1.min.css</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dataTables.bootstrap.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/dataTables.bootstrap.css</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jsonFormatter.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jsonFormatter.min.css</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery-1.11.1.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.cookies.2.2.0.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/moment.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.blockUI.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/url.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.mustache.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/typeahead.jquery.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape-dagre.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dagre.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/esprima.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/js-yaml.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/vis.min.js</exclude>
+ <exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/vis.min.css</exclude>
<exclude>**/src/main/resources/Audit.50.csv</exclude>
<exclude>**/src/main/resources/KNIME_PMML_4.1_Examples_single_audit_logreg.xml</exclude>
<exclude>**/src/main/sampledata/**</exclude>
http://git-wip-us.apache.org/repos/asf/storm/blob/034ac677/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 7829f49..7e44819 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -170,6 +170,9 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
+
+
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
@@ -190,10 +193,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>