From: Olivier Lamy <olamy@apache.org>
Date: Mon, 12 Mar 2012 11:00:36 +0000 (+0000)
Subject: [MRM-1580] system status page display current server time.
X-Git-Tag: archiva-1.4-M3~1060
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eee8044673c61b8554ee6fc4b58f0e9ef0df8125;p=archiva.git

[MRM-1580] system status page display current server time.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299622 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java
index 6942d69a2..45e790f5f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java
@@ -23,6 +23,7 @@ import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
 
 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;
+
 }
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
index 27e70439f..e07f77a40 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
@@ -22,11 +22,15 @@ import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
 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() );
+    }
 }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
index d395cf110..832c96888 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
@@ -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);
         }
     });
   }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
index 227aa2215..be0aea864 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
@@ -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
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
index f4f91bb93..4bfcb089d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
@@ -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>
+