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 2015/04/20 19:19:16 UTC
[1/3] storm git commit: STORM-791: Storm UI displays maps in the
config incorrectly
Repository: storm
Updated Branches:
refs/heads/master 4bf195cc9 -> 496bcf7d5
STORM-791: Storm UI displays maps in the config incorrectly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6bfcb2c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6bfcb2c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6bfcb2c8
Branch: refs/heads/master
Commit: 6bfcb2c888481555e9ae6fd93133b82117baa7b7
Parents: a7c8310
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Apr 17 13:33:25 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Apr 17 13:33:25 2015 -0500
----------------------------------------------------------------------
LICENSE | 29 ++++++++++++++++++++
.../src/ui/public/css/jsonFormatter.min.css | 1 +
storm-core/src/ui/public/css/style.css | 11 ++++++++
storm-core/src/ui/public/index.html | 3 ++
.../src/ui/public/js/jsonFormatter.min.js | 2 ++
storm-core/src/ui/public/js/script.js | 2 +-
storm-core/src/ui/public/topology.html | 3 ++
7 files changed, 50 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d100b4f..f468287 100644
--- a/LICENSE
+++ b/LICENSE
@@ -513,3 +513,32 @@ Bootstrap v3.3.1 (http://getbootstrap.com)
Copyright 2011-2014 Twitter, Inc.
Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+-----------------------------------------------------------------------
+
+For jQuery JSONFormatter 1.0.1 2015-02-28
+(storm-core/src/ui/public/js/jsonFormatter.min.js
+storm-core/src/ui/public/css/jsonFormatter.min.css)
+http://www.jqueryscript.net/other/jQuery-Plugin-For-Pretty-JSON-Formatting-jsonFormatter.htmlA
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Matthew Heironimus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/css/jsonFormatter.min.css
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/css/jsonFormatter.min.css b/storm-core/src/ui/public/css/jsonFormatter.min.css
new file mode 100755
index 0000000..37761db
--- /dev/null
+++ b/storm-core/src/ui/public/css/jsonFormatter.min.css
@@ -0,0 +1 @@
+PRE.jsonFormatter-codeContainer{margin-top:0;margin-bottom:0}PRE.jsonFormatter-codeContainer .jsonFormatter-objectBrace{color:#0a0;font-weight:bold}PRE.jsonFormatter-codeContainer .jsonFormatter-arrayBrace{color:#03f;font-weight:bold}PRE.jsonFormatter-codeContainer .jsonFormatter-propertyName{color:#c00;font-weight:bold}PRE.jsonFormatter-codeContainer .jsonFormatter-string{color:#077}PRE.jsonFormatter-codeContainer .jsonFormatter-number{color:#a0a}PRE.jsonFormatter-codeContainer .jsonFormatter-boolean{color:#00f}PRE.jsonFormatter-codeContainer .jsonFormatter-function{color:#a63;font-style:italic}PRE.jsonFormatter-codeContainer .jsonFormatter-null{color:#00f}PRE.jsonFormatter-codeContainer .jsonFormatter-coma{color:#000;font-weight:bold}PRE.jsonFormatter-codeContainer .jsonFormatter-expander{display:inline-block;width:28px;height:11px;cursor:pointer}PRE.jsonFormatter-codeContainer .jsonFormatter-expanded{background:url('data:image/gif;base64,R0lGODlhHAALAMQAAP////7++/z8/Pb29fb18PH
x7e/w6/Hw6e3s5unp4+Dg3t3a0djY0dnVy9fTxNbQxtLMv8zJurDC1L+9sMK4p32buAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEHABcALAAAAAAcAAsAAAVL4CWOZGmel1StbCWhsFgBdA1UMVwJQd8TuNypMigWD4qgsFQhWJ7PhXI5qhQKCERC0ZhSLxUFo+FwQCJeagUyobjd6aWqtXp979QQADs=') /*Expanded.gif*/ no-repeat}PRE.jsonFormatter-codeContainer .jsonFormatter-collapsed{background:url('data:image/gif;base64,R0lGODlhHAALAMQAAP////7++/z8/Pb29fb18PHx7e/w6/Hw6e3s5unp4+jm2ODg3t3a0dnVy9bQxtLMv8zJurDC1L+9sMK4p32buDMzMwAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEHABcALAAAAAAcAAsAAAVU4CWOZGmeV0StLBWhsEgBdA1QMUwJvMUTuNyJMihaBodFUFiiECxQKGMpqlSq14uVRCkUEJbEokHVZrdmrqLRsDgekDLzQoFIJni8nKlqrV5zgYIhADs=') /*Collapsed.gif*/ no-repeat}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/css/style.css
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/css/style.css b/storm-core/src/ui/public/css/style.css
index 1d7de20..e058850 100644
--- a/storm-core/src/ui/public/css/style.css
+++ b/storm-core/src/ui/public/css/style.css
@@ -85,3 +85,14 @@ table.dataTable thead .sorting_desc {
border-color: transparent;
box-shadow: none;
}
+
+PRE.jsonFormatter-codeContainer
+.jsonFormatter-number {
+ color: #A00;
+}
+
+PRE.jsonFormatter-codeContainer {
+ border: none;
+ padding: 0px;
+ background-color: transparent;
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/index.html b/storm-core/src/ui/public/index.html
index 0c5ea10..64118b8 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -21,6 +21,7 @@
<link href="/css/bootstrap-3.3.1.min.css" rel="stylesheet" type="text/css">
<link href="/css/jquery.dataTables.1.10.4.min.css" rel="stylesheet" type="text/css">
<link href="/css/dataTables.bootstrap.css" rel="stylesheet" type="text/css">
+<link href="/css/jsonFormatter.min.css" rel="stylesheet" type="text/css">
<link href="/css/style.css" rel="stylesheet" type="text/css">
<script src="/js/jquery-1.11.1.min.js" type="text/javascript"></script>
<script src="/js/jquery.dataTables.1.10.4.min.js" type="text/javascript"></script>
@@ -29,6 +30,7 @@
<script src="/js/bootstrap-3.3.1.min.js" type="text/javascript"></script>
<script src="/js/jquery.blockUI.min.js" type="text/javascript"></script>
<script src="/js/dataTables.bootstrap.min.js" type="text/javascript"></script>
+<script src="/js/jsonFormatter.min.js" type="text/javascript"></script>
<script src="/js/script.js" type="text/javascript"></script>
</head>
<body>
@@ -139,6 +141,7 @@ $(document).ready(function() {
var formattedResponse = formatConfigData(response);
$.get("/templates/index-page-template.html", function(template) {
config.append(Mustache.render($(template).filter("#configuration-template").html(),formattedResponse));
+ $('#nimbus-configuration-table td').jsonFormatter()
//key, value
dtAutoPage("#nimbus-configuration-table", {});
$('#nimbus-configuration [data-toggle="tooltip"]').tooltip();
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/js/jsonFormatter.min.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/jsonFormatter.min.js b/storm-core/src/ui/public/js/jsonFormatter.min.js
new file mode 100755
index 0000000..f2ffcec
--- /dev/null
+++ b/storm-core/src/ui/public/js/jsonFormatter.min.js
@@ -0,0 +1,2 @@
+(function($){$.fn.jsonFormatter=function(n){var _settings,u=new Date,r=new RegExp,i=function(n,t,i){for(var r="",u=0;u<n&&!i;u++)r+=_settings.tab;return t!=null&&t.length>0&&t.charAt(t.length-1)!="\n"&&(t=t+"\n"),r+t},f=function(n,t){for(var r,u,f="",i=0;i<n;i++)f+=_settings.tab;for(r=t.toString().split("\n"),u="",i=0;i<r.length;i++)u+=(i==0?"":f)+r[i]+"\n";return u},t=function(n,t,r,u,f,e){typeof n=="string"&&(n=n.split("<").join("<").split(">").join(">"));var o="<span class='"+e+"'>"+t+n+t+r+"<\/span>";return f&&(o=i(u,o)),o},_processObject=function(n,e,o,s,h){var c="",l=o?"<span class='jsonFormatter-coma'>,<\/span> ":"",v=typeof n,a="",y,p,k,w,b;if($.isArray(n))if(n.length==0)c+=i(e,"<span class='jsonFormatter-arrayBrace'>[ ]<\/span>"+l,h);else{for(a=_settings.collapsible?"<span class='jsonFormatter-expander jsonFormatter-expanded'><\/span><span class='jsonFormatter-collapsible'>":"",c+=i(e,"<span class='jsonFormatter-arrayBrace'>[<\/span>"+a,h),y=0;y<n.length;y++)c+=_pr
ocessObject(n[y],e+1,y<n.length-1,!0,!1);a=_settings.collapsible?"<\/span>":"";c+=i(e,a+"<span class='jsonFormatter-arrayBrace'>]<\/span>"+l)}else if(v=="object")if(n==null)c+=t("null","",l,e,s,"jsonFormatter-null");else if(n.constructor==u.constructor)c+=t("new Date("+n.getTime()+") /*"+n.toLocaleString()+"*/","",l,e,s,"Date");else if(n.constructor==r.constructor)c+=t("new RegExp("+n+")","",l,e,s,"RegExp");else{p=0;for(w in n)p++;if(p==0)c+=i(e,"<span class='jsonFormatter-objectBrace'>{ }<\/span>"+l,h);else{a=_settings.collapsible?"<span class='jsonFormatter-expander jsonFormatter-expanded'><\/span><span class='jsonFormatter-collapsible'>":"";c+=i(e,"<span class='jsonFormatter-objectBrace'>{<\/span>"+a,h);k=0;for(w in n)b=_settings.quoteKeys?'"':"",c+=i(e+1,"<span class='jsonFormatter-propertyName'>"+b+w+b+"<\/span>: "+_processObject(n[w],e+1,++k<p,!1,!0));a=_settings.collapsible?"<\/span>":"";c+=i(e,a+"<span class='jsonFormatter-objectBrace'>}<\/span>"+l)}}else v=="number"?c+=t(n,
"",l,e,s,"jsonFormatter-number"):v=="boolean"?c+=t(n,"",l,e,s,"jsonFormatter-boolean"):v=="function"?n.constructor==r.constructor?c+=t("new RegExp("+n+")","",l,e,s,"RegExp"):(n=f(e,n),c+=t(n,"",l,e,s,"jsonFormatter-function")):c+=v=="undefined"?t("undefined","",l,e,s,"jsonFormatter-null"):t(n.toString().split("\\").join("\\\\").split('"').join('\\"'),'"',l,e,s,"jsonFormatter-string");return c},e=function(element){var json=$(element).html(),obj,original;json.trim()==""&&(json='""');try{obj=eval("["+json+"]")}catch(exception){return}html=_processObject(obj[0],0,!1,!1,!1);original=$(element).wrapInner("<div class='jsonFormatter-original'><\/div>");_settings.hideOriginal===!0&&$(".jsonFormatter-original",original).hide();original.append("<PRE class='jsonFormatter-codeContainer'>"+html+"<\/PRE>")},o=function(){var n=$(this).next();n.length<1||($(this).hasClass("jsonFormatter-expanded")==!0?(n.hide(),$(this).removeClass("jsonFormatter-expanded").addClass("jsonFormatter-collapsed")):(n.sho
w(),$(this).removeClass("jsonFormatter-collapsed").addClass("jsonFormatter-expanded")))};return _settings=$.extend({tab:" ",quoteKeys:!0,collapsible:!0,hideOriginal:!0},n),this.each(function(n,t){e(t);$(t).on("click",".jsonFormatter-expander",o)})}})(jQuery);
+//# sourceMappingURL=jsonFormatter.min.js.map
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 73cfd7f..56e5cc4 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -120,7 +120,7 @@ function formatConfigData(data) {
if(data.hasOwnProperty(prop)) {
mustacheFormattedData['config'].push({
'key': prop,
- 'value': data[prop]
+ 'value': JSON.stringify(data[prop])
});
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6bfcb2c8/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index 7285f35..0a1a05b 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -23,6 +23,7 @@
<link href="/css/bootstrap-3.3.1.min.css" rel="stylesheet" type="text/css">
<link href="/css/jquery.dataTables.1.10.4.min.css" rel="stylesheet" type="text/css">
<link href="/css/dataTables.bootstrap.css" rel="stylesheet" type="text/css">
+<link href="/css/jsonFormatter.min.css" rel="stylesheet" type="text/css">
<link href="/css/style.css" rel="stylesheet" type="text/css">
<script src="/js/jquery-1.11.1.min.js" type="text/javascript"></script>
<script src="/js/jquery.dataTables.1.10.4.min.js" type="text/javascript"></script>
@@ -31,6 +32,7 @@
<script src="/js/url.min.js" type="text/javascript"></script>
<script src="/js/bootstrap-3.3.1.min.js" type="text/javascript"></script>
<script src="/js/jquery.blockUI.min.js" type="text/javascript"></script>
+<script src="/js/jsonFormatter.min.js" type="text/javascript"></script>
<script src="/js/script.js" type="text/javascript"></script>
<script src="/js/visualization.js" type="text/javascript"></script>
<script src="/js/arbor.js" type="text/javascript"></script>
@@ -166,6 +168,7 @@ $(document).ready(function() {
$("#show-hide-visualization").click(function () { show_visualization(null) });
config.append(Mustache.render($(template).filter("#topology-configuration-template").html(),formattedConfig));
+ $('#topology-configuration td').jsonFormatter()
//key, value
dtAutoPage("#topology-configuration-table", {});
[2/3] storm git commit: Merge branch 'STORM-791' of
https://github.com/revans2/incubator-storm into STORM-791
Posted by bo...@apache.org.
Merge branch 'STORM-791' of https://github.com/revans2/incubator-storm into STORM-791
STORM-791: Storm UI displays maps in the config incorrectly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/77680a0e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/77680a0e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/77680a0e
Branch: refs/heads/master
Commit: 77680a0e97a2b79044aad576becf33eab7d6f999
Parents: 4bf195c 6bfcb2c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 20 12:17:45 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 20 12:17:45 2015 -0500
----------------------------------------------------------------------
LICENSE | 29 ++++++++++++++++++++
.../src/ui/public/css/jsonFormatter.min.css | 1 +
storm-core/src/ui/public/css/style.css | 11 ++++++++
storm-core/src/ui/public/index.html | 3 ++
.../src/ui/public/js/jsonFormatter.min.js | 2 ++
storm-core/src/ui/public/js/script.js | 2 +-
storm-core/src/ui/public/topology.html | 3 ++
7 files changed, 50 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-791 to Changelog
Posted by bo...@apache.org.
Added STORM-791 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/496bcf7d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/496bcf7d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/496bcf7d
Branch: refs/heads/master
Commit: 496bcf7d52d0de5b98beedc8e957c8f33180bb53
Parents: 77680a0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 20 12:18:16 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 20 12:18:16 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/496bcf7d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2118dfe..22910f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-791: Storm UI displays maps in the config incorrectly
* STORM-788: UI Fix key for process latencies
* STORM-773: backtype.storm.transactional-test fails periodically with timeout
* STORM-772: Tasts fail periodically with InterruptedException or InterruptedIOException