svn commit: r1621759 - in /incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app: controllers/ services/

[ol...@apache.org]

Author: olamy
Date: Mon Sep  1 12:25:25 2014
New Revision: 1621759

URL: http://svn.apache.org/r1621759
Log:
use a better naming

Modified:
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-threads.js
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js?rev=1621759&r1=1621758&r2=1621759&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js Mon Sep  1 12:25:25 2014
@@ -21,7 +21,7 @@ define(['jquery','angular','bootstrap','
 
   var dayDuration = 24 * 3600 * 1000;
 
-  var gaugesControllers = angular.module('gaugesControllers', ['sironaJvmServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
+  var gaugesControllers = angular.module('gaugesControllers', ['sironaServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
 
   gaugesControllers.controller( 'GaugesHomeCtrl', ['$scope','$routeParams','gauges',
     function ($scope,$routeParams,gauges){

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js?rev=1621759&r1=1621758&r2=1621759&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js Mon Sep  1 12:25:25 2014
@@ -22,7 +22,7 @@ define(['jquery','angular','bootstrap','
   var dayDuration = 24 * 3600 * 1000;
 
 
-  var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
+  var jvmControllers = angular.module('jvmControllers', ['sironaServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
 
   jvmControllers.controller( 'JvmHomeCtrl', ['$scope','jvmCpu','jvmMemory','nonHeapMemory','activeThreads',
                                               'osInfo','memoryInfo',

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js?rev=1621759&r1=1621758&r2=1621759&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js Mon Sep  1 12:25:25 2014
@@ -22,7 +22,7 @@ define(['jquery','angular','bootstrap','
   var dayDuration = 24 * 3600 * 1000;
 
 
-  var reportControllers = angular.module('countersControllers', ['sironaJvmServices','ngGrid']);
+  var reportControllers = angular.module('countersControllers', ['sironaServices','ngGrid']);
 
   reportControllers.controller( 'countersHomeCtrl', ['$scope','$routeParams','$http','counters',
     function ( $scope,$routeParams,$http,counters){

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js?rev=1621759&r1=1621758&r2=1621759&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js Mon Sep  1 12:25:25 2014
@@ -20,15 +20,19 @@
 define(['jquery','angular','bootstrap','services','morris','ui-bootstrap','datetimepicker'], function (){
 
 
-  var statusControllers = angular.module('statusControllers', ['sironaJvmServices','ui.bootstrap']);
+  var statusControllers = angular.module('statusControllers', ['sironaServices','ui.bootstrap']);
 
-  statusControllers.controller( 'StatusHomeCtrl', ['$scope','$routeParams',
-    function ($scope,$routeParams){
+  statusControllers.controller( 'StatusHomeCtrl', ['$scope','$routeParams','status',
+    function ($scope,status){
 
       $scope.data={};
 
       console.log("StatusHomeCtrl");
 
+      status.get().$promise.then( function ( results ){
+
+      });
+
   }]);
 
   statusControllers.controller( 'StatusDetailCtrl', ['$scope','$routeParams',

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-threads.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-threads.js?rev=1621759&r1=1621758&r2=1621759&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-threads.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-threads.js Mon Sep  1 12:25:25 2014
@@ -20,7 +20,7 @@
 define(['jquery','angular','bootstrap','services','morris','ui-bootstrap','datetimepicker'], function (){
 
 
-  var threadsControllers = angular.module('threadsControllers', ['sironaJvmServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
+  var threadsControllers = angular.module('threadsControllers', ['sironaServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
 
   threadsControllers.controller( 'ThreadsHomeCtrl', ['$scope','$routeParams','threads',
     function ($scope,$routeParams,threads){

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=1621759&r1=1621758&r2=1621759&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 Mon Sep  1 12:25:25 2014
@@ -18,7 +18,7 @@
 
 /* Services */
 define(['angular','angular-resource'], function (){
-  var sironaServices = angular.module('sironaJvmServices', ['ngResource']);
+  var sironaServices = angular.module('sironaServices', ['ngResource']);
 
   sironaServices.factory('jvmCpu', ['$resource',
     function($resource){
@@ -102,5 +102,13 @@ define(['angular','angular-resource'], f
   ]);
 
 
+  sironaServices.factory('status', ['$resource',
+    function($resource){
+      return $resource('restServices/sironaServices/status/:nodeName',
+                       {},
+                       {query: {method:'GET', params:{nodeName:'@nodeName'},isArray:false}});
+    }
+  ]);
+
 
 });
\ No newline at end of file