[MRM-1580] system status page display memory usage.

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

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index ea22360ee78ed9158a115a444b9a9c2b46ede752..a497537a15d0620ba209559159c81ab5292f82a7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -68,6 +68,7 @@
       <ref bean="searchService#rest"/>
       <ref bean="commonServices#rest"/>
       <ref bean="browseService#rest"/>
+      <ref bean="systemStatusService#rest"/>
     </jaxrs:serviceBeans>
 
     <jaxrs:outInterceptors>

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 10fd0e2b3aaaf7ee20af1062c3720133abc12326..d395cf110f9549c4d82df1be99e7dca63532ffa7 100644 (file)
--- 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
@@ -457,8 +457,7 @@ $(function() {
   }
 
   displayRepositoryScanning=function(){
-
-    clearUserMessages();
+    screenChange();
     var mainContent=$("#main-content");
 
     mainContent.html($("#repository-scanning-main").tmpl());
@@ -537,6 +536,7 @@ $(function() {
   }
 
   displayNetworkConfiguration=function(){
+    screenChange();
     var mainContent=$("#main-content");
     mainContent.html($("#network-configuration-screen").tmpl());
 
@@ -561,4 +561,21 @@ $(function() {
   // system status part
   //---------------------------
 
+
+  displaySystemStatus=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}));
+        }
+    });
+  }
+
 });
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index f060100f0424c36242bbe6ec2b6bc8bc6970926a..1dc480c687b19e1f52b504764f27af76d183148f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -102,6 +102,10 @@ $(function() {
         displayNetworkConfiguration();
         return;
       }
+      if (screen=='system-status'&& hasKarma('archiva-manage-configuration')){
+        displaySystemStatus();
+        return;
+      }
     }
 
     // by default display search screen

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 c3368d5f44c5f3237417880e5959fb128477ecdd..f4f91bb93f42d9daa4dd7c252d8af05436dc80cd 100644 (file)
--- 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
@@ -309,5 +309,53 @@
     </form>
 </script>
 
+<script id="system-status-main" type="text/html">
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.queues')}</h4>
+  </div>
+  <div id="status_queues">
+    Queues
+  </div>
+
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.scanning')}</h4>
+  </div>
+  <div id="status_scanning">
+    repos scanning
+  </div>
+
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.caches')}</h4>
+  </div>
+  <div id="status_caches">
+    caches
+  </div>
+
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.memory')}</h4>
+  </div>
+  <div id="status_memory_info">
+    memory
+  </div>
+
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.current.time')}</h4>
+  </div>
+  <div div="status_current_time">
+    current time
+  </div>
+
+  <div class="page-header">
+    <h4>${$.i18n.prop('system-status.header.version.info')}</h4>
+  </div>
+  <div id="status_version_info">
+    version info
+  </div>
+
+</script>
+
+<div id="memory-info-tmpl">
+  ${memoryUsage}
+</div>
 
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
index 6e7abb78686c0a2657510a823cdb4757364442b4..66f52e2006c7c8fe5aa9aaba1ae7ad23a54ca7a3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
@@ -51,6 +51,9 @@
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
         <a href="#" id="menu-network-configuration-list-a" onclick="displayNetworkConfiguration()">${$.i18n.prop('menu.network-configuration')}</a>
       </li>
+      <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+        <a href="#" id="menu-system-status-list-a" onclick="displaySystemStatus()">${$.i18n.prop('menu.system-status')}</a>
+      </li>
 
 
     </ul>