geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r781081 [2/4] - in /geronimo/server/branches/2.1: plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/ plugins/console/console-base-portl...
Date Tue, 02 Jun 2009 17:01:01 GMT
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java Tue Jun  2 17:00:57 2009
@@ -32,22 +32,22 @@
     public void init(PortletConfig config) throws PortletException {
         super.init(config);
         addHelper(new ListHandler(), config);
-        addHelper(new EditKeystoreHandler(), config);
-        addHelper(new UnlockKeystoreHandler(), config);
+        addHelper(new EditKeystoreHandler(this), config);
+        addHelper(new UnlockKeystoreHandler(this), config);
         addHelper(new CreateKeystoreHandler(), config);
-        addHelper(new ViewKeystoreHandler(), config);
+        addHelper(new ViewKeystoreHandler(this), config);
         addHelper(new UploadCertificateHandler(), config);
         addHelper(new ConfirmCertificateHandler(), config);
         addHelper(new ConfigureNewKeyHandler(), config);
         addHelper(new ConfirmKeyHandler(), config);
-        addHelper(new LockEditKeystoreHandler(), config);
-        addHelper(new LockKeystoreHandler(), config);
-        addHelper(new UnlockKeyHandler(), config);
+        addHelper(new LockEditKeystoreHandler(this), config);
+        addHelper(new LockKeystoreHandler(this), config);
+        addHelper(new UnlockKeyHandler(this), config);
         addHelper(new CertificateDetailsHandler(), config);
         addHelper(new GenerateCSRHandler(), config);
         addHelper(new ImportCAReplyHandler(), config);
         addHelper(new DeleteEntryHandler(), config);
-        addHelper(new ChangePasswordHandler(), config);
+        addHelper(new ChangePasswordHandler(this), config);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ListHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ListHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ListHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ListHandler.java Tue Jun  2 17:00:57 2009
@@ -49,11 +49,6 @@
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
         KeystoreManager manager = PortletManager.getCurrentServer(request).getKeystoreManager();
         KeystoreInstance[] keystores = manager.getKeystores();
         PortletSession session = request.getPortletSession(true);

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java Tue Jun  2 17:00:57 2009
@@ -16,6 +16,9 @@
  */
 package org.apache.geronimo.console.keystores;
 
+import java.text.MessageFormat;
+
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 import javax.portlet.ActionRequest;
@@ -31,15 +34,15 @@
  * @version $Rev$ $Date$
  */
 public class LockEditKeystoreHandler extends BaseKeystoreHandler {
-    public LockEditKeystoreHandler() {
-        super(LOCK_KEYSTORE_FOR_EDITING, null);
+    public LockEditKeystoreHandler(BasePortlet portlet) {
+        super(LOCK_KEYSTORE_FOR_EDITING, null, portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
         String keystore = request.getParameter("keystore");
         KeystoreData data = ((KeystoreData) request.getPortletSession(true).getAttribute(KEYSTORE_DATA_PREFIX + keystore));
         data.lockEdit();
-        response.setRenderParameter(INFO_MSG, "Keystore '"+keystore+"' is now edit locked.");
+        portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg06"), keystore));
         return LIST_MODE+BEFORE_ACTION;
     }
 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java Tue Jun  2 17:00:57 2009
@@ -16,6 +16,9 @@
  */
 package org.apache.geronimo.console.keystores;
 
+import java.text.MessageFormat;
+
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.management.geronimo.KeystoreException;
 
@@ -32,8 +35,8 @@
  * @version $Rev$ $Date$
  */
 public class LockKeystoreHandler extends BaseKeystoreHandler {
-    public LockKeystoreHandler() {
-        super(LOCK_KEYSTORE_FOR_USAGE, null);
+    public LockKeystoreHandler(BasePortlet portlet) {
+        super(LOCK_KEYSTORE_FOR_USAGE, null, portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
@@ -41,7 +44,7 @@
         KeystoreData data = ((KeystoreData) request.getPortletSession(true).getAttribute(KEYSTORE_DATA_PREFIX + keystore));
         try {
             data.lockUse();
-            response.setRenderParameter(INFO_MSG, "Availability of keystore '"+keystore+"' is locked.");
+            portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg08"), keystore));
         } catch (KeystoreException e) {
             throw new PortletException(e);
         }

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java Tue Jun  2 17:00:57 2009
@@ -16,8 +16,11 @@
  */
 package org.apache.geronimo.console.keystores;
 
+import java.text.MessageFormat;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.management.geronimo.KeystoreException;
 
@@ -35,8 +38,8 @@
  */
 public class UnlockKeyHandler extends BaseKeystoreHandler {
     private final static Log log = LogFactory.getLog(UnlockKeyHandler.class);
-    public UnlockKeyHandler() {
-        super(UNLOCK_KEY, "/WEB-INF/view/keystore/unlockKey.jsp");
+    public UnlockKeyHandler(BasePortlet portlet) {
+        super(UNLOCK_KEY, "/WEB-INF/view/keystore/unlockKey.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
@@ -44,11 +47,6 @@
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
         String keystore = request.getParameter("keystore");
         String password = request.getParameter("password");
         request.setAttribute("keystore", keystore);
@@ -75,11 +73,11 @@
         } catch (KeystoreException e) {
             response.setRenderParameter("keystore", keystore);
             response.setRenderParameter("password", password);
-            response.setRenderParameter(ERROR_MSG, "Unable to unlock key '"+alias+"'." + e);
+            portlet.addErrorMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "errorMsg10"), alias), e.getMessage());
             log.error("Unable to unlock key '"+alias+"'.", e);
             return getMode()+BEFORE_ACTION;
         }
-        response.setRenderParameter(INFO_MSG, "Successfully unlocked key '"+alias+"' in keystore '"+keystore+"'.");
+        portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg09"), alias, keystore));
         return LIST_MODE+BEFORE_ACTION;
     }
 }

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java Tue Jun  2 17:00:57 2009
@@ -16,8 +16,11 @@
  */
 package org.apache.geronimo.console.keystores;
 
+import java.text.MessageFormat;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 import javax.portlet.ActionRequest;
@@ -34,8 +37,8 @@
  */
 public class UnlockKeystoreHandler extends BaseKeystoreHandler {
     private final static Log log = LogFactory.getLog(UnlockKeystoreHandler.class);
-    public UnlockKeystoreHandler() {
-        super(UNLOCK_KEYSTORE_FOR_USAGE, "/WEB-INF/view/keystore/unlockKeystore.jsp");
+    public UnlockKeystoreHandler(BasePortlet portlet) {
+        super(UNLOCK_KEYSTORE_FOR_USAGE, "/WEB-INF/view/keystore/unlockKeystore.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
@@ -47,11 +50,6 @@
     }
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
-        String[] params = {ERROR_MSG, INFO_MSG};
-        for(int i = 0; i < params.length; ++i) {
-            String value = request.getParameter(params[i]);
-            if(value != null) request.setAttribute(params[i], value);
-        }
         String keystore = request.getParameter("keystore");
         request.setAttribute("keystore", keystore);
         request.setAttribute("mode", "unlockKeystore");
@@ -84,11 +82,11 @@
                 return UNLOCK_KEY+BEFORE_ACTION;
             } // otherwise it has no keys
         } catch (Exception e) {
-            response.setRenderParameter(ERROR_MSG, "Unable to unlock keystore '"+keystore+"' for availability. "+e.toString());
+            portlet.addErrorMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "errorMsg09"), keystore), e.getMessage());
             log.error("Unable to unlock keystore '"+keystore+"' for availability.", e);
             return getMode()+BEFORE_ACTION;
         }
-        response.setRenderParameter(INFO_MSG, "Successfully unlocked keystore '"+keystore+"' for availability.");
+        portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg07"), keystore));
         return LIST_MODE+BEFORE_ACTION;
     }
 }

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ViewKeystoreHandler.java Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java Tue Jun  2 17:00:57 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(actionRequest, "errorMsg07"), 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(actionRequest, "errorMsg06"), e.getMessage());
         }
     }
 }
\ No newline at end of file

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java Tue Jun  2 17:00:57 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/groups/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(actionRequest, "errorMsg04"), 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(actionRequest, "errorMsg05"), 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(actionRequest, "errorMsg06"), e.getMessage());
         }
     }
 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java Tue Jun  2 17:00:57 2009
@@ -69,6 +69,7 @@
 
     protected void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
+        addWarningMessage(request, getLocalizedString(request, "warnMsg07"));
         normalView.include(request, response);
     }
 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Tue Jun  2 17:00:57 2009
@@ -387,6 +387,9 @@
                 all.add(result);
             }
         }
+        if (0 == all.size()) {
+            addWarningMessage(renderRequest, "warnMsg08");
+        }
         renderRequest.setAttribute("containers", all);
         renderRequest.setAttribute("serverPort", new Integer(renderRequest.getServerPort()));
 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Tue Jun  2 17:00:57 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(renderRequest, "warnMsg04"));
                             }
                         } 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(renderRequest, "warnMsg03"));
                     }
                 } else {
                     log.error("Error attempting to retrieve the web containers");

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties Tue Jun  2 17:00:57 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>
\ No newline at end of file

Added: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=781081&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld (added)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld Tue Jun  2 17:00:57 2009
@@ -0,0 +1,41 @@
+<?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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Jun  2 17:00:57 2009
@@ -34,6 +34,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Welcome</title>
             <short-title>Welcome</short-title>
@@ -53,6 +56,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Info</title>
             <short-title>ServerInfo</short-title>
@@ -72,6 +78,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</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 +100,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Log Manager</title>
             <short-title>Log Manager</short-title>
@@ -110,6 +122,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Log Viewer</title>
             <short-title>Server Log Viewer</short-title>
@@ -129,6 +144,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</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 +166,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Server Manager</title>
             <short-title>Server Manager</short-title>
@@ -167,6 +188,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Web Server Manager</title>
             <short-title>Web Servers</short-title>
@@ -186,6 +210,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Network Listeners</title>
             <short-title>Listeners</short-title>
@@ -205,6 +232,9 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Thread Pool Configuration</title>
             <short-title>Thread Pools</short-title>
@@ -224,6 +254,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Repository Viewer</title>
             <short-title>Repository Viewer</short-title>
@@ -242,6 +275,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Apache mod_jk Configuration</title>
             <short-title>Apache mod_jk</short-title>
@@ -260,6 +296,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Keystore Configuration</title>
             <short-title>Keystores</short-title>
@@ -278,6 +317,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Certification Authority</title>
             <short-title>CA</short-title>
@@ -297,6 +339,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Applications</title>
             <short-title>Applications</short-title>
@@ -316,6 +361,9 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Web Applications</title>
             <short-title>WAR Modules</short-title>
@@ -339,6 +387,9 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed System Modules</title>
             <short-title>System Modules</short-title>
@@ -362,6 +413,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Console Realm Users</title>
             <short-title>Users</short-title>
@@ -381,6 +435,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Console Realm Groups</title>
             <short-title>Groups</short-title>
@@ -400,6 +457,9 @@
 <!--            <portlet-mode>HELP</portlet-mode>-->
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Security Realms</title>
             <short-title>Security Realms</short-title>
@@ -419,6 +479,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Application EARs</title>
             <short-title>EARModules</short-title>
@@ -441,6 +504,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed EJB JARs</title>
             <short-title>EJBModules</short-title>
@@ -463,6 +529,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed J2EE Connectors</title>
             <short-title>RARModules</short-title>
@@ -485,6 +554,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Installed Application Clients</title>
             <short-title>ClientModules</short-title>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/_header.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="certReqDetails-after"/>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="confirmCA-after" />
     <table border="0">

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="confirmCertReq-after"/>
     <input type="hidden" name="requestId" value="${requestId}"/>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="confirmClientCert-after"/>
     <input type="hidden" name="pkcs10certreq" value="${pkcs10certreq}"/>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Tue Jun  2 17:00:57 2009
@@ -20,14 +20,14 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
+<jsp:include page="_header.jsp" />
+
 <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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="processCSR-after" />
     <table border="0">

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="mode" value="setupCA-after"/>
     <table border="0">

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp Tue Jun  2 17:00:57 2009
@@ -30,14 +30,14 @@
     return true;
 }
 </script>
+
+<jsp:include page="_header.jsp" /><br>
+
 <b><fmt:message key="ca.common.unlockCertAuthority"/></b>
 
 <p><fmt:message key="ca.unlockCA.summary"/>
 </p>
 
-
-<jsp:include page="_header.jsp" />
-
 <form name="<portlet:namespace/>UnlockCAForm" action="<portlet:actionURL/>" method="POST">
     <input type="hidden" name="mode" value="unlockCA-after" />
     <b><fmt:message key="ca.unlockCA.enterCAPrivateKeyPassword"/>:</b>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Tue Jun  2 17:00:57 2009
@@ -33,10 +33,10 @@
 }
 </script>
 
-<b><fmt:message key="ca.common.title"/></b>
-
 <jsp:include page="_header.jsp" />
 
+<b><fmt:message key="ca.common.title"/></b><br>
+
 <c:choose>
   <c:when test="${empty(sNo)}">
     <!-- No serial number was received to show a certificate -->

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Tue Jun  2 17:00:57 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/>
 
@@ -214,6 +215,7 @@
 
 </script>
 
+<CommonMsg:commonMsg/><br>
 
 <form name="checkExpert" method="POST">
 <input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" />&nbsp;<label for="<portlet:namespace/>expertMode"><fmt:message key="configmanager.normal.expertMode" /></label>  
@@ -332,8 +334,6 @@
 </table>
 
 <br />
-<p>${messageInstalled} ${messageStatus}</p>
-
 
 <script>
 // Call to set initial expert mode actions correctly 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/_header.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp Tue Jun  2 17:00:57 2009
@@ -23,10 +23,10 @@
 <%@ 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="password" value="${password}" />

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp Tue Jun  2 17:00:57 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/>" method="POST">
     <input type="hidden" name="keystore" value="${keystore}" />

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp Tue Jun  2 17:00:57 2009
@@ -17,10 +17,13 @@
 <%@ 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/>
+
 <table width="50%" cellspacing="5">
-    ${message}
 	<tr>
         <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.groups.maximized.createNewGroup" /></a></td>
         <td></td>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp Tue Jun  2 17:00:57 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,8 +46,10 @@
     return value.length < 1;
 }
 </script>
+
+<CommonMsg:commonMsg/>
+
 <table width="50%" cellspacing="5">
-    ${message}
 	<tr>
 		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.users.maximized.createNewUser"/></a> </td>
 		<td></td>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp Tue Jun  2 17:00:57 2009
@@ -17,12 +17,16 @@
 <%@ 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/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp Tue Jun  2 17:00:57 2009
@@ -21,18 +21,14 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ 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/><br>
+
 <!-- Show existing connectors -->
-<c:choose>
-  <c:when test="${empty(containers)}">There are no Web Containers defined</c:when>
-  <c:otherwise>
-    <c:forEach var="container" items="${containers}">
-      <c:if test="${fn:length(containers) > 1}"><p><b>Connectors for ${container.name}:</b></p></c:if>
-        <c:choose>
-          <c:when test="${empty(container.connectors)}"><p>There are no connectors defined for ${container.name}</p></c:when>
-          <c:otherwise>
+<c:forEach var="container" items="${containers}">
 <table width="100%">
           <tr>
             <th class="DarkBackground" align="left"><fmt:message key="consolebase.common.name"/></th>
@@ -103,8 +99,6 @@
           </tr>
 </c:forEach>
 </table>
-          </c:otherwise>
-        </c:choose>
 
 <P><HR><P>
 <!-- Links to add new connectors -->
@@ -120,6 +114,4 @@
 </c:forEach>
 </ul>
 
-    </c:forEach>
-  </c:otherwise>
-</c:choose>
+</c:forEach>
\ No newline at end of file

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Tue Jun  2 17:00:57 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%">
   <tr>
@@ -96,7 +100,6 @@
 </table>
 </c:if>
 <c:if test="${!statsOn}">
-  ${statsMessage}<br/><br/>
   <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/branches/2.1/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/pom.xml?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/pom.xml Tue Jun  2 17:00:57 2009
@@ -76,6 +76,13 @@
             <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/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java Tue Jun  2 17:00:57 2009
@@ -17,18 +17,30 @@
 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 java.util.Locale;
+import java.text.MessageFormat;
+
+import javax.portlet.ActionRequest;
 import javax.portlet.GenericPortlet;
-import javax.portlet.PortletRequest;
 import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 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;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Superclass with some generic functionality for console portlets
@@ -40,6 +52,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";
     private static final String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale.request";
 
     protected final static String getWebServerType(Class cls) {
@@ -120,8 +133,85 @@
 
     @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);
         request.setAttribute(FMT_LOCALE, request.getLocale());
         
         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(PortletRequest request, String key, Object... vars) {
+        String value = getResourceBundle(request.getLocale()).getString(key);
+        if (null == value || 0 == value.length()) return key;
+        return MessageFormat.format(value, vars);
+    }
+
+    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/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_ja.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_ja.java?rev=781081&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_ja.java (added)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_ja.java Tue Jun  2 17:00:57 2009
@@ -0,0 +1,28 @@
+/**
+ *  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.i18n;
+
+/**
+ * Resource for Japanese.
+ * Nothing to do with this class, all functions are implemented in 
+ * ConsoleResourceSupport.
+ * See Java Doc of class java.util.ResourceBundle
+ */
+public class ConsoleResource_ja extends ConsoleResourceSupport {
+
+}

Propchange: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_ja.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java?rev=781081&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java (added)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java Tue Jun  2 17:00:57 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/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java?rev=781081&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java (added)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java Tue Jun  2 17:00:57 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;
+    }
+
+}



Mime
View raw message