You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/09/05 11:24:42 UTC
svn commit: r1622655 - in /incubator/sirona/trunk/server/reporting:
reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/
reporting-ui/src/main/webapp/js/
reporting-ui/src/main/webapp/js/app/controllers/
reporting-ui/src/main/webapp/partials/
Author: olamy
Date: Fri Sep 5 09:24:41 2014
New Revision: 1622655
URL: http://svn.apache.org/r1622655
Log:
rename
Added:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java (contents, props changed)
- copied, changed from r1622654, incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JmxServices.java
Removed:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JmxServices.java
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/abn_tree_directive.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jmx.html
Copied: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java (from r1622654, incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JmxServices.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java?p2=incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java&p1=incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JmxServices.java&r1=1622654&r2=1622655&rev=1622655&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JmxServices.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java Fri Sep 5 09:24:41 2014
@@ -38,7 +38,7 @@ import java.lang.management.ManagementFa
* @since 0.3
*/
@Path( "/jmx" )
-public class JmxServices
+public class TheJmxServices
{
protected final MBeanServerConnection server = ManagementFactory.getPlatformMBeanServer();
Propchange: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/TheJmxServices.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/abn_tree_directive.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/abn_tree_directive.js?rev=1622655&r1=1622654&r2=1622655&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/abn_tree_directive.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/abn_tree_directive.js Fri Sep 5 09:24:41 2014
@@ -65,7 +65,6 @@
};
_ref = scope.treeData;
_results = [];
- console.log("for_each_branch:"+_ref.length);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
root_branch = _ref[_i];
_results.push(do_f(root_branch, 1));
@@ -227,7 +226,7 @@
scope.$watch('treeData', on_treeData_change, true);
if (attrs.initialSelection != null) {
for_each_branch(function(b) {
- console.log("attrs.initialSelection:"+attrs.initialSelection+":"+b.label);
+ //console.log("attrs.initialSelection:"+attrs.initialSelection+":"+b.label);
if (b.label === attrs.initialSelection) {
return $timeout(function() {
return select_branch(b);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js?rev=1622655&r1=1622654&r2=1622655&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js Fri Sep 5 09:24:41 2014
@@ -38,7 +38,10 @@ define(['jquery','angular','bootstrap','
$scope.selectionHandler=function(branch){ //
if (branch.leaf){
console.log("selectionHandler:'"+branch.base64+"'");
- $location.url("jmx/"+branch.base64);
+ //$location.url("jmx/"+branch.base64);
+ jmx.query({mbean:branch.base64}).$promise.then(function(result){
+ $scope.mbean=result;
+ });
}
}
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jmx.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jmx.html?rev=1622655&r1=1622654&r2=1622655&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jmx.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jmx.html Fri Sep 5 09:24:41 2014
@@ -15,9 +15,23 @@
limitations under the License.
-->
<div class="row">
- <div class="col-lg-12">
+ <div class="col-lg-3">
jmx home
<abn-tree tree-data="treeData" on-select="selectionHandler(branch)"></abn-tree>
</div>
+ <div class="col-lg-9">
+ jmx detail: {{::mbean.description}}
+ <ul class="nav nav-tabs" role="tablist">
+ <li class="active"><a href="#attributes" role="tab" data-toggle="tab">Attributes</a></li>
+ <li><a href="#operations" role="tab" data-toggle="tab">Operations</a></li>
+ </ul>
+
+ <!-- Tab panes -->
+ <div class="tab-content">
+ <div class="tab-pane active" id="attributes">attributes</div>
+ <div class="tab-pane" id="operations">operations</div>
+ </div>
+
+ </div>
</div>
\ No newline at end of file