geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r732398 [2/3] - in /geronimo/server/trunk/plugins/console: console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ console-base-portlets/src/main/jav...
Date Wed, 07 Jan 2009 17:03:43 GMT
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java Wed Jan  7 09:03:41 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.console.keystores;
 
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 import javax.portlet.ActionRequest;
@@ -31,12 +32,12 @@
  * @version $Rev$ $Date$
  */
 public class ViewKeystoreHandler extends BaseKeystoreHandler {
-    public ViewKeystoreHandler() {
-        super(VIEW_KEYSTORE, "/WEB-INF/view/keystore/viewKeystore.jsp");
+    public ViewKeystoreHandler(BasePortlet portlet) {
+        super(VIEW_KEYSTORE, "/WEB-INF/view/keystore/viewKeystore.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "id"};
+        String[] params = {"id"};
         for(int i = 0; i < params.length; ++i) {
             String value = request.getParameter(params[i]);
             if(value != null) response.setRenderParameter(params[i], value);
@@ -45,7 +46,7 @@
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG, "id"};
+        String[] params = {"id"};
         for(int i = 0; i < params.length; ++i) {
             String value = request.getParameter(params[i]);
             if(value != null) request.setAttribute(params[i], value);

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java Wed Jan  7 09:03:41 2009
@@ -123,8 +123,7 @@
                 try {
                     SERealmGroupHelper.addGroup(group, users);
                 } catch (Exception e) {
-                    actionResponse.setRenderParameter("message",
-                            "ERROR: Error in SEGroupsPortlet while adding group "+group+". Cause:"+e.getMessage());
+                    addErrorMessage(actionRequest, getLocalizedString("errorMsg07", actionRequest), e.getMessage());
                 }
             } else if ("new".equals(action)) {
                 currAction = "new";
@@ -136,9 +135,7 @@
                 actionResponse.setRenderParameter("group", group);
             }
         } catch (Exception e) {
-            actionResponse.setRenderParameter("message",
-                    "Error encountered in SEGroupsPortlet. Cause: "
-                            + e.getMessage());
+            addErrorMessage(actionRequest, getLocalizedString("errorMsg06", actionRequest), e.getMessage());
         }
     }
 }
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java Wed Jan  7 09:03:41 2009
@@ -114,7 +114,7 @@
         helpView = pc
                 .getRequestDispatcher("/WEB-INF/view/securityrealmmanager/se/users/help.jsp");
         errorView = pc
-                .getRequestDispatcher("/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp");
+                .getRequestDispatcher("/WEB-INF/view/securityrealmmanager/se/users/error.jsp");
     }
 
     public void processAction(ActionRequest actionRequest,
@@ -144,8 +144,7 @@
                     }
                     SERealmUserHelper.deleteUser(user);
                 } catch (Exception e) {
-                    actionResponse.setRenderParameter("message",
-                            "ERROR: Error in SEUsersPortlet while deleting user "+user+". Cause: "+e.getMessage());
+                    addErrorMessage(actionRequest, getLocalizedString("errorMsg04", actionRequest), e.getMessage());
                 }
             } else if ("update".equals(action)) {
                 if(password != null && !password.equals("")) {
@@ -162,8 +161,7 @@
                         SERealmGroupHelper.updateGroup(group, groupUsers);
                     }
                 } catch (Exception e) {
-                    actionResponse.setRenderParameter("message",
-                            "ERROR: Error in SEUsersPortlet while adding user "+user+" to group "+group+". Cause: "+e.getMessage());
+                    addErrorMessage(actionRequest, getLocalizedString("errorMsg05", actionRequest), e.getMessage());
                 }
             } else if ("new".equals(action)) {
                 currAction = "new";
@@ -175,9 +173,7 @@
                 actionResponse.setRenderParameter("user", user);
             }
         } catch (Exception e) {
-            actionResponse.setRenderParameter("message",
-                    "Error encountered in SEUsersPortlet. Cause: "
-                            + e.getMessage());
+            addErrorMessage(actionRequest, getLocalizedString("errorMsg06", actionRequest), e.getMessage());
         }
     }
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java Wed Jan  7 09:03:41 2009
@@ -74,6 +74,7 @@
             kernel.shutdown();
             System.exit(0);
         } else {
+            addWarningMessage(request, getLocalizedString("warnMsg07", request));
             normalView.include(request, response);
         }
     }

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Wed Jan  7 09:03:41 2009
@@ -122,7 +122,7 @@
                                 populateStats = true;      // this is a Lazy provider and stats are enabled so populate the stats
                             } else {
                                 renderRequest.setAttribute("statsOn", Boolean.FALSE);  // indicate that stats are currently disabled
-                                renderRequest.setAttribute("statsMessage", "Statistics are not currently being collected.");
+                                addWarningMessage(renderRequest, getLocalizedString("warnMsg04", renderRequest));
                             }
                         } else {
                             renderRequest.setAttribute("statsLazy", Boolean.FALSE);  // indicate that enable/disable should not be shown for this container
@@ -156,7 +156,7 @@
                         }
                     } else {
                         renderRequest.setAttribute("statsSupported", Boolean.FALSE);   // indicate that statistics are not supported for this container
-                        renderRequest.setAttribute("statsMessage", "Web statistics are not supported for the current web container.");
+                        addWarningMessage(renderRequest, getLocalizedString("warnMsg03", renderRequest));
                     }
                 } else {
                     log.error("Error attempting to retrieve the web containers");

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties Wed Jan  7 09:03:41 2009
@@ -106,3 +106,99 @@
 Web\ Server\ Manager = Web Server Manager
 
 Welcome = Welcome
+
+errorMsg01 = Configuration not found
+
+errorMsg02 = Lifecycle operation failed
+
+errorMsg03 = Encountered an unhandled exception
+
+errorMsg04 = Error encountered while deleting user.
+
+errorMsg05 = Error encountered while adding user.
+
+errorMsg06 = Error encountered.
+
+errorMsg07 = Error encountered while adding group.
+
+errorMsg08 = Unable to unlock keystore <b>{0} </b> for editing.
+
+errorMsg09 = Unable to unlock keystore <b>{0}</b> for availability.
+
+errorMsg10 = Unable to unlock key <b>{0}</b>.
+
+errorMsg11 = Unable to change password for keystore <b>{0}</b>.
+
+errorMsg12 = Unable to change password for private key <b>{0}</b>.
+
+errorMsg13 = Error encountered while publishing CA's certificate to Certificate Store. 
+
+errorMsg14 = Errors encountered while unlocking CA.
+
+errorMsg15 = Errors encountered while trying to view CA Details.
+
+errorMsg16 = Errors encountered while trying to view certificate with serial number <b>{0}</b>.
+
+errorMsg17 = Errors encountered while processing a Certificate Request. id=<b>{0}</b>.
+
+errorMsg18 = Errors while verifying Certificate Request. id=<b>{0}</b>.
+
+errorMsg19 = Error in user input during CA Setup.
+
+errorMsg20 = Errors encountered while processing a CSR.
+
+errorMsg21 = Unable to get next serial number from CA.
+
+errorMsg22 = Errors in user input while processing a CSR.
+
+errorMsg23 = Errors encountered while issuing certificate.
+
+infoMsg01 = Started application
+
+infoMsg02 = Stopped application
+
+infoMsg03 = Restarted application
+
+infoMsg04 = Uninstalled application
+
+infoMsg05 = Keystore <b>{0}</b> successfully unlocked for editing.
+
+infoMsg06 = Keystore <b>{0}</b> is now edit locked.
+
+infoMsg07 = Successfully unlocked keystore <b>{0}</b> for availability.
+
+infoMsg08 = Availability of keystore <b>{0}</b> is locked.
+
+infoMsg09 = Successfully unlocked key <b>{0}</b> in keystore <b>{1}</b>.
+
+infoMsg10 = Password changed for keystore <b>{0}</b>.
+
+infoMsg11 = Password changed for private key <b>{0}</b>.
+
+infoMsg12 = CA has been locked!
+
+infoMsg13 = CA's certificate published to Certificate Store
+
+infoMsg14 = CA has been unlocked successfully!
+
+infoMsg15 = CA Setup is successful !
+
+infoMsg16 = Approved CSR. id = <b>{0}</b>.
+
+infoMsg17 = Rejected and deleted CSR. id = <b>{0}</b>.
+
+infoMsg18 = Certificate Issued successfully. This Certificate details can also be viewed using the serial number <b>{0}</b> with the 'View Issued Certificate' link provided in the CA home screen.
+
+warnMsg01 = Invalid value for changeState: 
+
+warnMsg02 = No modules found of this type
+
+warnMsg03 = Web statistics are not supported for the current web container.
+
+warnMsg04 = Statistics are not currently being collected.
+
+warnMsg05 = CA is not running or CA may not have been initialized.  Unable to lock CA.
+
+warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
+
+warnMsg07 = <div style='font-size:large;'><b>A shutdown of the server will disable this Web Console!</b></div>\r\n<p>Proceed only if you are certain you want to terminate the server.</p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties Wed Jan  7 09:03:41 2009
@@ -106,3 +106,99 @@
 Web\ Server\ Manager = Web\u670D\u52A1\u5668\u7BA1\u7406
 
 Welcome = \u6B22\u8FCE
+
+errorMsg01 = \u914D\u7F6E\u672A\u627E\u5230
+
+errorMsg02 = \u751F\u547D\u5468\u671F\u64CD\u4F5C\u5931\u8D25
+
+errorMsg03 = \u9047\u5230\u672A\u5904\u7406\u7684\u5F02\u5E38
+
+errorMsg04 = \u5220\u9664\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg05 = \u6DFB\u52A0\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg06 = \u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg07 = \u6DFB\u52A0\u7528\u6237\u7EC4\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg08 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
+
+errorMsg09 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
+
+errorMsg10 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5<b>{0}</b>\u3002
+
+errorMsg11 = \u65E0\u6CD5\u4FEE\u6539\u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u3002
+
+errorMsg12 = \u65E0\u6CD5\u4FEE\u6539\u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u3002
+
+errorMsg13 = \u53D1\u5E03CA\u7684\u8BC1\u4E66\u81F3\u8BC1\u4E66\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg14 = \u89E3\u9501CA\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg15 = \u5C1D\u8BD5\u67E5\u770BCA\u8BE6\u60C5\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg16 = \u5C1D\u8BD5\u67E5\u770B\u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg17 = \u5904\u7406id\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg18 = \u6838\u5B9Eid\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg19 = \u8BBE\u7F6ECA\u65F6\u7528\u6237\u8F93\u5165\u6709\u9519\u8BEF\u3002
+
+errorMsg20 = \u5904\u7406CSR\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg21 = \u65E0\u6CD5\u4ECECA\u5F97\u5230\u4E0B\u4E00\u4E2A\u5E8F\u5217\u53F7\u3002
+
+errorMsg22 = \u5904\u7406CSR\u65F6\u7528\u6237\u8F93\u5165\u9519\u8BEF\u3002
+
+errorMsg23 = \u9881\u53D1\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+infoMsg01 = \u5DF2\u542F\u52A8\u5E94\u7528
+
+infoMsg02 = \u5DF2\u505C\u6B62\u5E94\u7528
+
+infoMsg03 = \u5DF2\u91CD\u542F\u5E94\u7528
+
+infoMsg04 = \u5DF2\u5378\u8F7D\u5E94\u7528
+
+infoMsg05 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
+
+infoMsg06 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u7F16\u8F91\u3002
+
+infoMsg07 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
+
+infoMsg08 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C\u3002
+
+infoMsg09 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{1}</b>\u4E2D\u7684\u5BC6\u94A5<b>{0}</b>\u3002
+
+infoMsg10 = \u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
+
+infoMsg11 = \u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
+
+infoMsg12 = CA\u88AB\u9501\u5B9A\uFF01
+
+infoMsg13 = CA\u7684\u8BC1\u4E66\u5DF2\u53D1\u5E03\u81F3\u8BC1\u4E66\u5E93\u3002
+
+infoMsg14 = \u6210\u529F\u89E3\u9501CA\uFF01
+
+infoMsg15 = CA\u8BBE\u7F6E\u6210\u529F\uFF01
+
+infoMsg16 = \u6279\u51C6\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
+
+infoMsg17 = \u62D2\u7EDD\u5E76\u5220\u9664\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
+
+infoMsg18 = \u6210\u529F\u53D1\u5E03\u8BC1\u4E66\u3002\u5728CA\u7684\u4E3B\u9875\u9762\u70B9\u51FB'\u67E5\u770B\u5DF2\u53D1\u5E03\u8BC1\u4E66'\u94FE\u63A5\u5E76\u4F7F\u7528\u5E8F\u5217\u53F7<b>{0}</b>\uFF0C\u4E5F\u53EF\u4EE5\u67E5\u770B\u8BC1\u4E66\u8BE6\u60C5\u3002
+
+warnMsg01 = \u65E0\u6548\u7684\u6539\u53D8\u72B6\u6001\u503C\uFF1A
+
+warnMsg02 = \u672A\u627E\u5230\u8BE5\u7C7B\u578B\u7684\u6A21\u5757
+
+warnMsg03 = \u8BE5Web\u5BB9\u5668\u4E0D\u652F\u6301Web\u7EDF\u8BA1\u6570\u636E
+
+warnMsg04 = \u5F53\u524D\u5C1A\u672A\u6536\u96C6\u7EDF\u8BA1\u6570\u636E\u3002
+
+warnMsg05 = CA\u672A\u5904\u4E8E\u8FD0\u884C\u72B6\u6001\u6216\u8005CA\u5C1A\u672A\u521D\u59CB\u5316\u3002\u65E0\u6CD5\u9501\u5B9ACA\u3002
+
+warnMsg06 = \u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u5148\u524D\u5DF2\u88AB\u53D1\u5E03\uFF0C\u5F53\u4F60\u70B9\u51FB\u4E86'\u53D1\u5E03\u8BC1\u4E66'\u6309\u94AE\u4E24\u6B21\u65F6\u4F60\u53EF\u80FD\u4F1A\u770B\u5230\u8FD9\u6761\u6D88\u606F\u3002
+
+warnMsg07 = <div style='font-size:large;'><b>\u5173\u95ED\u670D\u52A1\u5668\u5C06\u4F1A\u4F7FWeb\u63A7\u5236\u53F0\u4E0D\u53EF\u7528\uFF01</b></div>\r\n<p>\u53EA\u6709\u5F53\u4F60\u786E\u5B9A\u8981\u5173\u95ED\u670D\u52A1\u5668\u65F6\uFF0C\u624D\u7EE7\u7EED\u3002</p>

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld Wed Jan  7 09:03:41 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<taglib>
+  
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>pluto</shortname>
+  <uri>http://portals.apache.org/pluto</uri>
+
+    <tag>
+        <name>commonMsg</name>
+        <tagclass>org.apache.geronimo.console.message.CommonMessageTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+
+</taglib>
+

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 09:03:41 2009
@@ -34,6 +34,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Welcome</title>
             <short-title>Welcome</short-title>
@@ -53,6 +55,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Info</title>
             <short-title>ServerInfo</short-title>
@@ -72,6 +76,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>System Property values for the Server JVM</title>
             <short-title>System</short-title>
@@ -91,6 +97,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Log Manager</title>
             <short-title>Log Manager</short-title>
@@ -110,6 +118,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Log Viewer</title>
             <short-title>Server Log Viewer</short-title>
@@ -129,6 +139,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Web Access Log Viewer</title>
             <short-title>Web Access Log Viewer</short-title>
@@ -148,6 +160,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Manager</title>
             <short-title>Server Manager</short-title>
@@ -167,6 +181,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Web Server Manager</title>
             <short-title>Web Servers</short-title>
@@ -186,6 +202,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Network Listeners</title>
             <short-title>Listeners</short-title>
@@ -205,6 +223,8 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Thread Pool Configuration</title>
             <short-title>Thread Pools</short-title>
@@ -224,6 +244,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Repository Viewer</title>
             <short-title>Repository Viewer</short-title>
@@ -242,6 +264,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Apache mod_jk Configuration</title>
             <short-title>Apache mod_jk</short-title>
@@ -260,6 +284,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Keystore Configuration</title>
             <short-title>Keystores</short-title>
@@ -278,6 +304,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Certification Authority</title>
             <short-title>CA</short-title>
@@ -297,6 +325,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Applications</title>
             <short-title>Applications</short-title>
@@ -316,6 +346,8 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Web Applications</title>
             <short-title>WAR Modules</short-title>
@@ -339,6 +371,8 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed System Modules</title>
             <short-title>System Modules</short-title>
@@ -362,6 +396,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Console Realm Users</title>
             <short-title>Users</short-title>
@@ -381,6 +417,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Console Realm Groups</title>
             <short-title>Groups</short-title>
@@ -400,6 +438,8 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Security Realms</title>
             <short-title>Security Realms</short-title>
@@ -419,6 +459,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Application EARs</title>
             <short-title>EARModules</short-title>
@@ -441,6 +483,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed EJB JARs</title>
             <short-title>EJBModules</short-title>
@@ -463,6 +507,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed J2EE Connectors</title>
             <short-title>RARModules</short-title>
@@ -485,6 +531,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Application Clients</title>
             <short-title>ClientModules</short-title>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp Wed Jan  7 09:03:41 2009
@@ -14,12 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<c:if test="${!empty(infoMsg)}">
-<p><font color="blue"><b>${infoMsg}</b></font></p>
-</c:if>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
 
-<c:if test="${!empty(errorMsg)}">
-<p><font color="red"><b>Error: ${errorMsg}</b></font></p>
-</c:if>
+<CommonMsg:commonMsg/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Wed Jan  7 09:03:41 2009
@@ -19,11 +19,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<jsp:include page="_header.jsp" />
+
 <p><b><fmt:message key="ca.caDetails.title"/></b></p>
 <p>
 <fmt:message key="ca.caDetails.summary"/>
 </p>
-<jsp:include page="_header.jsp" />
 
 <c:if test="${empty(caLocked) || !caLocked}">
   <table border="0">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Wed Jan  7 09:03:41 2009
@@ -39,11 +39,13 @@
     return true;
 }
 </script>
+
+<jsp:include page="_header.jsp" /><br>
+
 <fmt:message key="ca.certReqDetails.title"/>
 <p>
 <fmt:message key="ca.certReqDetails.summary"/>
 </p>
-<jsp:include page="_header.jsp" />
 
 <form name="<portlet:namespace/>certReqDetailsForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="certReqDetails-after"/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp Wed Jan  7 09:03:41 2009
@@ -19,13 +19,14 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<jsp:include page="_header.jsp" /><br>
+
 <fmt:message key="ca.confirmCA.title"/>
 <p>
 <fmt:message key="ca.confirmCA.summary"/>
 </p>
 
-<jsp:include page="_header.jsp" />
-
 <form name="<portlet:namespace/>confirmCAForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="confirmCA-after" />
     <table border="0">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp Wed Jan  7 09:03:41 2009
@@ -19,12 +19,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<jsp:include page="_header.jsp" /><br>
+
 <b><fmt:message key="ca.confirmCertReq.confirmCertRequest"/></b>
 
 <p><fmt:message key="ca.confirmCertReq.summary"/></p>
 
-<jsp:include page="_header.jsp" />
-
 <form name="<portlet:namespace/>confirmCertReqForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="confirmCertReq-after"/>
     <input type="hidden" name="requestId" value="${requestId}"/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp Wed Jan  7 09:03:41 2009
@@ -19,14 +19,14 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<jsp:include page="_header.jsp" /><br>
+
 <fmt:message key="ca.confirmClientCert.title"/>
 <p>
 <fmt:message key="ca.confirmClientCert.summary"/>
 </p>
 
-
-<jsp:include page="_header.jsp" />
-
 <form name="<portlet:namespace/>confirmClientCertForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="confirmClientCert-after"/>
     <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp Wed Jan  7 09:03:41 2009
@@ -20,13 +20,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<jsp:include page="_header.jsp" />
+
 <p>
 <fmt:message key="ca.index.title"/>
 </p>
 
-
-<jsp:include page="_header.jsp" />
-
 <c:choose>
   <c:when test="${caNotSetup}">
     <!-- CA needs initialization -->

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Wed Jan  7 09:03:41 2009
@@ -20,14 +20,14 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
+<jsp:include page="_header.jsp" /><br>
+
 <b><fmt:message key="ca.listRequestsIssue.CertRequestsAwaiting"/>
 </b>
 
 <p><fmt:message key="ca.listRequestsIssue.CertRequestsAwaitingExp"/>
 </p>
 
-<jsp:include page="_header.jsp" />
-
 <table border="0">
     <tr>
         <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp Wed Jan  7 09:03:41 2009
@@ -20,13 +20,13 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
+<jsp:include page="_header.jsp" /><br>
+
 <b><fmt:message key="ca.listRequestsVerify.certRequestsAwaitingVerify"/></b>
 
 <p> <fmt:message key="ca.listRequestsVerify.certRequestsAwaitingVerifyExp"/>
 </p>
 
-<jsp:include page="_header.jsp" />
-
 <table border="0">
     <tr>
         <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp Wed Jan  7 09:03:41 2009
@@ -30,15 +30,15 @@
     return true;
 }
 </script>
+
+<jsp:include page="_header.jsp" /><br>
+
 <fmt:message key="ca.processCSR.title"/>
 
 <p>
 <fmt:message key="ca.processCSR.summary"/>
 </p>
 
-
-<jsp:include page="_header.jsp" />
-
 <form name="<portlet:namespace/>ProcessCSRForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="processCSR-after" />
     <table border="0">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp Wed Jan  7 09:03:41 2009
@@ -53,16 +53,15 @@
     return true;
 }
 </script>
+
+<jsp:include page="_header.jsp"/><br>
+
 <fmt:message key="ca.setupCA.title"/>
 
 <p>
 <fmt:message key="ca.setupCA.summary"/>
 </p>
 
-
-
-<jsp:include page="_header.jsp"/>
-
 <form name="<portlet:namespace/>CADetailsForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="setupCA-after"/>
     <table border="0">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp Wed Jan  7 09:03:41 2009
@@ -30,13 +30,12 @@
     return true;
 }
 </script>
-<b><fmt:message key="ca.common.unlockCertAuthority"/></b>
 
-<p><fmt:message key="ca.unlockCA.summary"/>
-</p>
+<jsp:include page="_header.jsp" /><br>
 
+<b><fmt:message key="ca.common.unlockCertAuthority"/></b>
 
-<jsp:include page="_header.jsp" />
+<p><fmt:message key="ca.unlockCA.summary"/></p>
 
 <form name="<portlet:namespace/>UnlockCAForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="unlockCA-after" />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Wed Jan  7 09:03:41 2009
@@ -33,9 +33,9 @@
 }
 </script>
 
-<b><fmt:message key="ca.common.title"/></b>
+<jsp:include page="_header.jsp" /><br>
 
-<jsp:include page="_header.jsp" />
+<b><fmt:message key="ca.common.title"/></b>
 
 <c:choose>
   <c:when test="${empty(sNo)}">

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=732398&r1=732397&r2=732398&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 Wed Jan  7 09:03:41 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
@@ -156,7 +157,6 @@
     }
 }
 
-
 // work around since IE doesn't support document.getElementsByName
 function getSpanElementsByName(name) {
     var results = new Array();
@@ -214,6 +214,8 @@
 
 </script>
 
+<CommonMsg:commonMsg/><br>
+
 <br/>
 <form name="checkExpert">
 <input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" />&nbsp;<label for="<portlet:namespace/>expertMode"><fmt:message key="configmanager.normal.expertMode" /></label>  
@@ -247,7 +249,7 @@
               <c:set var="backgroundClass" value='MediumBackground'/>
           </c:otherwise>
       </c:choose>
-    <tr>
+      <tr>
         <!-- module id -->
         <c:choose>
             <c:when test="${moduleDetails.componentName != null}">
@@ -330,13 +332,11 @@
                </c:forEach>
            </td>
         </c:if>
-    </tr>
+      </tr>
   </c:forEach>
 </table>
 
 <br />
-<p>${messageInstalled} ${messageStatus}</p>
-
 
 <script>
 // Call to set initial expert mode actions correctly 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp Wed Jan  7 09:03:41 2009
@@ -17,12 +17,6 @@
 
 <%-- $Rev$ $Date$ --%>
 
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<c:if test="${!empty(infoMsg)}">
-<p><font color="blue"><b>${infoMsg}</b></font></p>
-</c:if>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
 
-<c:if test="${!empty(errorMsg)}">
-<p><font color="red"><b>Error: ${errorMsg}</b></font></p>
-</c:if>
+<CommonMsg:commonMsg/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp Wed Jan  7 09:03:41 2009
@@ -23,7 +23,7 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<jsp:include page="_header.jsp" />
+<jsp:include page="_header.jsp" /><br>
 
 <table>
 <th class="DarkBackground"><fmt:message key="keystore.common.keystore"/></th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Wed Jan  7 09:03:41 2009
@@ -24,8 +24,6 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<jsp:include page="_header.jsp" />
-
 <script language="JavaScript">
 var <portlet:namespace/>formName = "<portlet:namespace/>ChangePasswordForm";
 var <portlet:namespace/>requiredFields = new Array("password", "newPassword");
@@ -40,6 +38,8 @@
 }
 </script>
 
+<jsp:include page="_header.jsp" /><br>
+
 <c:choose>
     <c:when test="${!empty(alias)}">
         <b><fmt:message key="keystore.changePassword.changePwdForPriKey"/>&nbsp;${alias}</b><br/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp Wed Jan  7 09:03:41 2009
@@ -23,10 +23,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p><fmt:message key="keystore.index.title"/></p>
 
 <jsp:include page="_header.jsp" />
 
+<p><fmt:message key="keystore.index.title"/></p>
+
 <c:choose>
   <c:when test="${empty(keystores)}"><p><i><fmt:message key="keystore.index.noKeystores"/></i></p></c:when>
   <c:otherwise>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp Wed Jan  7 09:03:41 2009
@@ -24,10 +24,10 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<p><fmt:message key="keystore.unlockKey.title"/></p>
-
 <jsp:include page="_header.jsp" />
 
+<p><fmt:message key="keystore.unlockKey.title"/></p>
+
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="password" value="${password}" />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp Wed Jan  7 09:03:41 2009
@@ -24,7 +24,7 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<jsp:include page="_header.jsp" />
+<jsp:include page="_header.jsp" /><br>
 
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="keystore" value="${keystore}" />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp Wed Jan  7 09:03:41 2009
@@ -23,10 +23,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p><fmt:message key="keystore.viewKeystore.title"/></p>
 
 <jsp:include page="_header.jsp" />
 
+<p><fmt:message key="keystore.viewKeystore.title"/></p>
+
 <table width="100%">
   <tr>
     <td class="DarkBackground">&nbsp;</td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp Wed Jan  7 09:03:41 2009
@@ -17,12 +17,14 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
+<CommonMsg:commonMsg/>
+
 <p><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.groups.maximized.createNewGroup" /></a></p>
 <table width="50%" class="TableLine" summary="Console Realm Groups">
-    ${message}
     <tr class="DarkBackground">
         <th scope="col"><fmt:message key="consolebase.common.groupName"/></th>
         <th scope="col"><fmt:message key="consolebase.common.actions"/></th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp Wed Jan  7 09:03:41 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
@@ -45,9 +46,12 @@
     return value.length < 1;
 }
 </script>
+
+<CommonMsg:commonMsg/>
+
 <p><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.users.maximized.createNewUser"/></a></p>
+
 <table width="50%" class="TableLine" summary="Console Realm Users">
-    ${message}
     <tr class="DarkBackground">
         <th scope="col"><fmt:message key="consolebase.common.userName"/></th>
         <th scope="col"><fmt:message key="consolebase.common.actions"/></th>
@@ -71,5 +75,4 @@
             </td>
         </tr>
     </c:forEach>
-    
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp Wed Jan  7 09:03:41 2009
@@ -17,12 +17,17 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<br />
-<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b><fmt:message key="servermanager.normal.warning"/></b></center></font></p>
-<p><center><fmt:message key="servermanager.normal.proceedOnlyIf"/></center></p>
-<br />
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">    
+  <tr>
+    <td width="15%" >&nbsp;</td>
+    <td><CommonMsg:commonMsg/></td>
+    <td width="15%" >&nbsp;</td>
+  </tr>
+</table>
 <%--   Removed until a better mechanism for rebooting the server is created
 <table width="100%">
 <form action="<portlet:actionURL/>">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Wed Jan  7 09:03:41 2009
@@ -17,8 +17,12 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+
+<CommonMsg:commonMsg/>
+
 <c:if test="${statsOn}">
 <table width="100%" class="TableLine" summary="Statistic">
   <tr>
@@ -98,7 +102,6 @@
 </table>
 </c:if>
 <c:if test="${!statsOn}">
-  ${statsMessage}
   <c:if test="${statsLazy}">
     <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>"><fmt:message key="consolebase.common.enable"/></a>
   </c:if>

Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Wed Jan  7 09:03:41 2009
@@ -76,6 +76,12 @@
             <artifactId>dwr</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>6.0.18</version>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java Wed Jan  7 09:03:41 2009
@@ -16,15 +16,29 @@
  */
 package org.apache.geronimo.console;
 
+import java.io.IOException;
+import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.portlet.ActionRequest;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
 import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.geronimo.console.util.PortletManager;
 import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.console.message.CommonMessage;
+import org.apache.geronimo.console.message.ErrorMessage;
+import org.apache.geronimo.console.message.InfoMessage;
+import org.apache.geronimo.console.message.WarnMessage;
 
 /**
  * Superclass with some generic functionality for console portlets
@@ -36,6 +50,7 @@
     protected final static String WEB_SERVER_JETTY = "jetty";
     protected final static String WEB_SERVER_TOMCAT = "tomcat";
     protected final static String WEB_SERVER_GENERIC = "generic";
+    private static final String COMMON_MESSAGES = "commonMessages";
 
     protected final static String getWebServerType(Class cls) {
         Class[] intfs = cls.getInterfaces();
@@ -112,4 +127,86 @@
         }
         throw new IllegalArgumentException("No such method found ("+operation+" on "+target.getClass().getName()+")");
     }
+
+    @Override
+    public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+        @SuppressWarnings("unchecked")
+        SoftReference<List<CommonMessage>> msgRef = (SoftReference<List<CommonMessage>>) request.getPortletSession().getAttribute(COMMON_MESSAGES);
+        if (null != msgRef && null != msgRef.get()) {
+            request.setAttribute(COMMON_MESSAGES, msgRef.get());
+        }
+        request.getPortletSession().removeAttribute(COMMON_MESSAGES);
+
+        super.render(request, response);
+    }
+
+    public final void addErrorMessage(PortletRequest request, String... messages) {
+        addCommonMessage(CommonMessage.Type.Error, request, messages);
+    }
+
+    public final void addWarningMessage(PortletRequest request, String... messages) {
+        addCommonMessage(CommonMessage.Type.Warn, request, messages);
+    }
+
+    public final void addInfoMessage(PortletRequest request, String... messages) {
+        addCommonMessage(CommonMessage.Type.Info, request, messages);
+    }
+
+    public final String getLocalizedString(String key, PortletRequest request) {
+        String value = getResourceBundle(request.getLocale()).getString(key);
+        return null == value ? key : value;
+    }
+
+    private void addCommonMessage(CommonMessage.Type type, PortletRequest request, String[] messages) {
+        if (null != messages && 0 != messages.length) {
+            if (1 == messages.length) {
+                addCommonMessage(type, request, messages[0], null);
+            } else {
+                StringBuilder sb = new StringBuilder();
+                for (String message : messages) {
+                    sb.append(message + "<br>");
+                }
+                addCommonMessage(type, request, messages[0], sb.toString());
+            }
+        }
+    }
+
+    private void addCommonMessage(CommonMessage.Type type, PortletRequest request, String abbr, String detail) {
+        if (request instanceof ActionRequest) {
+            List<CommonMessage> messages;
+            @SuppressWarnings("unchecked")
+            SoftReference<List<CommonMessage>> msgRef = (SoftReference<List<CommonMessage>>) request.getPortletSession().getAttribute(COMMON_MESSAGES);
+            if (null == msgRef || null == msgRef.get()) {
+                messages = new ArrayList<CommonMessage>();
+                msgRef = new SoftReference<List<CommonMessage>>(messages);
+                request.getPortletSession().setAttribute(COMMON_MESSAGES, msgRef);
+            } else {
+                messages = msgRef.get();
+            }
+            addCommonMessage(type, messages, abbr, detail);
+        } else {
+            @SuppressWarnings("unchecked")
+            List<CommonMessage> messages = (List<CommonMessage>) request.getAttribute(COMMON_MESSAGES);
+            if (null == messages) {
+                messages = new ArrayList<CommonMessage>();
+                request.setAttribute(COMMON_MESSAGES, messages);
+            }
+            addCommonMessage(type, messages, abbr, detail);
+        }
+    }
+
+    private void addCommonMessage(CommonMessage.Type type, List<CommonMessage> messages, String abbr, String detail) {
+        switch (type) {
+        case Error:
+            messages.add(new ErrorMessage(abbr, detail));
+            break;
+        case Warn:
+            messages.add(new WarnMessage(abbr, detail));
+            break;
+        case Info:
+            messages.add(new InfoMessage(abbr, detail));
+            break;
+        }
+    }
+
 }

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java Wed Jan  7 09:03:41 2009
@@ -46,12 +46,19 @@
     private final String viewName;
     private Map<String, FileItem> uploadFiles = new HashMap<String, FileItem>();
     private Properties uploadFields = new Properties();
+    protected BasePortlet portlet;
 
     protected MultiPageAbstractHandler(String mode, String viewName) {
         this.mode = mode;
         this.viewName = viewName;
     }
 
+    protected MultiPageAbstractHandler(String mode, String viewName, BasePortlet portlet) {
+        this.mode = mode;
+        this.viewName = viewName;
+        this.portlet = portlet;
+    }
+
     public String getMode() {
         return mode;
     }

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java Wed Jan  7 09:03:41 2009
@@ -0,0 +1,55 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+import java.io.Serializable;
+
+public abstract class CommonMessage implements Serializable {
+
+    public enum Type {
+        Info, Warn, Error;
+    }
+
+    private static final long serialVersionUID = 0L;
+
+    protected String abbr;
+
+    protected String detail;
+
+    public CommonMessage() {
+    }
+
+    public CommonMessage(String abbr) {
+        this.abbr = abbr;
+    }
+
+    public CommonMessage(String abbr, String detail) {
+        this.abbr = abbr;
+        this.detail = detail;
+    }
+
+    public String getAbbr() {
+        return abbr;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public abstract String renderMessage();
+
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java Wed Jan  7 09:03:41 2009
@@ -0,0 +1,54 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class CommonMessageTag extends TagSupport {
+
+    private static final long serialVersionUID = 0L;
+    private static final Logger log = LoggerFactory.getLogger(CommonMessageTag.class);
+    private static final String COMMON_MESSAGES = "commonMessages";
+
+    @Override
+    public int doStartTag() throws JspException {
+        JspWriter out = pageContext.getOut();
+        @SuppressWarnings("unchecked")
+        List<CommonMessage> messages = (List<CommonMessage>) pageContext.getRequest().getAttribute(COMMON_MESSAGES);
+        if (null != messages && 0 != messages.size()) {
+            try {
+                out.println("<table align=\"center\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" border=\"0\" summary=\"Inline Messages\" valign=\"top\" class=\"messagePortlet\"><tbody>");
+                for (CommonMessage message : messages) {
+                    out.println(message.renderMessage());
+                }
+                out.println("</tbody></table>");
+            } catch (IOException e) {
+                log.error("Unable to display common messages");
+            }
+        }
+        return SKIP_BODY;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java Wed Jan  7 09:03:41 2009
@@ -0,0 +1,59 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+public final class ErrorMessage extends CommonMessage {
+
+    private static final long serialVersionUID = 0L;
+
+    public ErrorMessage(String abbr) {
+        super(abbr);
+    }
+
+    public ErrorMessage(String abbr, String detail) {
+        super(abbr, detail);
+    }
+
+    @Override
+    public String renderMessage() {
+        String timestamp = String.valueOf(System.nanoTime());
+        StringBuilder sb = new StringBuilder();
+        sb.append("<tr valign=\"top\">");
+        sb.append("<td style=\"width: 20px;\">");
+        if (null != detail) {
+            sb.append("<a class=\"expand-task\" href=\"javascript:showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_abbreviateMessages');showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages');\" tabindex=\"1\"><img border=\"0\" align=\"absmiddle\" alt=\"show/hide\" src=\"/console/images/arrow_collapsed.gif\" id=\""
+                            + timestamp + "org_apache_geronimo_abbreviateMessagesImg\" title=\"show/hide\"/></a>");
+        }
+        sb.append("</td>");
+        sb.append("<td style=\"width: 20px;\"><img height=\"16\" width=\"16\" align=\"baseline\" src=\"/console/images/msg_error.gif\" alt=\"Error\" title=\"Error\"/></td>");
+        sb.append("<td><span id=\"" + timestamp
+                + "org_apache_geronimo_abbreviateMessages\" style=\"display: inline;\" class=\"validation-error\">"
+                + abbr + "</span>");
+        if (null != detail) {
+            sb.append("<span id=\""
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages\" style=\"display: none;\" class=\"validation-error\"><pre>"
+                            + detail + "</pre></span>");
+        }
+        sb.append("</td></tr>");
+        return sb.toString();
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java Wed Jan  7 09:03:41 2009
@@ -0,0 +1,59 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+public final class InfoMessage extends CommonMessage {
+
+    private static final long serialVersionUID = 0L;
+
+    public InfoMessage(String abbr) {
+        super(abbr);
+    }
+
+    public InfoMessage(String abbr, String detail) {
+        super(abbr, detail);
+    }
+
+    @Override
+    public String renderMessage() {
+        String timestamp = String.valueOf(System.nanoTime());
+        StringBuilder sb = new StringBuilder();
+        sb.append("<tr valign=\"top\">");
+        sb.append("<td style=\"width: 20px;\">");
+        if (null != detail) {
+            sb.append("<a class=\"expand-task\" href=\"javascript:showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_abbreviateMessages');showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages');\" tabindex=\"1\"><img border=\"0\" align=\"absmiddle\" alt=\"show/hide\" src=\"/console/images/arrow_collapsed.gif\" id=\""
+                            + timestamp + "org_apache_geronimo_abbreviateMessagesImg\" title=\"show/hide\"/></a>");
+        }
+        sb.append("</td>");
+        sb.append("<td style=\"width: 20px;\"><img height=\"16\" width=\"16\" align=\"baseline\" src=\"/console/images/msg_info.gif\" alt=\"Info\" title=\"Information\"/></td>");
+        sb.append("<td><span id=\"" + timestamp
+                + "org_apache_geronimo_abbreviateMessages\" style=\"display: inline;\" class=\"validation-info\">"
+                + abbr + "</span>");
+        if (null != detail) {
+            sb.append("<span id=\""
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages\" style=\"display: none;\" class=\"validation-info\"><pre>"
+                            + detail + "</pre></span>");
+        }
+        sb.append("</td></tr>");
+        return sb.toString();
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java Wed Jan  7 09:03:41 2009
@@ -0,0 +1,59 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+public final class WarnMessage extends CommonMessage {
+
+    private static final long serialVersionUID = 0L;
+
+    public WarnMessage(String abbr) {
+        super(abbr);
+    }
+
+    public WarnMessage(String abbr, String detail) {
+        super(abbr, detail);
+    }
+
+    @Override
+    public String renderMessage() {
+        String timestamp = String.valueOf(System.nanoTime());
+        StringBuilder sb = new StringBuilder();
+        sb.append("<tr valign=\"top\">");
+        sb.append("<td style=\"width: 20px;\">");
+        if (null != detail) {
+            sb.append("<a class=\"expand-task\" href=\"javascript:showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_abbreviateMessages');showHideSection('"
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages');\" tabindex=\"1\"><img border=\"0\" align=\"absmiddle\" alt=\"show/hide\" src=\"/console/images/arrow_collapsed.gif\" id=\""
+                            + timestamp + "org_apache_geronimo_abbreviateMessagesImg\" title=\"show/hide\"/></a>");
+        }
+        sb.append("</td>");
+        sb.append("<td style=\"width: 20px;\"><img height=\"16\" width=\"16\" align=\"baseline\" src=\"/console/images/msg_warn.gif\" alt=\"Warn\" title=\"Warning\"/></td>");
+        sb.append("<td><span id=\"" + timestamp
+                + "org_apache_geronimo_abbreviateMessages\" style=\"display: inline;\" class=\"validation-warn\">"
+                + abbr + "</span>");
+        if (null != detail) {
+            sb.append("<span id=\""
+                            + timestamp
+                            + "org_apache_geronimo_detailedMessages\" style=\"display: none;\" class=\"validation-warn\"><pre>"
+                            + detail + "</pre></span>");
+        }
+        sb.append("</td></tr>");
+        return sb.toString();
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=732398&r1=732397&r2=732398&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Wed Jan  7 09:03:41 2009
@@ -46,4 +46,19 @@
         <artifactId>console-core</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>jsp-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>el-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>servlet-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css (added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css Wed Jan  7 09:03:41 2009
@@ -0,0 +1,24 @@
+.messagePortlet {
+	background-color:#F7F7F7;
+	border:1px solid #88A4D7;
+	font-family:Verdana,Helvetica,sans-serif;
+	font-size:75%;
+}
+.expand-task {
+	color:#000000;
+	margin-bottom:2px;
+	margin-top:2px;
+	text-decoration:none;
+}
+.validation-error {
+	color:#CC0000;
+	font-family:Verdana,Helvetica,sans-serif;
+}
+.validation-info {
+    color:#000000;
+    font-family:Verdana,Helvetica,sans-serif;
+}
+.validation-warn {
+    color:#660000;
+    font-family:Verdana,Helvetica,sans-serif;
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js?rev=732398&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js (added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js Wed Jan  7 09:03:41 2009
@@ -0,0 +1,32 @@
+//======================================================================
+//   Licensed to the Apache Software Foundation (ASF) under one or more
+//   contributor license agreements.  See the NOTICE file distributed with
+//   this work for additional information regarding copyright ownership.
+//   The ASF licenses this file to You under the Apache License, Version 2.0
+//   (the "License"); you may not use this file except in compliance with
+//   the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//======================================================================
+function showHideSection(id){
+	if(document.getElementById(id)!=null){
+		if(document.getElementById(id).style.display=="none"){
+			document.getElementById(id).style.display="inline";
+			if(document.getElementById(id+"Img")){
+				document.getElementById(id+"Img").src="/console/images/arrow_collapsed.gif";
+			}
+		}
+		else{
+			document.getElementById(id).style.display="none";
+			if(document.getElementById(id+"Img")){
+				document.getElementById(id+"Img").src="/console/images/arrow_expanded.gif";
+			}
+		}
+	}
+}    
\ No newline at end of file



Mime
View raw message