Propchange: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java (added) +++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java Tue Jun 2 17:00:57 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(""); + sb.append(""); + if (null != detail) { + sb.append("\"show/hide\""); + } + sb.append(""); + sb.append("\"Error\""); + sb.append("" + + abbr + ""); + if (null != detail) { + sb.append("
"
+                            + detail + "
"); + } + sb.append(""); + return sb.toString(); + } +} Propchange: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ErrorMessage.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java (added) +++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java Tue Jun 2 17:00:57 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(""); + sb.append(""); + if (null != detail) { + sb.append("\"show/hide\""); + } + sb.append(""); + sb.append("\"Info\""); + sb.append("" + + abbr + ""); + if (null != detail) { + sb.append("
"
+                            + detail + "
"); + } + sb.append(""); + return sb.toString(); + } +} Propchange: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/InfoMessage.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java (added) +++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java Tue Jun 2 17:00:57 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(""); + sb.append(""); + if (null != detail) { + sb.append("\"show/hide\""); + } + sb.append(""); + sb.append("\"Warn\""); + sb.append("" + + abbr + ""); + if (null != detail) { + sb.append("
"
+                            + detail + "
"); + } + sb.append(""); + return sb.toString(); + } +} Propchange: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/WarnMessage.java ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css (added) +++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css Tue Jun 2 17:00:57 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/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css ------------------------------------------------------------------------------ svn:eol-style = native Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js (added) +++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js Tue Jun 2 17:00:57 2009 @@ -0,0 +1,211 @@ +//====================================================================== +// 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 addErrorMessage(namespace, message){ + var msg = {}; + msg.type = "error"; + msg.abbr = message; + addCommonMessage(namespace, msg); +} + +function addWarningMessage(namespace, message){ + var msg = {}; + msg.type="warn"; + msg.abbr = message; + addCommonMessage(namespace, msg); +} + +function addInfoMessage(namespace, message){ + var msg = {}; + msg.type="info"; + msg.abbr = message; + addCommonMessage(namespace, msg); +} + +function addCommonMessage(namespace, msg){ + var container = document.getElementById(namespace+"CommonMsgContainer"); + var pre = container.previousSibling; + while (pre) { + if (pre.className=="messagePortlet") { + container.parentNode.removeChild(pre); + break; + } + pre = pre.previousSibling; + } + while(container.firstChild) { + container.removeChild(container.firstChild); + } + var table = document.createElement("table"); + container.appendChild(table); + table.align="center"; table.vAlign="top"; table.width="100%"; table.border="0"; table.cellSpacing="0"; table.cellPadding="0"; table.className="messagePortlet"; table.summary="Inline Messages"; + var tbody = document.createElement("tbody"); + table.appendChild(tbody); + var tr = document.createElement("tr"); + tbody.appendChild(tr); + tr.vAlign="top"; + var td1 = document.createElement("td"); + tr.appendChild(td1); + td1.style.width="20px"; + if (msg.detail) { + var a = document.createElement("a"); + td1.appendChild(a); + a.className="expand-task"; a.href="javascript:showHideSection('"+namespace+"org_apache_geronimo_abbreviateMessages');showHideSection('"+namespace+"org_apache_geronimo_detailedMessages');"; a.tabIndex="1"; + var img = document.createElement("img"); + a.appendChild(img); + img.id=namespace+"org_apache_geronimo_abbreviateMessagesImg"; img.border="0"; img.align="absmiddle"; img.alt="show/hide"; img.src="/console/images/arrow_collapsed.gif"; img.title="show/hide"; + } + var td2 = document.createElement("td"); + tr.appendChild(td2); + td2.style.width="20px"; + var img2 = document.createElement("img"); + td2.appendChild(img2); + img2.height="16"; img2.width="16"; img2.align="baseline"; + switch (msg.type) + { + case "error": + img2.src="/console/images/msg_error.gif"; img2.alt="Error"; img2.title="Error"; + break; + case "warn": + img2.src="/console/images/msg_warn.gif"; img2.alt="Warn"; img2.title="Warning"; + break; + case "info": + default: + img2.src="/console/images/msg_info.gif"; img2.alt="Info"; img2.title="Infomation"; + } + var td3 = document.createElement("td"); + tr.appendChild(td3); + var span1 = document.createElement("span"); + td3.appendChild(span1); + span1.id=namespace+"org_apache_geronimo_abbreviateMessages"; span1.style.display="inline"; + switch (msg.type) + { + case "error": + span1.className="validation-error"; + break; + case "warn": + span1.className="validation-warn"; + break; + case "info": + default: + span1.className="validation-info"; + } + span1.appendChild(document.createTextNode(msg.abbr)); + if (msg.detail) { + var span2 = document.createElement("span"); + td3.appendChild(span2); + span2.id=namespace+"org_apache_geronimo_detailedMessages"; span2.style.display="none"; + switch (msg.type) + { + case "error": + span2.className="validation-error"; + break; + case "warn": + span2.className="validation-warn"; + break; + case "info": + default: + span2.className="validation-info"; + } + var pre = document.createElement("pre"); + span2.appendChild(pre); + pre.appendChild(document.createTextNode(msg.abbr)); + pre.appendChild(document.createElement("br")); + pre.appendChild(document.createTextNode(msg.detail)); + pre.appendChild(document.createElement("br")); + } +} + +function showConfirmMessage() { + dojo.require("dijit.Dialog"); + dojo.require("dijit.form.Button"); + document.body.className = "soria"; + var target = arguments[0]; + var submit = new dojo.Deferred(); + submit.addCallback(function(){ + switch (target.nodeName.toLowerCase()) { + case "input": + var formNode = target.parentNode; + while (formNode) { + if (formNode.nodeName.toLowerCase() == "form") { + break; + } + formNode = formNode.parentNode; + } + if (formNode) { + formNode.submit(); + } + break; + case "a": + location.href=target.href; + break; + default: + } + }); + var d = new dijit.Dialog(); + dojo.style(d.closeButtonNode, "visibility", "hidden"); + var table = document.createElement("table"); + table.width="100%"; + var tbody = document.createElement("tbody"); + table.appendChild(tbody); + var tr1 = document.createElement("tr"); + tbody.appendChild(tr1); + var tr2 = document.createElement("tr"); + tbody.appendChild(tr2); + var td11 = document.createElement("td"); + tr1.appendChild(td11); + td11.colSpan="2"; td11.style.paddingBottom="10px"; td11.align="left"; + var img = document.createElement("img"); + td11.appendChild(img); + td11.appendChild(document.createTextNode(arguments[1])); + img.height="16"; img.width="16"; img.style.marginRight="8"; img.align="baseline"; img.src="/console/images/msg_warn.gif"; img.alt="Warn"; img.title="Warning"; + var td21 = document.createElement("td"); + tr2.appendChild(td21); + td21.align="right"; + var td22 = document.createElement("td"); + tr2.appendChild(td22); + td22.align="left"; + var b1 = new dijit.form.Button({label: arguments[2], tabIndex: "2"}); + td21.appendChild(b1.domNode); + dojo.connect(b1, "onClick", function() { + d.hide(); + submit.callback(); + }); + var b2 = new dijit.form.Button({label: arguments[3], tabIndex: "1"}); + td22.appendChild(b2.domNode); + dojo.connect(b2, "onClick", function() { + d.hide(); + }); + d.setContent(table); + d.show(); + return false; +} + +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"; + } + } + } +} Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp (original) +++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp Tue Jun 2 17:00:57 2009 @@ -24,6 +24,8 @@ <fmt:message key="console.head.title"/> + + Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_collapsed.gif URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_collapsed.gif?rev=781081&view=auto ============================================================================== Binary file - no diff available. Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_collapsed.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_expanded.gif URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_expanded.gif?rev=781081&view=auto ============================================================================== Binary file - no diff available. Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/arrow_expanded.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_error.gif URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_error.gif?rev=781081&view=auto ============================================================================== Binary file - no diff available. Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_error.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_info.gif URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_info.gif?rev=781081&view=auto ============================================================================== Binary file - no diff available. Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_info.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Added: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_warn.gif URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_warn.gif?rev=781081&view=auto ============================================================================== Binary file - no diff available. Propchange: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/images/msg_warn.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp (original) +++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp Tue Jun 2 17:00:57 2009 @@ -52,6 +52,26 @@ <%-- Main body --%> + + + + + + + + + + + @@ -64,9 +84,6 @@ - - -
  + + + + + + + +
Error
+ 		 
  
  
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java Tue Jun 2 17:00:57 2009 @@ -144,7 +144,7 @@ if(isRedeploy) { TargetModuleID[] targets = identifyTargets(moduleFile, planFile, mgr.getAvailableModules(null, all)); if(targets.length == 0) { - actionRequest.getPortletSession().setAttribute(ABBR_STATUS_PARM, "Unable to identify modules to replace. Please check if it has already been stopped or undeployed."); + addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg04"), null); return; } progress = mgr.redeploy(targets, moduleFile, planFile); @@ -159,7 +159,8 @@ String fullStatusMessage = null; if(progress.getDeploymentStatus().isCompleted()) { - abbrStatusMessage = "The application was successfully "+(isRedeploy ? "re" : "")+"deployed.
"; + abbrStatusMessage = getLocalizedString(actionRequest, !isRedeploy ? "infoMsg01" : "infoMsg02"); + addInfoMessage(actionRequest, abbrStatusMessage); // start installed app/s if (!isRedeploy && startApp != null && !startApp.equals("")) { progress = mgr.start(progress.getResultTargetModuleIDs()); @@ -167,18 +168,20 @@ Thread.sleep(100); } if (progress.getDeploymentStatus().isCompleted()) { - abbrStatusMessage += "The application was successfully started"; + abbrStatusMessage = getLocalizedString(actionRequest, "infoMsg03"); + addInfoMessage(actionRequest, abbrStatusMessage); } else { - abbrStatusMessage += "The application was not successfully started"; + abbrStatusMessage = getLocalizedString(actionRequest, "errorMsg02"); fullStatusMessage = progress.getDeploymentStatus().getMessage(); + addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage); } } } else { fullStatusMessage = progress.getDeploymentStatus().getMessage(); // for the abbreviated status message clip off everything - // after the first line, which in most cases means the gnarly stacktrace - abbrStatusMessage = "Deployment failed:
" - + fullStatusMessage.substring(0, fullStatusMessage.indexOf('\n')); + // after the first line, which in most cases means the gnarly stacktrace + abbrStatusMessage = getLocalizedString(actionRequest, "errorMsg01"); + addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage); // try to provide an upgraded version of the plan try { if (planFile != null && planFile.exists()) { @@ -205,10 +208,6 @@ // status message has already been provided in this case } } - // have to store the status messages in the portlet session - // because the buffer size for render parameters is sometimes not big enough - actionRequest.getPortletSession().setAttribute(FULL_STATUS_PARM, fullStatusMessage); - actionRequest.getPortletSession().setAttribute(ABBR_STATUS_PARM, abbrStatusMessage); } finally { mgr.release(); if (fis!=null) fis.close(); @@ -269,8 +268,6 @@ // session during the processAction phase and then copied into render // attributes here so the JSP has easier access to them. This seems // to only be an issue on tomcat. - copyRenderAttribute(renderRequest, FULL_STATUS_PARM); - copyRenderAttribute(renderRequest, ABBR_STATUS_PARM); copyRenderAttribute(renderRequest, MIGRATED_PLAN_PARM); copyRenderAttribute(renderRequest, ORIGINAL_PLAN_PARM); deployView.include(renderRequest, renderResponse); Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Tue Jun 2 17:00:57 2009 @@ -192,7 +192,8 @@ ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(PortletManager.getKernel()); if (configurationManager.isInstalled(artifact)) { actionResponse.setRenderParameter(MODE_KEY, SELECT_TYPE_MODE); - actionResponse.setRenderParameter(MESSAGE_KEY, "realmwizard.message.sameRealmName"); + String error = getLocalizedString(actionRequest, "errorMsg03"); + addErrorMessage(actionRequest, error); } else { // Config properties have to be set in render since they have values of null if (data.getRealmType().equals("Other")) { @@ -209,8 +210,8 @@ if (error == null) { actionResponse.setRenderParameter(MODE_KEY, ADVANCED_MODE); } else { - actionResponse.setRenderParameter("LoginModuleError", error); actionResponse.setRenderParameter(MODE_KEY, CONFIGURE_MODE); + addErrorMessage(actionRequest, error); } } else if (mode.equals("process-" + ADVANCED_MODE)) { String test = actionRequest.getParameter("test"); @@ -629,10 +630,6 @@ } private void renderConfigure(RenderRequest request, RenderResponse response, RealmData data) throws IOException, PortletException { - // Pass errors through - if (request.getParameter("LoginModuleError") != null) { - request.setAttribute("LoginModuleError", request.getParameter("LoginModuleError")); - } // Clear out any cached modules data.modules = null; // Configure option list Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties Tue Jun 2 17:00:57 2009 @@ -30,3 +30,17 @@ Plugins = Plugins Security\ Realms = Security Realms + +errorMsg01 = Deployment Failed + +errorMsg02 = The application was not successfully started + +errorMsg03 = Security realm with the same name already exists, please specify a new security realm name. + +errorMsg04 = Unable to identify modules to replace. Please check if it has already been stopped or undeployed. + +infoMsg01 = The application was successfully deployed. + +infoMsg02 = The application was successfully redeployed. + +infoMsg03 = The application was successfully started. Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=781081&view=auto ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld (added) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld Tue Jun 2 17:00:57 2009 @@ -0,0 +1,41 @@ + + + + + + + + 1.0 + 1.1 + pluto + http://portals.apache.org/pluto + + + commonMsg + + org.apache.geronimo.console.message.CommonMessageTag + + empty + + + + Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Jun 2 17:00:57 2009 @@ -22,7 +22,6 @@ - Portlet for deploying applications Deployment @@ -35,6 +34,9 @@ HELP en + zh + ja + portletinfo Install New Applications Install Application @@ -42,7 +44,6 @@ - Portlet for CAR Import/Export ImportExport @@ -54,6 +55,9 @@ VIEW en + zh + ja + portletinfo Install Plugins Install Plugins @@ -72,6 +76,9 @@ VIEW en + zh + ja + portletinfo Assemble Server Assemble Server @@ -90,6 +97,9 @@ VIEW en + zh + ja + portletinfo Create Plugin Create Plugin @@ -108,6 +118,9 @@ VIEW en + zh + ja + portletinfo Security Realms Security Realms Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp Tue Jun 2 17:00:57 2009 @@ -21,9 +21,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> -

- -

+

:

<% String[] configIds = request.getParameterValues("configId"); for(int j=0;j <%@ 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"%> @@ -32,24 +33,7 @@ } - - -
- ${abbrStatusMessage}
- - - -
- - - - - - +

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp Tue Jun 2 17:00:57 2009 @@ -154,12 +154,12 @@ size="20" value="${realm.options['jdbcPassword']}">

+ + + + - - - - Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=781081&r1=781080&r2=781081&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original) +++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Tue Jun 2 17:00:57 2009 @@ -21,6 +21,7 @@ <%@ 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"%> @@ -39,9 +40,9 @@ } -

+ -

Error: ${LoginModuleError}

 +

@@ -100,6 +101,10 @@ type="passwordtext" size="${optionMap[option].length}" value="${realm.options[option]}"> + + + + @@ -110,10 +115,6 @@ passwordFields = passwordFields.concat(new Array('option-${option}')) - - - -
Confirm password: