geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r399088 - in /geronimo/branches/1.1: applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ applications/console-standard/src/webapp/WEB-INF/view/infomanager/ modules/system/src/java/org/apache/geronimo/system/main/
Date Tue, 02 May 2006 23:45:09 GMT
Author: ammulder
Date: Tue May  2 16:45:07 2006
New Revision: 399088

URL: http://svn.apache.org/viewcvs?rev=399088&view=rev
Log:
Show the Geronimo version during startup and on the console
  (GERONIMO-1529), thanks Erin for the patch!

Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java?rev=399088&r1=399087&r2=399088&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java
Tue May  2 16:45:07 2006
@@ -34,6 +34,7 @@
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.util.PortletManager;
 import org.apache.geronimo.management.geronimo.JVM;
+import org.apache.geronimo.system.serverinfo.ServerConstants;
 
 /**
  * Calculates various information about the server to display in the server
@@ -55,11 +56,11 @@
     private PortletRequestDispatcher helpView;
 
     public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
+                              ActionResponse actionResponse) throws PortletException, IOException
{
     }
 
     protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
+                          RenderResponse renderResponse) throws IOException, PortletException
{
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
             return;
         }
@@ -71,6 +72,7 @@
 
         Date bootDate = jvm.getKernelBootTime();
         svrProps.put("Kernel Boot Time", bootDate);
+        svrProps.put("Geronimo Version", ServerConstants.getVersion());
         renderRequest.setAttribute("svrProps", svrProps);
 
         jvmProps.put("Java Version", jvm.getJavaVersion());
@@ -87,7 +89,7 @@
     }
 
     protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
+                          RenderResponse renderResponse) throws PortletException, IOException
{
         helpView.include(renderRequest, renderResponse);
     }
 

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=399088&r1=399087&r2=399088&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Tue May  2 16:45:07 2006
@@ -12,14 +12,18 @@
 
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Kernel</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center">Geronimo</td>
   </tr>
   <tr>
-    <td class="LightBackground" width="20%" nowrap>Kernel Boot Time</td>
+    <td class="LightBackground" width="20%" nowrap>Geronimo Version</td>
+    <td class="LightBackground" width="80%">${svrProps['Geronimo Version']}</td>
+  </tr>
+  <tr>
+    <td class="LightBackground" width="20%" nowrap>Geronimo Start Time</td>
     <td class="LightBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Kernel Up Time</td>
+    <td class="MediumBackground">Geronimo Up Time</td>
     <td class="MediumBackground"><div id="<portlet:namespace/>UpTime">Not
Yet Available</div></td>
   </tr>
 </table>

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java?rev=399088&r1=399087&r2=399088&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
Tue May  2 16:45:07 2006
@@ -6,6 +6,7 @@
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.system.serverinfo.ServerConstants;
 
 /**
  * A startup monitor that shows the progress of loading and starting
@@ -44,7 +45,7 @@
     }
 
     public synchronized void systemStarted(Kernel kernel) {
-        out.println("Starting Geronimo Application Server");
+        out.println("Starting Geronimo Application Server v" + ServerConstants.getVersion());
         this.kernel = kernel;
         currentOperation = "Loading";
     }



Mime
View raw message