You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/06/30 22:11:09 UTC
svn commit: r672891 - in
/geronimo/server/trunk/plugins/console/console-base-portlets/src/main:
java/org/apache/geronimo/console/infomanager/ resources/
webapp/WEB-INF/view/infomanager/
Author: dwoods
Date: Mon Jun 30 13:11:09 2008
New Revision: 672891
URL: http://svn.apache.org/viewvc?rev=672891&view=rev
Log:
GERONIMO-4148 Add OS info to the Server Information portlet
Modified:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java?rev=672891&r1=672890&r2=672891&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java Mon Jun 30 13:11:09 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/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=672891&r1=672890&r2=672891&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Mon Jun 30 13:11:09 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/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=672891&r1=672890&r2=672891&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Mon Jun 30 13:11:09 2008
@@ -210,11 +210,18 @@
infomanager.svrInfoNormal.operatingSystem = \u64CD\u4F5C\u7CFB\u7EDF
infomanager.svrInfoNormal.patchLevel = \u8865\u4E01\u7EA7\u522B
infomanager.svrInfoNormal.server = \u670D\u52A1\u5668
-infomanager.svrInfoNormal.startTime = Geronimo\u542F\u52A8\u65F6\u95F4
+infomanager.svrInfoNormal.startTime = \u542F\u52A8\u65F6\u95F4
infomanager.svrInfoNormal.totalMemoryAllocated = \u603B\u5171\u5206\u914D\u5185\u5B58
-infomanager.svrInfoNormal.upTime = Geronimo\u8FD0\u884C\u65F6\u95F4
+infomanager.svrInfoNormal.upTime = \u8FD0\u884C\u65F6\u95F4
infomanager.svrInfoNormal.vendorInfo = \u5382\u5546\u4FE1\u606F
-infomanager.svrInfoNormal.version = Geronimo\u7248\u672C
+infomanager.svrInfoNormal.version = \u7248\u672C
+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 = \u8FD4\u56DE\u5230\u5BC6\u94A5\u5B58\u50A8\u5E93
keystore.certificateDetails.certificateInfo = \u8BC1\u4E66\u4FE1\u606F
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=672891&r1=672890&r2=672891&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Mon Jun 30 13:11:09 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>