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 2009/01/06 18:30:43 UTC
svn commit: r732011 - in
/geronimo/server/trunk/plugins/console/console-base-portlets/src/main:
resources/ webapp/WEB-INF/view/configmanager/
webapp/WEB-INF/view/infomanager/
Author: dwoods
Date: Tue Jan 6 09:30:41 2009
New Revision: 732011
URL: http://svn.apache.org/viewvc?rev=732011&view=rev
Log:
GERONIMO-4025 applied GERONIMO-4025-configmanager-and-infomanager.patch from Rex Wang.
Modified:
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/configmanager/normal.jsp
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
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/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=732011&r1=732010&r2=732011&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 Tue Jan 6 09:30:41 2009
@@ -178,6 +178,7 @@
consolebase.common.group = Group
consolebase.common.groupName = Group Name
consolebase.common.install = Install
+consolebase.common.item = Item
consolebase.common.monitor = Monitor
consolebase.common.name = Name
consolebase.common.next = Next
@@ -199,9 +200,15 @@
consolebase.common.userID = UserID
consolebase.common.userName = Username
consolebase.common.users = Users
+consolebase.common.value = Value
consolebase.common.version = Version
consolebase.common.view = View
+infomanager.javaSysNormal.etc = Etc
+infomanager.javaSysNormal.operatingSystem = Operating System
+infomanager.javaSysNormal.user = User
+infomanager.javaSysNormal.virtualMachine = Virtual Machine
+
infomanager.javaSysHelp.body = This page displays the values of the system properties available to the server process.
infomanager.svrInfoHelp.body = This page provides information about the uptime of the server and the resources being used by the JVM.
infomanager.svrInfoNormal.architecture = Architecture
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=732011&r1=732010&r2=732011&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 Tue Jan 6 09:30:41 2009
@@ -178,6 +178,7 @@
consolebase.common.group = \u7EC4
consolebase.common.groupName = \u7EC4\u540D
consolebase.common.install = \u5B89\u88C5
+consolebase.common.item = \u9879
consolebase.common.monitor = \u76D1\u63A7
consolebase.common.name = \u540D\u5B57
consolebase.common.next = \u4E0B\u4E00\u6B65
@@ -199,9 +200,14 @@
consolebase.common.userID = \u7528\u6237ID
consolebase.common.userName = \u7528\u6237\u540D
consolebase.common.users = \u7528\u6237
+consolebase.common.value = \u503c
consolebase.common.version = \u7248\u672C
consolebase.common.view = \u67E5\u770B
+infomanager.javaSysNormal.etc = \u5176\u5b83
+infomanager.javaSysNormal.operatingSystem = \u64cd\u4f5c\u7cfb\u7edf
+infomanager.javaSysNormal.user = \u7528\u6237
+infomanager.javaSysNormal.virtualMachine = \u865a\u62df\u673a
infomanager.javaSysHelp.body = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u670D\u52A1\u5668\u8FDB\u7A0B\u53EF\u7528\u7684\u7CFB\u7EDF\u5C5E\u6027\u503C\u3002
infomanager.svrInfoHelp.body = \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
infomanager.svrInfoNormal.architecture = \u67B6\u6784
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=732011&r1=732010&r2=732011&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Tue Jan 6 09:30:41 2009
@@ -214,7 +214,7 @@
</script>
-
+<br/>
<form name="checkExpert">
<input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" /> <label for="<portlet:namespace/>expertMode"><fmt:message key="configmanager.normal.expertMode" /></label>
</form>
@@ -222,16 +222,19 @@
<form name="showDependenciesForm">
<input type="checkbox" name="showDependenciesMode" id="<portlet:namespace/>showDependenciesMode" onClick="toggleShowDependenciesMode();" /> <label for="<portlet:namespace/>showDependenciesMode"><fmt:message key="configmanager.normal.showDependencyMode" /></label>
</form>
+<br/>
-<table width="100%">
+<table width="100%" class="TableLine" summary="Config Manager">
<tr class="DarkBackground">
- <th align="left"> <fmt:message key="configmanager.normal.componentName" /></th>
- <c:if test="${showWebInfo}"><th>URL</th></c:if>
- <th> <fmt:message key="consolebase.common.state"/></th>
- <th align="center" colspan="3"> <fmt:message key="consolebase.common.commands"/></th>
+ <th scope="col" align="left"> <fmt:message key="configmanager.normal.componentName" /></th>
+ <c:if test="${showWebInfo}">
+ <th scope="col">URL</th>
+ </c:if>
+ <th scope="col"> <fmt:message key="consolebase.common.state"/></th>
+ <th scope="col" align="center" colspan="3"><fmt:message key="consolebase.common.commands"/></th>
<c:if test="${showDependencies}">
- <th align="left"><fmt:message key="configmanager.normal.parentComponents" /></th>
- <th align="left"><fmt:message key="configmanager.normal.childComponents" /></th>
+ <th scope="col" align="left"><fmt:message key="configmanager.normal.parentComponents" /></th>
+ <th scope="col" align="left"><fmt:message key="configmanager.normal.childComponents" /></th>
</c:if>
</tr>
<c:set var="backgroundClass" value='MediumBackground'/>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=732011&r1=732010&r2=732011&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp Tue Jan 6 09:30:41 2009
@@ -20,9 +20,11 @@
<fmt:setBundle basename="consolebase"/>
<portlet:defineObjects/>
-<table width="100%">
+<b>Java:</b>
+<table width="100%" class="TableLine" summary="java">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center">Java</td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap>java.awt.graphicsenv</td>
@@ -125,10 +127,14 @@
<td class="LightBackground">${javaSysProps['java.version']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="consolebase.common.virtualMachine"/>:</b>
+<table width="100%" class="TableLine" summary="Virtual Machine">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="apache.javaSysNormal.vm"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:mes
+sage key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap>java.vm.info</td>
@@ -159,10 +165,13 @@
<td class="LightBackground">${javaSysProps['java.vm.version']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="consolebase.common.operatingSystem"/>:</b>
+<table width="100%" class="TableLine" summary="Operating System">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="apache.javaSysNormal.os"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap>os.arch</td>
@@ -177,10 +186,13 @@
<td class="LightBackground">${javaSysProps['os.version']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b>Sun:</b>
+<table width="100%" class="TableLine" summary="Sun">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center">Sun</td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap>sun.arch.data.model</td>
@@ -188,7 +200,6 @@
</tr>
<tr>
<td class="MediumBackground">sun.boot.class.path</td>
-
<td class="MediumBackground">
<table>
@@ -231,10 +242,13 @@
<td class="MediumBackground">${javaSysProps['sun.os.patch.level']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="consolebase.common.user"/>:</b>
+<table width="100%" class="TableLine" summary="User">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="apache.javaSysNormal.usr"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap>user.country</td>
@@ -265,10 +279,13 @@
<td class="LightBackground">${javaSysProps['user.variant']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="consolebase.common.etc"/>:</b>
+<table width="100%" class="TableLine" summary="Etc">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="apache.javaSysNormal.etc"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<% String background = "LightBackground"; %>
<% // Crappy workaround because apparently Jetty's JSTL can't call getters on a Map subclass?!?
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=732011&r1=732010&r2=732011&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 Tue Jan 6 09:30:41 2009
@@ -24,9 +24,11 @@
<script type='text/javascript' src='/console/dwr/engine.js'></script>
<script type='text/javascript' src='/console/dwr/util.js'></script>
-<table width="100%">
+<b><fmt:message key="infomanager.svrInfoNormal.server"/>:</b>
+<table width="100%" class="TableLine" summary="Server">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.server"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.version"/></td>
@@ -45,12 +47,14 @@
<td class="LightBackground"><div id="<portlet:namespace/>UpTime"><fmt:message key="infomanager.svrInfoNormal.notAvailable"/></div></td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="infomanager.svrInfoNormal.os"/>:</b>
+<table width="100%" class="TableLine" summary="OS">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.os"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
-
<tr>
<td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.os.arch"/></td>
<td class="LightBackground" width="80%">${svrProps['os.arch']}</td>
@@ -72,10 +76,13 @@
<td class="LightBackground" width="80%">${svrProps['os.locale']}</td>
</tr>
</table>
-<br>
-<table width="100%">
+<br/>
+
+<b><fmt:message key="infomanager.svrInfoNormal.jvm"/>:</b>
+<table width="100%" class="TableLine" summary="JVM">
<tr>
- <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.jvm"/></td>
+ <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="consolebase.common.item"/></th>
+ <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="consolebase.common.value"/></th>
</tr>
<tr>
<td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.javaVersion"/></td>
Re: svn commit: r732011 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: resources/ webapp/WEB-INF/view/configmanager/ webapp/WEB-INF/view/infomanager/
Posted by Jason Warner <ja...@gmail.com>.
Looks like it was just a typo in the jsp. Think I fixed it...
On Tue, Jan 6, 2009 at 1:21 PM, Jason Warner <ja...@gmail.com> wrote:
> I think this change might be causing build problems. A recent build failed
> with the following error:
>
> Trace org.apache.jasper.JasperException:
> file:/opt/anthill3/agent/var/jobs/projects/Geronimo_Server_Build/Geronimo_Server_Build_Workflow/project/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp(17,0)
> file:/opt/anthill3/agent/var/jobs/projects/Geronimo_Server_Build/Geronimo_Server_Build_Workflow/project/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp(135,70)
> No tag "mes" defined in tag library imported with prefix "fmt"
> at
> org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:40)
> at
> org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:407)
> at
> org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:88)
> at
> org.apache.jasper.compiler.Parser.processIncludeDirective(Parser.java:345)
> at
> org.apache.jasper.compiler.Parser.parseIncludeDirective(Parser.java:378)
> at org.apache.jasper.compiler.Parser.parseDirective(Parser.java:486)
> at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1444)
> at org.apache.jasper.compiler.Parser.parse(Parser.java:138)
> at
> org.apache.jasper.compiler.ParserController.doParse(ParserController.java:216)
> at
> org.apache.jasper.compiler.ParserController.parse(ParserController.java:103)
> at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:154)
> at org.apache.jasper.compiler.Compiler.compile(Compiler.java:315)
> at org.apache.jasper.JspC.processFile(JspC.java:1010)
> at org.apache.jasper.JspC.execute(JspC.java:1159)
> at
> org.codehaus.mojo.jspc.compiler.tomcat6.JspCompilerImpl.compile(JspCompilerImpl.java:111)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:585)
> at
> org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:86)
> at groovy.lang.MetaMethod.doMethodInvoke(MetaMethod.java:230)
> at groovy.lang.MetaClassImpl.invokeMethod(MetaClassImpl.java:912)
> at groovy.lang.MetaClassImpl.invokeMethod(MetaClassImpl.java:756)
> at
> org.codehaus.groovy.runtime.InvokerHelper.invokePojoMethod(InvokerHelper.java:766)
> at
> org.codehaus.groovy.runtime.InvokerHelper.invokeMethod(InvokerHelper.java:754)
> at
> org.codehaus.groovy.runtime.ScriptBytecodeAdapter.invokeMethodN(ScriptBytecodeAdapter.java:170)
> at
> org.codehaus.groovy.runtime.ScriptBytecodeAdapter.invokeMethod0(ScriptBytecodeAdapter.java:198)
> at
> org.codehaus.mojo.jspc.CompilationMojoSupport.execute(CompilationMojoSupport.groovy:333)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:451)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:558)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:499)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:478)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:330)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:291)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:142)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:336)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:585)
> at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
> at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
> at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
> at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
>
>
> On Tue, Jan 6, 2009 at 12:30 PM, <dw...@apache.org> wrote:
>
>> Author: dwoods
>> Date: Tue Jan 6 09:30:41 2009
>> New Revision: 732011
>>
>> URL: http://svn.apache.org/viewvc?rev=732011&view=rev
>> Log:
>> GERONIMO-4025 applied GERONIMO-4025-configmanager-and-infomanager.patch
>> from Rex Wang.
>>
>> Modified:
>>
>> 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/configmanager/normal.jsp
>>
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
>>
>> 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/resources/consolebase.properties
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=732011&r1=732010&r2=732011&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
>> Tue Jan 6 09:30:41 2009
>> @@ -178,6 +178,7 @@
>> consolebase.common.group = Group
>> consolebase.common.groupName = Group Name
>> consolebase.common.install = Install
>> +consolebase.common.item = Item
>> consolebase.common.monitor = Monitor
>> consolebase.common.name = Name
>> consolebase.common.next = Next
>> @@ -199,9 +200,15 @@
>> consolebase.common.userID = UserID
>> consolebase.common.userName = Username
>> consolebase.common.users = Users
>> +consolebase.common.value = Value
>> consolebase.common.version = Version
>> consolebase.common.view = View
>>
>> +infomanager.javaSysNormal.etc = Etc
>> +infomanager.javaSysNormal.operatingSystem = Operating System
>> +infomanager.javaSysNormal.user = User
>> +infomanager.javaSysNormal.virtualMachine = Virtual Machine
>> +
>> infomanager.javaSysHelp.body = This page displays the
>> values of the system properties available to the server process.
>> infomanager.svrInfoHelp.body = This page provides
>> information about the uptime of the server and the resources being used by
>> the JVM.
>> infomanager.svrInfoNormal.architecture = Architecture
>>
>> 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=732011&r1=732010&r2=732011&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
>> Tue Jan 6 09:30:41 2009
>> @@ -178,6 +178,7 @@
>> consolebase.common.group = \u7EC4
>> consolebase.common.groupName = \u7EC4\u540D
>> consolebase.common.install = \u5B89\u88C5
>> +consolebase.common.item = \u9879
>> consolebase.common.monitor = \u76D1\u63A7
>> consolebase.common.name = \u540D\u5B57
>> consolebase.common.next = \u4E0B\u4E00\u6B65
>> @@ -199,9 +200,14 @@
>> consolebase.common.userID = \u7528\u6237ID
>> consolebase.common.userName = \u7528\u6237\u540D
>> consolebase.common.users = \u7528\u6237
>> +consolebase.common.value = \u503c
>> consolebase.common.version = \u7248\u672C
>> consolebase.common.view = \u67E5\u770B
>>
>> +infomanager.javaSysNormal.etc = \u5176\u5b83
>> +infomanager.javaSysNormal.operatingSystem = \u64cd\u4f5c\u7cfb\u7edf
>> +infomanager.javaSysNormal.user = \u7528\u6237
>> +infomanager.javaSysNormal.virtualMachine = \u865a\u62df\u673a
>> infomanager.javaSysHelp.body =
>> \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u670D\u52A1\u5668\u8FDB\u7A0B\u53EF\u7528\u7684\u7CFB\u7EDF\u5C5E\u6027\u503C\u3002
>> infomanager.svrInfoHelp.body =
>> \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
>> infomanager.svrInfoNormal.architecture = \u67B6\u6784
>>
>> Modified:
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=732011&r1=732010&r2=732011&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
>> (original)
>> +++
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
>> Tue Jan 6 09:30:41 2009
>> @@ -214,7 +214,7 @@
>>
>> </script>
>>
>> -
>> +<br/>
>> <form name="checkExpert">
>> <input type="checkbox" name="expertMode"
>> id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();"
>> /> <label for="<portlet:namespace/>expertMode"><fmt:message
>> key="configmanager.normal.expertMode" /></label>
>> </form>
>> @@ -222,16 +222,19 @@
>> <form name="showDependenciesForm">
>> <input type="checkbox" name="showDependenciesMode"
>> id="<portlet:namespace/>showDependenciesMode"
>> onClick="toggleShowDependenciesMode();" /> <label
>> for="<portlet:namespace/>showDependenciesMode"><fmt:message
>> key="configmanager.normal.showDependencyMode" /></label>
>> </form>
>> +<br/>
>>
>> -<table width="100%">
>> +<table width="100%" class="TableLine" summary="Config Manager">
>> <tr class="DarkBackground">
>> - <th align="left"> <fmt:message
>> key="configmanager.normal.componentName" /></th>
>> - <c:if test="${showWebInfo}"><th>URL</th></c:if>
>> - <th> <fmt:message key="consolebase.common.state"/></th>
>> - <th align="center" colspan="3"> <fmt:message
>> key="consolebase.common.commands"/></th>
>> + <th scope="col" align="left"> <fmt:message
>> key="configmanager.normal.componentName" /></th>
>> + <c:if test="${showWebInfo}">
>> + <th scope="col">URL</th>
>> + </c:if>
>> + <th scope="col"> <fmt:message
>> key="consolebase.common.state"/></th>
>> + <th scope="col" align="center" colspan="3"><fmt:message
>> key="consolebase.common.commands"/></th>
>> <c:if test="${showDependencies}">
>> - <th align="left"><fmt:message
>> key="configmanager.normal.parentComponents" /></th>
>> - <th align="left"><fmt:message
>> key="configmanager.normal.childComponents" /></th>
>> + <th scope="col" align="left"><fmt:message
>> key="configmanager.normal.parentComponents" /></th>
>> + <th scope="col" align="left"><fmt:message
>> key="configmanager.normal.childComponents" /></th>
>> </c:if>
>> </tr>
>> <c:set var="backgroundClass" value='MediumBackground'/>
>>
>> Modified:
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=732011&r1=732010&r2=732011&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
>> (original)
>> +++
>> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
>> Tue Jan 6 09:30:41 2009
>> @@ -20,9 +20,11 @@
>> <fmt:setBundle basename="consolebase"/>
>> <portlet:defineObjects/>
>>
>> -<table width="100%">
>> +<b>Java:</b>
>> +<table width="100%" class="TableLine" summary="java">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center">Java</td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%"
>> nowrap>java.awt.graphicsenv</td>
>> @@ -125,10 +127,14 @@
>> <td class="LightBackground">${javaSysProps['java.version']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="consolebase.common.virtualMachine"/>:</b>
>> +<table width="100%" class="TableLine" summary="Virtual Machine">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="apache.javaSysNormal.vm"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:mes
>> +sage key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%" nowrap>java.vm.info</td>
>> @@ -159,10 +165,13 @@
>> <td class="LightBackground">${javaSysProps['java.vm.version']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="consolebase.common.operatingSystem"/>:</b>
>> +<table width="100%" class="TableLine" summary="Operating System">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="apache.javaSysNormal.os"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%" nowrap>os.arch</td>
>> @@ -177,10 +186,13 @@
>> <td class="LightBackground">${javaSysProps['os.version']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b>Sun:</b>
>> +<table width="100%" class="TableLine" summary="Sun">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center">Sun</td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%"
>> nowrap>sun.arch.data.model</td>
>> @@ -188,7 +200,6 @@
>> </tr>
>> <tr>
>> <td class="MediumBackground">sun.boot.class.path</td>
>> -
>> <td class="MediumBackground">
>>
>> <table>
>> @@ -231,10 +242,13 @@
>> <td
>> class="MediumBackground">${javaSysProps['sun.os.patch.level']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="consolebase.common.user"/>:</b>
>> +<table width="100%" class="TableLine" summary="User">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="apache.javaSysNormal.usr"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%" nowrap>user.country</td>
>> @@ -265,10 +279,13 @@
>> <td class="LightBackground">${javaSysProps['user.variant']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="consolebase.common.etc"/>:</b>
>> +<table width="100%" class="TableLine" summary="Etc">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="apache.javaSysNormal.etc"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <% String background = "LightBackground"; %>
>> <% // Crappy workaround because apparently Jetty's JSTL can't call
>> getters on a Map subclass?!?
>>
>> 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=732011&r1=732010&r2=732011&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
>> Tue Jan 6 09:30:41 2009
>> @@ -24,9 +24,11 @@
>> <script type='text/javascript' src='/console/dwr/engine.js'></script>
>> <script type='text/javascript' src='/console/dwr/util.js'></script>
>>
>> -<table width="100%">
>> +<b><fmt:message key="infomanager.svrInfoNormal.server"/>:</b>
>> +<table width="100%" class="TableLine" summary="Server">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="infomanager.svrInfoNormal.server"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%" nowrap><fmt:message
>> key="infomanager.svrInfoNormal.version"/></td>
>> @@ -45,12 +47,14 @@
>> <td class="LightBackground"><div
>> id="<portlet:namespace/>UpTime"><fmt:message
>> key="infomanager.svrInfoNormal.notAvailable"/></div></td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="infomanager.svrInfoNormal.os"/>:</b>
>> +<table width="100%" class="TableLine" summary="OS">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="infomanager.svrInfoNormal.os"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> -
>> <tr>
>> <td class="LightBackground" width="20%" nowrap><fmt:message
>> key="infomanager.svrInfoNormal.os.arch"/></td>
>> <td class="LightBackground" width="80%">${svrProps['os.arch']}</td>
>> @@ -72,10 +76,13 @@
>> <td class="LightBackground" width="80%">${svrProps['os.locale']}</td>
>> </tr>
>> </table>
>> -<br>
>> -<table width="100%">
>> +<br/>
>> +
>> +<b><fmt:message key="infomanager.svrInfoNormal.jvm"/>:</b>
>> +<table width="100%" class="TableLine" summary="JVM">
>> <tr>
>> - <td class="DarkBackground" width="100%" colspan="2"
>> align="center"><fmt:message key="infomanager.svrInfoNormal.jvm"/></td>
>> + <th scope="col" class="DarkBackground" width="20%"
>> align="center"><fmt:message key="consolebase.common.item"/></th>
>> + <th scope="col" class="DarkBackground" width="80%"
>> align="center"><fmt:message key="consolebase.common.value"/></th>
>> </tr>
>> <tr>
>> <td class="LightBackground" width="20%" nowrap><fmt:message
>> key="infomanager.svrInfoNormal.javaVersion"/></td>
>>
>>
>>
>
>
> --
> ~Jason Warner
>
--
~Jason Warner
Re: svn commit: r732011 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: resources/ webapp/WEB-INF/view/configmanager/ webapp/WEB-INF/view/infomanager/
Posted by Jason Warner <ja...@gmail.com>.
I think this change might be causing build problems. A recent build failed
with the following error:
Trace org.apache.jasper.JasperException:
file:/opt/anthill3/agent/var/jobs/projects/Geronimo_Server_Build/Geronimo_Server_Build_Workflow/project/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp(17,0)
file:/opt/anthill3/agent/var/jobs/projects/Geronimo_Server_Build/Geronimo_Server_Build_Workflow/project/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp(135,70)
No tag "mes" defined in tag library imported with prefix "fmt"
at
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:40)
at
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:407)
at
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:88)
at
org.apache.jasper.compiler.Parser.processIncludeDirective(Parser.java:345)
at
org.apache.jasper.compiler.Parser.parseIncludeDirective(Parser.java:378)
at org.apache.jasper.compiler.Parser.parseDirective(Parser.java:486)
at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1444)
at org.apache.jasper.compiler.Parser.parse(Parser.java:138)
at
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:216)
at
org.apache.jasper.compiler.ParserController.parse(ParserController.java:103)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:154)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:315)
at org.apache.jasper.JspC.processFile(JspC.java:1010)
at org.apache.jasper.JspC.execute(JspC.java:1159)
at
org.codehaus.mojo.jspc.compiler.tomcat6.JspCompilerImpl.compile(JspCompilerImpl.java:111)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at
org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:86)
at groovy.lang.MetaMethod.doMethodInvoke(MetaMethod.java:230)
at groovy.lang.MetaClassImpl.invokeMethod(MetaClassImpl.java:912)
at groovy.lang.MetaClassImpl.invokeMethod(MetaClassImpl.java:756)
at
org.codehaus.groovy.runtime.InvokerHelper.invokePojoMethod(InvokerHelper.java:766)
at
org.codehaus.groovy.runtime.InvokerHelper.invokeMethod(InvokerHelper.java:754)
at
org.codehaus.groovy.runtime.ScriptBytecodeAdapter.invokeMethodN(ScriptBytecodeAdapter.java:170)
at
org.codehaus.groovy.runtime.ScriptBytecodeAdapter.invokeMethod0(ScriptBytecodeAdapter.java:198)
at
org.codehaus.mojo.jspc.CompilationMojoSupport.execute(CompilationMojoSupport.groovy:333)
at
org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:451)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:558)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:499)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:478)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:330)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:291)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:142)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:336)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
On Tue, Jan 6, 2009 at 12:30 PM, <dw...@apache.org> wrote:
> Author: dwoods
> Date: Tue Jan 6 09:30:41 2009
> New Revision: 732011
>
> URL: http://svn.apache.org/viewvc?rev=732011&view=rev
> Log:
> GERONIMO-4025 applied GERONIMO-4025-configmanager-and-infomanager.patch
> from Rex Wang.
>
> Modified:
>
> 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/configmanager/normal.jsp
>
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
>
> 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/resources/consolebase.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=732011&r1=732010&r2=732011&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
> Tue Jan 6 09:30:41 2009
> @@ -178,6 +178,7 @@
> consolebase.common.group = Group
> consolebase.common.groupName = Group Name
> consolebase.common.install = Install
> +consolebase.common.item = Item
> consolebase.common.monitor = Monitor
> consolebase.common.name = Name
> consolebase.common.next = Next
> @@ -199,9 +200,15 @@
> consolebase.common.userID = UserID
> consolebase.common.userName = Username
> consolebase.common.users = Users
> +consolebase.common.value = Value
> consolebase.common.version = Version
> consolebase.common.view = View
>
> +infomanager.javaSysNormal.etc = Etc
> +infomanager.javaSysNormal.operatingSystem = Operating System
> +infomanager.javaSysNormal.user = User
> +infomanager.javaSysNormal.virtualMachine = Virtual Machine
> +
> infomanager.javaSysHelp.body = This page displays the
> values of the system properties available to the server process.
> infomanager.svrInfoHelp.body = This page provides
> information about the uptime of the server and the resources being used by
> the JVM.
> infomanager.svrInfoNormal.architecture = Architecture
>
> 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=732011&r1=732010&r2=732011&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
> Tue Jan 6 09:30:41 2009
> @@ -178,6 +178,7 @@
> consolebase.common.group = \u7EC4
> consolebase.common.groupName = \u7EC4\u540D
> consolebase.common.install = \u5B89\u88C5
> +consolebase.common.item = \u9879
> consolebase.common.monitor = \u76D1\u63A7
> consolebase.common.name = \u540D\u5B57
> consolebase.common.next = \u4E0B\u4E00\u6B65
> @@ -199,9 +200,14 @@
> consolebase.common.userID = \u7528\u6237ID
> consolebase.common.userName = \u7528\u6237\u540D
> consolebase.common.users = \u7528\u6237
> +consolebase.common.value = \u503c
> consolebase.common.version = \u7248\u672C
> consolebase.common.view = \u67E5\u770B
>
> +infomanager.javaSysNormal.etc = \u5176\u5b83
> +infomanager.javaSysNormal.operatingSystem = \u64cd\u4f5c\u7cfb\u7edf
> +infomanager.javaSysNormal.user = \u7528\u6237
> +infomanager.javaSysNormal.virtualMachine = \u865a\u62df\u673a
> infomanager.javaSysHelp.body =
> \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u670D\u52A1\u5668\u8FDB\u7A0B\u53EF\u7528\u7684\u7CFB\u7EDF\u5C5E\u6027\u503C\u3002
> infomanager.svrInfoHelp.body =
> \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
> infomanager.svrInfoNormal.architecture = \u67B6\u6784
>
> Modified:
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=732011&r1=732010&r2=732011&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
> (original)
> +++
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
> Tue Jan 6 09:30:41 2009
> @@ -214,7 +214,7 @@
>
> </script>
>
> -
> +<br/>
> <form name="checkExpert">
> <input type="checkbox" name="expertMode"
> id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();"
> /> <label for="<portlet:namespace/>expertMode"><fmt:message
> key="configmanager.normal.expertMode" /></label>
> </form>
> @@ -222,16 +222,19 @@
> <form name="showDependenciesForm">
> <input type="checkbox" name="showDependenciesMode"
> id="<portlet:namespace/>showDependenciesMode"
> onClick="toggleShowDependenciesMode();" /> <label
> for="<portlet:namespace/>showDependenciesMode"><fmt:message
> key="configmanager.normal.showDependencyMode" /></label>
> </form>
> +<br/>
>
> -<table width="100%">
> +<table width="100%" class="TableLine" summary="Config Manager">
> <tr class="DarkBackground">
> - <th align="left"> <fmt:message
> key="configmanager.normal.componentName" /></th>
> - <c:if test="${showWebInfo}"><th>URL</th></c:if>
> - <th> <fmt:message key="consolebase.common.state"/></th>
> - <th align="center" colspan="3"> <fmt:message
> key="consolebase.common.commands"/></th>
> + <th scope="col" align="left"> <fmt:message
> key="configmanager.normal.componentName" /></th>
> + <c:if test="${showWebInfo}">
> + <th scope="col">URL</th>
> + </c:if>
> + <th scope="col"> <fmt:message
> key="consolebase.common.state"/></th>
> + <th scope="col" align="center" colspan="3"><fmt:message
> key="consolebase.common.commands"/></th>
> <c:if test="${showDependencies}">
> - <th align="left"><fmt:message
> key="configmanager.normal.parentComponents" /></th>
> - <th align="left"><fmt:message
> key="configmanager.normal.childComponents" /></th>
> + <th scope="col" align="left"><fmt:message
> key="configmanager.normal.parentComponents" /></th>
> + <th scope="col" align="left"><fmt:message
> key="configmanager.normal.childComponents" /></th>
> </c:if>
> </tr>
> <c:set var="backgroundClass" value='MediumBackground'/>
>
> Modified:
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=732011&r1=732010&r2=732011&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
> (original)
> +++
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
> Tue Jan 6 09:30:41 2009
> @@ -20,9 +20,11 @@
> <fmt:setBundle basename="consolebase"/>
> <portlet:defineObjects/>
>
> -<table width="100%">
> +<b>Java:</b>
> +<table width="100%" class="TableLine" summary="java">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center">Java</td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%"
> nowrap>java.awt.graphicsenv</td>
> @@ -125,10 +127,14 @@
> <td class="LightBackground">${javaSysProps['java.version']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="consolebase.common.virtualMachine"/>:</b>
> +<table width="100%" class="TableLine" summary="Virtual Machine">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="apache.javaSysNormal.vm"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:mes
> +sage key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap>java.vm.info</td>
> @@ -159,10 +165,13 @@
> <td class="LightBackground">${javaSysProps['java.vm.version']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="consolebase.common.operatingSystem"/>:</b>
> +<table width="100%" class="TableLine" summary="Operating System">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="apache.javaSysNormal.os"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap>os.arch</td>
> @@ -177,10 +186,13 @@
> <td class="LightBackground">${javaSysProps['os.version']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b>Sun:</b>
> +<table width="100%" class="TableLine" summary="Sun">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center">Sun</td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap>sun.arch.data.model</td>
> @@ -188,7 +200,6 @@
> </tr>
> <tr>
> <td class="MediumBackground">sun.boot.class.path</td>
> -
> <td class="MediumBackground">
>
> <table>
> @@ -231,10 +242,13 @@
> <td class="MediumBackground">${javaSysProps['sun.os.patch.level']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="consolebase.common.user"/>:</b>
> +<table width="100%" class="TableLine" summary="User">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="apache.javaSysNormal.usr"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap>user.country</td>
> @@ -265,10 +279,13 @@
> <td class="LightBackground">${javaSysProps['user.variant']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="consolebase.common.etc"/>:</b>
> +<table width="100%" class="TableLine" summary="Etc">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="apache.javaSysNormal.etc"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <% String background = "LightBackground"; %>
> <% // Crappy workaround because apparently Jetty's JSTL can't call
> getters on a Map subclass?!?
>
> 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=732011&r1=732010&r2=732011&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
> Tue Jan 6 09:30:41 2009
> @@ -24,9 +24,11 @@
> <script type='text/javascript' src='/console/dwr/engine.js'></script>
> <script type='text/javascript' src='/console/dwr/util.js'></script>
>
> -<table width="100%">
> +<b><fmt:message key="infomanager.svrInfoNormal.server"/>:</b>
> +<table width="100%" class="TableLine" summary="Server">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="infomanager.svrInfoNormal.server"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap><fmt:message
> key="infomanager.svrInfoNormal.version"/></td>
> @@ -45,12 +47,14 @@
> <td class="LightBackground"><div
> id="<portlet:namespace/>UpTime"><fmt:message
> key="infomanager.svrInfoNormal.notAvailable"/></div></td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="infomanager.svrInfoNormal.os"/>:</b>
> +<table width="100%" class="TableLine" summary="OS">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="infomanager.svrInfoNormal.os"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> -
> <tr>
> <td class="LightBackground" width="20%" nowrap><fmt:message
> key="infomanager.svrInfoNormal.os.arch"/></td>
> <td class="LightBackground" width="80%">${svrProps['os.arch']}</td>
> @@ -72,10 +76,13 @@
> <td class="LightBackground" width="80%">${svrProps['os.locale']}</td>
> </tr>
> </table>
> -<br>
> -<table width="100%">
> +<br/>
> +
> +<b><fmt:message key="infomanager.svrInfoNormal.jvm"/>:</b>
> +<table width="100%" class="TableLine" summary="JVM">
> <tr>
> - <td class="DarkBackground" width="100%" colspan="2"
> align="center"><fmt:message key="infomanager.svrInfoNormal.jvm"/></td>
> + <th scope="col" class="DarkBackground" width="20%"
> align="center"><fmt:message key="consolebase.common.item"/></th>
> + <th scope="col" class="DarkBackground" width="80%"
> align="center"><fmt:message key="consolebase.common.value"/></th>
> </tr>
> <tr>
> <td class="LightBackground" width="20%" nowrap><fmt:message
> key="infomanager.svrInfoNormal.javaVersion"/></td>
>
>
>
--
~Jason Warner