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 2012/03/12 15:31:02 UTC
svn commit: r1299685 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-web-commo...
Author: olamy
Date: Mon Mar 12 14:31:02 2012
New Revision: 1299685
URL: http://svn.apache.org/viewvc?rev=1299685&view=rev
Log:
[MRM-1580] system status page button to flush all caches.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java?rev=1299685&r1=1299684&r2=1299685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java Mon Mar 12 14:31:02 2012
@@ -72,4 +72,12 @@ public interface SystemStatusService
Boolean clearCache( @PathParam( "key" ) String cacheKey )
throws ArchivaRestServiceException;
+ @Path( "clearAllCaches" )
+ @GET
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ Boolean clearAllCaches()
+ throws ArchivaRestServiceException;
+
+
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.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/DefaultSystemStatusService.java?rev=1299685&r1=1299684&r2=1299685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java Mon Mar 12 14:31:02 2012
@@ -140,4 +140,14 @@ public class DefaultSystemStatusService
cache.clear();
return Boolean.TRUE;
}
+
+ public Boolean clearAllCaches()
+ throws ArchivaRestServiceException
+ {
+ for ( Cache cache : caches.values() )
+ {
+ cache.clear();
+ }
+ return Boolean.TRUE;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1299685&r1=1299684&r2=1299685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Mon Mar 12 14:31:02 2012
@@ -306,6 +306,8 @@ system-status.caches.grid.header.flush=F
system-status.caches.grid.header.key=Cache
system-status.caches.flushed=Cache {0} flushed.
system-status.caches.grid.header.size=Size
+system-status.caches.flushAll=Flush All Caches
+system-status.caches.all.flushed=All Caches flushed.
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1299685&r1=1299684&r2=1299685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Mon Mar 12 14:31:02 2012
@@ -615,6 +615,18 @@ $(function() {
});
}
+ flushAllCaches=function(){
+ clearUserMessages();
+ $("#main-content #status_caches").html(smallSpinnerImg());
+ $.ajax("restServices/archivaServices/systemStatusService/clearAllCaches", {
+ type: "GET",
+ success: function(data){
+ displaySuccessMessage( $.i18n.prop("system-status.caches.all.flushed"));
+ displayCacheEntries();
+ }
+ });
+ }
+
displaySystemStatus=function(){
screenChange();
var mainContent=$("#main-content");
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html?rev=1299685&r1=1299684&r2=1299685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html Mon Mar 12 14:31:02 2012
@@ -359,6 +359,9 @@
</script>
<script id="status_caches_tmpl" type="text/html">
+ <a href="#" class="btn btn-warning" onclick="flushAllCaches()">
+ ${$.i18n.prop('system-status.caches.flushAll')}
+ </a>
<table class="table table-condensed">
<thead>
<tr>