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/09 08:42:40 UTC
svn commit: r1623672 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
index.html js/app/services/services.js js/main.js js/sirona.js
Author: olamy
Date: Tue Sep 9 06:42:40 2014
New Revision: 1623672
URL: http://svn.apache.org/r1623672
Log:
jta part
Modified:
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-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=1623672&r1=1623671&r2=1623672&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 Tue Sep 9 06:42:40 2014
@@ -75,6 +75,9 @@
<a href="#jvm">JVM</a>
</li>
<li>
+ <a href="#jta">JTA</a>
+ </li>
+ <li>
<a href="#threads">Threads</a>
</li>
</ul>
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=1623672&r1=1623671&r2=1623672&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 Tue Sep 9 06:42:40 2014
@@ -120,4 +120,29 @@ define(['angular','angular-resource'], f
]);
+ sironaServices.factory('jtaCommits', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/jtareports/commits/:start/:end',
+ {start:'@start',end:'@end'},
+ {query: {method:'GET', params:{}}});
+ }
+ ]);
+
+
+ sironaServices.factory('jtaRollbacks', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/jtareports/rollbacks/:start/:end',
+ {start:'@start',end:'@end'},
+ {query: {method:'GET', params:{}}});
+ }
+ ]);
+
+ sironaServices.factory('jtaActives', ['$resource',
+ function($resource){
+ return $resource('restServices/sironaServices/jtareports/actives/:start/:end',
+ {start:'@start',end:'@end'},
+ {query: {method:'GET', params:{}}});
+ }
+ ]);
+
});
\ 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=1623672&r1=1623671&r2=1623672&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 Tue Sep 9 06:42:40 2014
@@ -42,6 +42,7 @@ require.config({
'controllers-gauges': 'app/controllers/controllers-gauges',
'controllers-status': 'app/controllers/controllers-status',
'controllers-jmx': 'app/controllers/controllers-jmx',
+ 'controllers-jta': 'app/controllers/controllers-jta',
'services': 'app/services/services',
'sirona': 'sirona',
'morris': 'plugins/morris/morris-0.5.0.min',
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=1623672&r1=1623671&r2=1623672&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 Tue Sep 9 06:42:40 2014
@@ -18,7 +18,7 @@
'use strict';
define(['jquery','controllers','controllers-jvm','controllers-threads','controllers-gauges','angular-route',
- 'bootstrap','datetimepicker','controllers-report','controllers-status','controllers-jmx'],
+ 'bootstrap','datetimepicker','controllers-report','controllers-status','controllers-jmx','controllers-jta'],
function (jquery,controllers) {
var sirona = angular.module('sirona', [
@@ -29,7 +29,8 @@ define(['jquery','controllers','controll
'countersControllers',
'gaugesControllers',
'statusControllers',
- 'jmxControllers'
+ 'jmxControllers',
+ 'jtaControllers'
]);
sirona.config(['$routeProvider','$logProvider',
@@ -96,6 +97,12 @@ define(['jquery','controllers','controll
controller: 'jmxHomeCtrl'
}
).
+ when('/jta',
+ {
+ templateUrl: 'partials/jta.html',
+ controller: 'jtaHomeCtrl'
+ }
+ ).
when('/jmx/:mbeanName',
{
templateUrl: 'partials/jmx-detail.html',