Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 52582 invoked from network); 7 Jan 2009 18:14:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jan 2009 18:14:40 -0000 Received: (qmail 6077 invoked by uid 500); 7 Jan 2009 18:14:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 6035 invoked by uid 500); 7 Jan 2009 18:14:40 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 6014 invoked by uid 99); 7 Jan 2009 18:14:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 10:14:40 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 18:14:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B8300238895D; Wed, 7 Jan 2009 10:14:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r732412 - in /geronimo/server/trunk/plugins/console: console-core/ console-jetty/src/main/history/ console-tomcat/src/main/history/ plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/ plugin-portlets/src/main/java/org/a... Date: Wed, 07 Jan 2009 18:14:14 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090107181415.B8300238895D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Wed Jan 7 10:14:14 2009 New Revision: 732412 URL: http://svn.apache.org/viewvc?rev=732412&view=rev Log: GERONIMO-4484 Extraction, localization and display of messages generated in portlets. Applied common-message-plugin.patch from Gang Yin, along with removing Tomcat API depends introduced in early patch. Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld (with props) Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-core/pom.xml (original) +++ geronimo/server/trunk/plugins/console/console-core/pom.xml Wed Jan 7 10:14:14 2009 @@ -78,9 +78,9 @@ - org.apache.tomcat - jsp-api - 6.0.18 + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + provided Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Wed Jan 7 10:14:14 2009 @@ -46,19 +46,4 @@ console-core jar - - org.apache.tomcat - jsp-api - jar - - - org.apache.tomcat - el-api - jar - - - org.apache.tomcat - servlet-api - jar - Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Wed Jan 7 10:14:14 2009 @@ -46,19 +46,4 @@ console-core jar - - org.apache.tomcat - jsp-api - jar - - - org.apache.tomcat - el-api - jar - - - org.apache.tomcat - servlet-api - jar - Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java Wed Jan 7 10:14:14 2009 @@ -154,7 +154,8 @@ String abbrStatusMessage; String fullStatusMessage = null; if(progress.getDeploymentStatus().isCompleted()) { - abbrStatusMessage = "The application was successfully "+(isRedeploy ? "re" : "")+"deployed.
"; + abbrStatusMessage = getLocalizedString(!isRedeploy ? "infoMsg01" : "infoMsg02", actionRequest); + addInfoMessage(actionRequest, abbrStatusMessage); // start installed app/s if (!isRedeploy && startApp != null && !startApp.equals("")) { progress = mgr.start(progress.getResultTargetModuleIDs()); @@ -162,18 +163,20 @@ Thread.sleep(100); } if (progress.getDeploymentStatus().isCompleted()) { - abbrStatusMessage += "The application was successfully started"; + abbrStatusMessage = getLocalizedString("infoMsg03", actionRequest); + addInfoMessage(actionRequest, abbrStatusMessage); } else { - abbrStatusMessage += "The application was not successfully started"; + abbrStatusMessage = getLocalizedString("errorMsg02", actionRequest); 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("errorMsg01", actionRequest); + addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage); // try to provide an upgraded version of the plan try { if (planFile != null && planFile.exists()) { @@ -200,10 +203,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(); @@ -264,8 +263,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/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Wed Jan 7 10:14:14 2009 @@ -200,8 +200,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"); @@ -590,10 +590,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/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties Wed Jan 7 10:14:14 2009 @@ -28,3 +28,13 @@ Plugins = Plugins Security\ Realms = Security Realms + +errorMsg01 = Deployment Failed + +errorMsg02 = The application was not successfully started + +infoMsg01 = The application was successfully deployed. + +infoMsg02 = The application was successfully redeployed. + +infoMsg03 = The application was successfully started. Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties Wed Jan 7 10:14:14 2009 @@ -28,3 +28,13 @@ Plugins = \u63D2\u4EF6 Security\ Realms = \u5B89\u5168\u57DF + +errorMsg01 = \u90E8\u7F72\u5931\u8D25 + +errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528 + +infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528 + +infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528 + +infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528 Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=732412&view=auto ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld (added) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld Wed Jan 7 10:14:14 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/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan 7 10:14:14 2009 @@ -22,7 +22,6 @@ - Portlet for deploying applications Deployment @@ -35,6 +34,8 @@ HELP en + zh + portletinfo Install New Applications Install Application @@ -55,6 +56,8 @@ HELP en + zh + portletinfo Install Plugins Install Plugins @@ -74,6 +77,8 @@ HELP en + zh + portletinfo Assemble Server Assemble Server @@ -93,6 +98,8 @@ HELP en + zh + portletinfo Create Plugin Create Plugin @@ -111,6 +118,8 @@ VIEW en + zh + portletinfo Security Realms Security Realms Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp Wed Jan 7 10:14:14 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,23 +33,7 @@ } - - -
- ${abbrStatusMessage}
- - - -
- - - - - +

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp Wed Jan 7 10:14:14 2009 @@ -154,12 +154,12 @@ size="20" value="${realm.options['jdbcPassword']}"> + + + +

- - - - Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=732412&r1=732411&r2=732412&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original) +++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Wed Jan 7 10:14:14 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]}"> + + + ${optionMap[option].description} +
:
@@ -110,10 +115,6 @@ passwordFields = passwordFields.concat(new Array('option-${option}')) - - - ${optionMap[option].description} -