geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r672887 - in /geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java resources/consolebase.properties webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Date Mon, 30 Jun 2008 20:04:19 GMT
Author: dwoods
Date: Mon Jun 30 13:04:19 2008
New Revision: 672887

URL: http://svn.apache.org/viewvc?rev=672887&view=rev
Log:
GERONIMO-4148 Add OS info to the Server Information portlet

Modified:
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java?rev=672887&r1=672886&r2=672887&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
Mon Jun 30 13:04:19 2008
@@ -73,6 +73,12 @@
         Date bootDate = jvm.getKernelBootTime();
         svrProps.put("Kernel Boot Time", bootDate);
         svrProps.put("Geronimo Version", ServerConstants.getVersion());
+        svrProps.put("Build", ServerConstants.getBuildDate() + "-" + ServerConstants.getBuildTime());
+        svrProps.put("os.name", System.getProperty("os.name"));
+        svrProps.put("os.version", System.getProperty("os.version"));
+        svrProps.put("sun.os.patch.level", System.getProperty("sun.os.patch.level"));
+        svrProps.put("os.arch", System.getProperty("os.arch"));
+        svrProps.put("os.locale", System.getProperty("user.language") + "_" + System.getProperty("user.country"));
         renderRequest.setAttribute("svrProps", svrProps);
 
         jvmProps.put("Java Version", jvm.getJavaVersion());

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=672887&r1=672886&r2=672887&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
Mon Jun 30 13:04:19 2008
@@ -212,11 +212,18 @@
 infomanager.svrInfoNormal.operatingSystem      = Operating System
 infomanager.svrInfoNormal.patchLevel           = Patch Level
 infomanager.svrInfoNormal.server               = Server
-infomanager.svrInfoNormal.startTime            = Geronimo Start Time
+infomanager.svrInfoNormal.startTime            = Start Time
 infomanager.svrInfoNormal.totalMemoryAllocated = Total Memory Allocated
-infomanager.svrInfoNormal.upTime               = Geronimo Up Time
+infomanager.svrInfoNormal.upTime               = Up Time
 infomanager.svrInfoNormal.vendorInfo           = Vendor Information
-infomanager.svrInfoNormal.version              = Geronimo Version
+infomanager.svrInfoNormal.version              = Version
+infomanager.svrInfoNormal.build			= Build
+infomanager.svrInfoNormal.os			= Operating System
+infomanager.svrInfoNormal.os.arch		= Architecture
+infomanager.svrInfoNormal.os.name		= Name
+infomanager.svrInfoNormal.os.version		= Version
+infomanager.svrInfoNormal.os.patchlevel		= Patch Level
+infomanager.svrInfoNormal.os.locale		= Locale
 
 keystore.certificateDetails.backToKeystore     = Back to keystore
 keystore.certificateDetails.certificateInfo    = Certificate Info

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=672887&r1=672886&r2=672887&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Mon Jun 30 13:04:19 2008
@@ -33,6 +33,10 @@
     <td class="LightBackground" width="80%">${svrProps['Geronimo Version']}</td>
   </tr>
   <tr>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.build"/></td>
+    <td class="LightBackground" width="80%">${svrProps['Build']}</td>
+  </tr>
+  <tr>
     <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.startTime"/></td>
     <td class="MediumBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
   </tr>
@@ -42,52 +46,32 @@
   </tr>
 </table>
 <br>
-<!--
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Server</td>
-  </tr>
-
-  base directory is commented originally
-  <tr>
-    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.architecture"/></td>
-    <td class="LightBackground" width="80%">${svrProps['Base Directory']}</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message
key="infomanager.svrInfoNormal.os"/></td>
   </tr>
 
   <tr>
-    <td class="MediumBackground" width="20%" nowrap><fmt:message key="consolebase.common.name"/></td>
-    <td class="LightBackground">${svrProps['Platform Architecture']}</td>
-  </tr>
-  <tr>
-    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.version"/></td>
-    <td class="MediumBackground"  width="80%">${svrProps['Version']}</td>
-  </tr>
-  <tr>
-    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.patchLevel"/></td>
-    <td class="LightBackground">${svrProps['Apache Geronimo Build Version']}</td>
-  </tr>
-  <tr>
-    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.locale"/></td>
-    <td class="MediumBackground">${svrProps['J2EE Specifications Version']}</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.arch"/></td>
+    <td class="LightBackground" width="80%">${svrProps['os.arch']}</td>
   </tr>
   <tr>
-    <td class="LightBackground">JSR-168 Portal Version</td>
-    <td class="LightBackground">${svrProps['JSR 168 Portal Version']}</td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.name"/></td>
+    <td class="MediumBackground" width="80%">${svrProps['os.name']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Build Date</td>
-    <td class="MediumBackground">${svrProps['Build Date']}</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.version"/></td>
+    <td class="LightBackground" width="80%">${svrProps['os.version']}</td>
   </tr>
   <tr>
-    <td class="LightBackground">Build Time</td>
-    <td class="LightBackground">${svrProps['Build Time']}</td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.patchlevel"/></td>
+    <td class="MediumBackground" width="80%">${svrProps['sun.os.patch.level']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Copyright</td>
-    <td class="MediumBackground">${svrProps['Copyright']}</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.locale"/></td>
+    <td class="LightBackground" width="80%">${svrProps['os.locale']}</td>
   </tr>
 </table>
--->
 <br>
 <table width="100%">
   <tr>



Mime
View raw message