You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/11 04:59:34 UTC
svn commit: r1540599 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/
Author: olamy
Date: Mon Nov 11 03:59:33 2013
New Revision: 1540599
URL: http://svn.apache.org/r1540599
Log:
[MRM-1792] Integrate Apache Sirona Monitoring
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java?rev=1540599&r1=1540598&r2=1540599&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java Mon Nov 11 03:59:33 2013
@@ -74,7 +74,6 @@ public class DefaultPluginsServices
}
catch ( IOException e )
{
-
throw new ArchivaRestServiceException( e.getMessage(), e );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js?rev=1540599&r1=1540598&r2=1540599&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js Mon Nov 11 03:59:33 2013
@@ -20,12 +20,13 @@ define("archiva/admin/features/generalad
"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/generalad
displayCacheEntries();
}
+ displaySirona=function(){
+ window.open("sirona-monitoring/", '_blank');
+ window.focus();
+ }
+
refreshSystemStatus=function(){
displayCacheEntries();
displayScanningStats();