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 12:00:37 UTC
svn commit: r1299622 - 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-webapp-js...
Author: olamy
Date: Mon Mar 12 11:00:36 2012
New Revision: 1299622
URL: http://svn.apache.org/viewvc?rev=1299622&view=rev
Log:
[MRM-1580] system status page display current server time.
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-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.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=1299622&r1=1299621&r2=1299622&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 11:00:36 2012
@@ -23,6 +23,7 @@ import org.codehaus.plexus.redback.autho
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -40,4 +41,11 @@ public interface SystemStatusService
String getMemoryStatus()
throws ArchivaRestServiceException;
+ @Path( "currentServerTime/{locale}" )
+ @GET
+ @Produces( MediaType.TEXT_PLAIN )
+ @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ String getCurrentServerTime( @PathParam( "locale" ) String locale )
+ 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=1299622&r1=1299621&r2=1299622&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 11:00:36 2012
@@ -22,11 +22,15 @@ import org.apache.archiva.rest.api.servi
import org.apache.archiva.rest.api.services.SystemStatusService;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
/**
* @author Olivier Lamy
* @since 1.4-M3
*/
-@Service("systemStatusService#rest")
+@Service( "systemStatusService#rest" )
public class DefaultSystemStatusService
implements SystemStatusService
{
@@ -45,4 +49,11 @@ public class DefaultSystemStatusService
{
return l / ( 1024 * 1024 ) + "M";
}
+
+ public String getCurrentServerTime( String locale )
+ throws ArchivaRestServiceException
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat( "EEE, d MMM yyyy HH:mm:ss Z", new Locale( locale ) );
+ return sdf.format( new Date() );
+ }
}
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=1299622&r1=1299621&r2=1299622&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 11:00:36 2012
@@ -566,14 +566,22 @@ $(function() {
screenChange();
var mainContent=$("#main-content");
mainContent.html($("#system-status-main").tmpl());
- mainContent.find("#status_memory_info" ).html(smallSpinnerImg());
$.ajax("restServices/archivaServices/systemStatusService/memoryStatus", {
type: "GET",
dataType: "text",
success: function(data){
var memUsage = data;
$.log("memUsage:"+memUsage);
- mainContent.find("#status_memory_info" ).html($("#memory-info-tmpl" ).tmpl({memoryUsage: memUsage}));
+ mainContent.find("#status_memory_info" ).html(memUsage);
+ }
+ });
+ $.ajax("restServices/archivaServices/systemStatusService/currentServerTime/"+encodeURIComponent(usedLang()), {
+ type: "GET",
+ dataType: "text",
+ success: function(data){
+ var curTime=data;
+ $.log("currentServerTime:"+curTime);
+ mainContent.find("#status_current_time").html(curTime);
}
});
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js?rev=1299622&r1=1299621&r2=1299622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js Mon Mar 12 11:00:36 2012
@@ -20,11 +20,16 @@
$(function() {
// load i18n resources from rest call
- var browserLang = $.i18n.browserLang();
- var requestLang = $.urlParam('request_lang');
- if (requestLang) {
- browserLang=requestLang;
+ usedLang=function(){
+ var browserLang = $.i18n.browserLang();
+ var requestLang = $.urlParam('request_lang');
+ if (requestLang) {
+ browserLang=requestLang;
+ }
+ return browserLang;
}
+
+ var browserLang = usedLang();
$.log("use browserLang:"+browserLang);
// -- archiva
// load default
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=1299622&r1=1299621&r2=1299622&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 11:00:36 2012
@@ -314,48 +314,46 @@
<h4>${$.i18n.prop('system-status.header.queues')}</h4>
</div>
<div id="status_queues">
- Queues
+ <img src="images/small-spinner.gif"/>
</div>
<div class="page-header">
<h4>${$.i18n.prop('system-status.header.scanning')}</h4>
</div>
<div id="status_scanning">
- repos scanning
+ <img src="images/small-spinner.gif"/>
</div>
<div class="page-header">
<h4>${$.i18n.prop('system-status.header.caches')}</h4>
</div>
<div id="status_caches">
- caches
+ <img src="images/small-spinner.gif"/>
</div>
<div class="page-header">
<h4>${$.i18n.prop('system-status.header.memory')}</h4>
</div>
<div id="status_memory_info">
- memory
+ <img src="images/small-spinner.gif"/>
</div>
<div class="page-header">
<h4>${$.i18n.prop('system-status.header.current.time')}</h4>
</div>
- <div div="status_current_time">
- current time
+ <div id="status_current_time">
+ <img src="images/small-spinner.gif"/>
</div>
<div class="page-header">
<h4>${$.i18n.prop('system-status.header.version.info')}</h4>
</div>
<div id="status_version_info">
- version info
+ <img src="images/small-spinner.gif"/>
</div>
</script>
-<div id="memory-info-tmpl">
- ${memoryUsage}
-</div>
+