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/08/22 09:06:08 UTC
svn commit: r1619685 - in /incubator/sirona/trunk/server/reporting:
reporting-api/src/main/java/org/apache/sirona/reporting/web/
reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/
reporting-ui/src/main/webapp/ reporting-ui/src/main/webapp...
Author: olamy
Date: Fri Aug 22 07:06:08 2014
New Revision: 1619685
URL: http://svn.apache.org/r1619685
Log:
start structure for counters report
Modified:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Environment.java
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Graph.java
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/JvmReports.java
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Environment.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Environment.java?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Environment.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Environment.java Fri Aug 22 07:06:08 2014
@@ -26,7 +26,7 @@ import java.lang.management.MemoryMXBean
import java.lang.management.OperatingSystemMXBean;
/**
- *
+ * @since 0.3
*/
@Path( "/environment" )
public class Environment
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Graph.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Graph.java?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Graph.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/Graph.java Fri Aug 22 07:06:08 2014
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.util.Map;
/**
- *
+ * @since 0.3
*/
public class Graph
implements Serializable
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/JvmReports.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/JvmReports.java?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/JvmReports.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jvm/JvmReports.java Fri Aug 22 07:06:08 2014
@@ -31,7 +31,7 @@ import javax.ws.rs.core.MediaType;
import java.util.SortedMap;
/**
- *
+ * @since 0.3
*/
@Path( "/jvmreports" )
public class JvmReports
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html Fri Aug 22 07:06:08 2014
@@ -38,6 +38,8 @@
<link href="css/datetimepicker.0.2.4.css" rel="stylesheet" type="text/css">
+ <link href="css/ng-grid.2.0.12.css" rel="stylesheet" type="text/css">
+
</head>
<body>
@@ -67,7 +69,9 @@
<li>
<a href="#threads">Threads</a>
</li>
-
+ <li>
+ <a href="#report">Report</a>
+ </li>
</ul>
<ul class="nav navbar-nav navbar-right navbar-user">
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js Fri Aug 22 07:06:08 2014
@@ -77,4 +77,12 @@ define(['angular','angular-resource'], f
}
]);
+ sironaServices.factory('counters', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/counters/:reportName/:unitName',
+ {},
+ {query: {method:'GET', params:{reportName:'@reportName',unitName:'@unitName'},isArray:true}});
+ }
+ ]);
+
});
\ No newline at end of file
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js Fri Aug 22 07:06:08 2014
@@ -37,13 +37,15 @@ require.config({
'controllers': 'app/controllers/controllers',
'controllers-jvm': 'app/controllers/controllers-jvm',
'controllers-threads': 'app/controllers/controllers-threads',
+ 'controllers-report': 'app/controllers/controllers-report',
'services': 'app/services/services',
'sirona': 'sirona',
'morris': 'plugins/morris/morris-0.5.0.min',
'raphael': 'plugins/morris/raphael-2.1.2.min',
'ui-bootstrap': 'ui-bootstrap-tpls-0.11.0',
'datetimepicker': 'datetimepicker-0.2.4',
- 'moment': 'moment-2.8.1.min'
+ 'moment': 'moment-2.8.1.min',
+ 'nggrid': 'ng-grid-2.0.12.debug'
},
shim: {
@@ -52,7 +54,8 @@ require.config({
'angular-resource': ['angular'],
'morris': ['raphael'],
'ui-bootstrap': ['angular','bootstrap'],
- 'datetimepicker': ['angular','bootstrap','moment']
+ 'datetimepicker': ['angular','bootstrap','moment'],
+ 'nggrid': ['angular','bootstrap','ui-bootstrap']
},
deps: ['sirona']
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js?rev=1619685&r1=1619684&r2=1619685&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js Fri Aug 22 07:06:08 2014
@@ -17,14 +17,16 @@
'use strict';
-define(['jquery','controllers','controllers-jvm','controllers-threads','angular-route','bootstrap','datetimepicker'],
+define(['jquery','controllers','controllers-jvm','controllers-threads','angular-route','bootstrap','datetimepicker'
+ ,'controllers-report'],
function (jquery,controllers) {
var sirona = angular.module('sirona', [
'ngRoute',
'homeControllers',
'jvmControllers',
- 'threadsControllers'
+ 'threadsControllers',
+ 'countersControllers'
]);
sirona.config(['$routeProvider','$logProvider',
@@ -55,6 +57,12 @@ define(['jquery','controllers','controll
controller: 'ThreadsHomeCtrl'
}
).
+ when('/report',
+ {
+ templateUrl: 'partials/report.html',
+ controller: 'countersHomeCtrl'
+ }
+ ).
otherwise({
redirectTo: '/home'
});