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/06 14:26:05 UTC
svn commit: r1616196 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
js/app/controllers/controllers.js js/app/services/services.js js/sirona.js
partials/jvm.html
Author: olamy
Date: Wed Aug 6 12:26:04 2014
New Revision: 1616196
URL: http://svn.apache.org/r1616196
Log:
start with jvm report
Added:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html (with props)
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
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/sirona.js
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js?rev=1616196&r1=1616195&r2=1616196&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js Wed Aug 6 12:26:04 2014
@@ -1,7 +1,7 @@
'use strict';
/* Controllers */
-define(['angular'], function (){
+define(['angular','services'], function (){
var homeControllers = angular.module('homeControllers', []);
@@ -9,6 +9,13 @@ define(['angular'], function (){
console.log("HomeCtrl");
}]);
+
+ var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices']);
+
+ jvmControllers.controller( 'JvmHomeCtrl', ['$scope', function ( $scope ){
+ console.log("JvmHomeCtrl");
+ }]);
+
});
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=1616196&r1=1616195&r2=1616196&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 Wed Aug 6 12:26:04 2014
@@ -1,12 +1,14 @@
'use strict';
/* Services */
+define(['angular'], function (){
+ var sironaServices = angular.module('sironaJvmServices', ['ngResource']);
-var sironaServices = angular.module('sironaServices', ['ngResource']);
+ sironaServices.factory('jvmCpu', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/jvmreports/cpu', {}, {
+ query: {method:'GET', params:{}, isArray:true}
+ });
+ }]);
-sironaServices.factory('jvm', ['$resource',
- function($resource){
- return $resource('jvm', {}, {
- query: {method:'GET', params:{}, isArray:true}
- });
- }]);
+});
\ No newline at end of file
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=1616196&r1=1616195&r2=1616196&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 Wed Aug 6 12:26:04 2014
@@ -5,7 +5,8 @@ define(['jquery','controllers', 'angular
var sirona = angular.module('sirona', [
'ngRoute',
- 'homeControllers'
+ 'homeControllers',
+ 'jvmControllers'
]);
sirona.config(['$routeProvider',
@@ -17,6 +18,12 @@ define(['jquery','controllers', 'angular
controller: 'HomeCtrl'
}
).
+ when('/jvm',
+ {
+ templateUrl: 'partials/jvm.html',
+ controller: 'JvmHomeCtrl'
+ }
+ ).
otherwise({
redirectTo: '/home'
});
Added: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html?rev=1616196&view=auto
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html (added)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html Wed Aug 6 12:26:04 2014
@@ -0,0 +1 @@
+jvm
\ No newline at end of file
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision