diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-11-11 03:59:33 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-11-11 03:59:33 +0000 |
| commit | a265c0df3457ad6d3d17c943d3d84592face11e7 (patch) | |
| tree | ff86e385c918d5439b52271a511937b37233beb4 /archiva-modules/archiva-web | |
| parent | d2d05bbf867717d6364451c00b42d6eb3358d9a3 (diff) | |
| download | archiva-a265c0df3457ad6d3d17c943d3d84592face11e7.tar.gz archiva-a265c0df3457ad6d3d17c943d3d84592face11e7.zip | |
[MRM-1792] Integrate Apache Sirona Monitoring
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1540599 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
2 files changed, 9 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java index 123b23374..b1384a7ba 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java @@ -74,7 +74,6 @@ public class DefaultPluginsServices } catch ( IOException e ) { - throw new ArchivaRestServiceException( e.getMessage(), e ); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js index 6c7201411..2ce5c7562 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js @@ -20,12 +20,13 @@ define("archiva/admin/features/generaladmin/main",["jquery","i18n","utils","jque "knockout.sortable","jquery.ui","jquery.validate","bootstrap","select2","knockout.select2"] , function(jquery,i18n,utils,jqueryTmpl,ko,simpleGrid,sortable,jqueryUi,validate,bootstrap,select2) { - showMenu = function( administrationMenuItems) { + showMenu = function( administrationMenuItems) { administrationMenuItems.push({ text : $.i18n.prop('menu.repository-scanning') , order:2000, id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning();}}); administrationMenuItems.push({ text : $.i18n.prop('menu.runtime-configuration') , order:2010, id: "menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRuntimeConfiguration();}}); administrationMenuItems.push({ text : $.i18n.prop('menu.system-status') , order:2020, id: "menu-system-status-list-a" , href: "#status" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySystemStatus();}}); - administrationMenuItems.push({ text : $.i18n.prop('menu.ui-configuration') , order:2030, id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration();}}); - administrationMenuItems.push({ text : $.i18n.prop('menu.reports') , order:2040, id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage();}}); + administrationMenuItems.push({ text : $.i18n.prop('menu.sirona') , order:2030, id: "menu-system-sirona-list-a" , href: "#sirona" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySirona();}}); + administrationMenuItems.push({ text : $.i18n.prop('menu.ui-configuration') , order:2040, id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration();}}); + administrationMenuItems.push({ text : $.i18n.prop('menu.reports') , order:2050, id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage();}}); }; @@ -695,6 +696,11 @@ define("archiva/admin/features/generaladmin/main",["jquery","i18n","utils","jque displayCacheEntries(); } + displaySirona=function(){ + window.open("sirona-monitoring/", '_blank'); + window.focus(); + } + refreshSystemStatus=function(){ displayCacheEntries(); displayScanningStats(); |