geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r732459 - in /geronimo/server/trunk: plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ plugins/activemq/activemq-portlets/src/main/resources/ plugins/activemq/activemq-portlets/src/main/webapp/W...
Date Wed, 07 Jan 2009 20:09:20 GMT
Author: dwoods
Date: Wed Jan  7 12:09:19 2009
New Revision: 732459

URL: http://svn.apache.org/viewvc?rev=732459&view=rev
Log:
GERONIMO-4484 Extraction, localization and display of messages generated in portlets.  Applied common-message-openejb.patch, common-message-activemq.patch, common-message-debugviews.patch, common-message-plancreator.patch and common-message-sysdb.patch from Gang Yin.  Also updated 2 console-testsuite DB tests to match modified message strings.

Added:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld   (with props)
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/CommonMsg.tld   (with props)
    geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/CommonMsg.tld   (with props)
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/CommonMsg.tld   (with props)
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/CommonMsg.tld   (with props)
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/sendMessage.jsp
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo_zh.properties
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Wed Jan  7 12:09:19 2009
@@ -47,6 +47,7 @@
 import org.apache.geronimo.connector.deployment.jsr88.ResourceAdapter;
 import org.apache.geronimo.connector.deployment.jsr88.ResourceAdapterInstance;
 import org.apache.geronimo.connector.deployment.jsr88.SinglePool;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.jmsmanager.ManagementHelper;
@@ -81,7 +82,6 @@
     protected final static String SEND_MESSAGE="sendmessage";
     protected final static String ADMIN_OBJ_NAME = "adminObjName";
     protected final static String ADMIN_OBJ_TYPE = "adminObjType";
-    protected final static String STATUS = "status";
     protected final static String SUBMIT = "submit";
     protected final static String CORRELATION_ID = "correlationId";
     protected final static String PURGE = "purge";
@@ -115,6 +115,10 @@
     public AbstractHandler(String mode, String viewName) {
         super(mode, viewName);
     }
+    
+    public AbstractHandler(String mode, String viewName, BasePortlet portlet) {
+        super(mode, viewName, portlet);
+    }
 
     public static class JMSResourceData implements MultiPageModel {
         private String rarURI;

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java Wed Jan  7 12:09:19 2009
@@ -42,7 +42,7 @@
         addHelper(new ReviewHandler(), config);
         addHelper(new ViewMessageHandler(), config);
         addHelper(new MessageDetailsHandler(), config);
-        addHelper(new SendMessageHandler(), config);
+        addHelper(new SendMessageHandler(this), config);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java Wed Jan  7 12:09:19 2009
@@ -28,6 +28,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.jmsmanager.JMSMessageInfo;
 import org.apache.geronimo.console.jmsmanager.helper.AmqJMSMessageHelper;
@@ -40,8 +41,8 @@
 public class SendMessageHandler extends AbstractHandler {
     private static final Logger log = LoggerFactory.getLogger(SendMessageHandler.class);
 
-    public SendMessageHandler() {
-        super(SEND_MESSAGE, "/WEB-INF/view/jmsmanager/sendMessage.jsp");
+    public SendMessageHandler(BasePortlet portlet) {
+        super(SEND_MESSAGE, "/WEB-INF/view/jmsmanager/sendMessage.jsp", portlet);
     }
 
     @Override
@@ -131,10 +132,10 @@
             JMSMessageHelper helper = JMSMessageHelperFactory.getMessageHelper(request, adapterObjectName);
             try {
                 helper.sendMessage(request, messageInfo);
-                request.setAttribute(STATUS, "success");
+                portlet.addInfoMessage(request, portlet.getLocalizedString("infoMsg01", request));
             } catch (Exception e) {
-                request.setAttribute(STATUS, "error");
-                log.error("Failed to render view", e);
+                portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg01", request), e.getMessage());
+                log.error("Error encountered while sending message.", e);
                 // throw new PortletException(e);
             }
         }

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties Wed Jan  7 12:09:19 2009
@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 JMS\ Network\ Listeners = JMS Network Listeners
 
 JMS\ Resources = JMS Resources
@@ -21,3 +22,7 @@
 JMS\ Server = JMS Server
 
 JMS\ Server\ Manager = JMS Server Manager
+
+errorMsg01 = Error encountered while sending message.
+
+infoMsg01 = Message sent successfully.

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties Wed Jan  7 12:09:19 2009
@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 JMS\ Network\ Listeners = JMS\u7F51\u7EDC\u76D1\u542C\u5668
 
 JMS\ Resources = JMS\u8D44\u6E90
@@ -21,3 +22,7 @@
 JMS\ Server = JMS\u670D\u52A1\u5668
 
 JMS\ Server\ Manager = JMS\u670D\u52A1\u5668\u7BA1\u7406
+
+errorMsg01 = \u53D1\u9001\u6D88\u606F\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+infoMsg01 = \u6210\u529F\u53D1\u9001\u6D88\u606F\u3002

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

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

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 12:09:19 2009
@@ -34,6 +34,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>JMS Server Manager</title>
             <short-title>JMS Servers</short-title>
@@ -53,6 +55,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>JMS Network Listeners</title>
             <short-title>JMS Listeners</short-title>
@@ -71,6 +75,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>JMS Resources</title>
             <short-title>JMS Resources</short-title>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/sendMessage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/sendMessage.jsp?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/sendMessage.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/sendMessage.jsp Wed Jan  7 12:09:19 2009
@@ -17,18 +17,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ 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="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>  
 <fmt:setBundle basename="activemq"/> 
 <portlet:defineObjects/>
 
-<c:choose>
-	<c:when test="${status == 'error'}">
-		<p><fmt:message key="jmsmanager.sendmessage.error" /></p>
-	</c:when>
-	<c:when test="${status == 'success'}">
-		<p><fmt:message key="jmsmanager.sendmessage.success" /></p>
-	</c:when>
-</c:choose>
+<CommonMsg:commonMsg/><br>
+
 <!-- <p><fmt:message key="jmsmanager.sendmessage.title" /></p> -->
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->

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

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

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 12:09:19 2009
@@ -34,6 +34,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>ClassLoader Viewer</title>
             <short-title>classloaderviewer</short-title>
@@ -52,6 +54,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Dependency Viewer</title>
             <short-title>dependencyviewer</short-title>
@@ -70,6 +74,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>JMX Viewer</title>
             <short-title>jmxviewer</short-title>
@@ -88,6 +94,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>JNDI Viewer</title>
             <short-title>jndiviewer</short-title>
@@ -106,6 +114,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>LDAP Viewer</title>
             <short-title>ldapviewer</short-title>

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

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

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 12:09:19 2009
@@ -38,6 +38,8 @@
         </supports>
 
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
 
         <portlet-info>
             <title>EJB Server</title>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java Wed Jan  7 12:09:19 2009
@@ -22,6 +22,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.configcreator.configData.EARConfigData;
@@ -88,17 +89,13 @@
 
     protected final static String SELECTED_LIBS_PARAMETER = "selectedLibs";
 
-    protected final static String DEPLOY_ABBR_STATUS_PARAMETER = "abbrStatusMessage";
-
-    protected final static String DEPLOY_FULL_STATUS_PARAMETER = "fullStatusMessage";
-
-    protected final static String ARCHIVE_NOT_SUPPORTED_PARAMETER = "archiveNotSupported";
-
-    protected final static String REFERENCE_NOT_RESOLVED_PARAMETER = "referenceNotResolved";
-
     public AbstractHandler(String mode, String viewName) {
         super(mode, viewName);
     }
+    
+    public AbstractHandler(String mode, String viewName, BasePortlet portlet) {
+        super(mode, viewName, portlet);
+    }
 
     public static class TempConfigModel implements MultiPageModel {
         public TempConfigModel(PortletRequest request) {

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java Wed Jan  7 12:09:19 2009
@@ -30,13 +30,13 @@
 public class CreatePlanPortlet extends MultiPagePortlet {
     public void init(PortletConfig config) throws PortletException {
         super.init(config);
-        addHelper(new GetArchiveHandler(), config);
+        addHelper(new GetArchiveHandler(this), config);
         addHelper(new EnvironmentHandler(), config);
-        addHelper(new ReferencesHandler(), config);
+        addHelper(new ReferencesHandler(this), config);
         addHelper(new SecurityHandler(), config);
         addHelper(new DependenciesHandler(), config);
         addHelper(new DisplayPlanHandler(), config);
-        addHelper(new DeployStatusHandler(), config);
+        addHelper(new DeployStatusHandler(this), config);
         addHelper(new EjbHandler(), config);
         addHelper(new EARHandler(), config);
     }

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java Wed Jan  7 12:09:19 2009
@@ -30,6 +30,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.configcreator.configData.WARConfigData;
 
@@ -41,8 +42,8 @@
 public class DeployStatusHandler extends AbstractHandler {
     private static final Logger log = LoggerFactory.getLogger(DeployStatusHandler.class);
 
-    public DeployStatusHandler() {
-        super(DEPLOY_STATUS_MODE, "/WEB-INF/view/configcreator/deployStatus.jsp");
+    public DeployStatusHandler(BasePortlet portlet) {
+        super(DEPLOY_STATUS_MODE, "/WEB-INF/view/configcreator/deployStatus.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model)
@@ -63,8 +64,12 @@
             out.close();
 
             String[] status = JSR88_Util.deploy(request, moduleFile, planFile);
-            request.setAttribute(DEPLOY_ABBR_STATUS_PARAMETER, status[0]);
-            request.setAttribute(DEPLOY_FULL_STATUS_PARAMETER, status[1]);
+            if (null != status[1] && 0 != status[1].length()) {
+                portlet.addErrorMessage(request, portlet.getLocalizedString(status[0], request), status[1]);
+            }
+            else {
+                portlet.addInfoMessage(request, portlet.getLocalizedString(status[0], request));
+            }
         } catch (URISyntaxException e) {
             log.error(e.getMessage(), e);
         }

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java Wed Jan  7 12:09:19 2009
@@ -28,6 +28,7 @@
 import org.apache.commons.fileupload.FileItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.configcreator.configData.EARConfigData;
 import org.apache.geronimo.console.configcreator.configData.EjbConfigData;
@@ -45,8 +46,8 @@
 public class GetArchiveHandler extends AbstractHandler {
     private static final Logger log = LoggerFactory.getLogger(GetArchiveHandler.class);
 
-    public GetArchiveHandler() {
-        super(GET_ARCHIVE_MODE, "/WEB-INF/view/configcreator/getArchive.jsp");
+    public GetArchiveHandler(BasePortlet portlet) {
+        super(GET_ARCHIVE_MODE, "/WEB-INF/view/configcreator/getArchive.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model)
@@ -56,9 +57,6 @@
 
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model)
             throws PortletException, IOException {
-        if ("true".equals(request.getParameter(ARCHIVE_NOT_SUPPORTED_PARAMETER))) {
-            request.setAttribute(ARCHIVE_NOT_SUPPORTED_PARAMETER, "true");
-        }
     }
 
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model)
@@ -86,7 +84,7 @@
                 return EJB_MODE + "-before";
             }
         }
-        response.setRenderParameter(ARCHIVE_NOT_SUPPORTED_PARAMETER, "true");
+        portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg01", request));
         return getMode();
     }
 

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java Wed Jan  7 12:09:19 2009
@@ -132,25 +132,16 @@
                     Thread.sleep(100);
                 }
 
-                String abbrStatusMessage;
-                String fullStatusMessage = null;
                 if (progress.getDeploymentStatus().isCompleted()) {
-                    abbrStatusMessage = "The application was successfully deployed.<br/>";
-                    // start installed app/s
                     progress = mgr.start(progress.getResultTargetModuleIDs());
                     while (progress.getDeploymentStatus().isRunning()) {
                         Thread.sleep(100);
                     }
-                    abbrStatusMessage += "The application was successfully started";
+                    statusMsgs[0] = "infoMsg01";
                 } 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:<br/>"
-                            + fullStatusMessage.substring(0, fullStatusMessage.indexOf('\n'));
+                    statusMsgs[0] = "errorMsg02";
+                    statusMsgs[1] = progress.getDeploymentStatus().getMessage();
                 }
-                statusMsgs[0] = abbrStatusMessage;
-                statusMsgs[1] = fullStatusMessage;
             } finally {
                 mgr.release();
             }

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java Wed Jan  7 12:09:19 2009
@@ -26,6 +26,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.console.configcreator.configData.WARConfigData;
 
@@ -37,8 +38,8 @@
 public class ReferencesHandler extends AbstractHandler {
     private static final Logger log = LoggerFactory.getLogger(ReferencesHandler.class);
 
-    public ReferencesHandler() {
-        super(REFERENCES_MODE, "/WEB-INF/view/configcreator/references.jsp");
+    public ReferencesHandler(BasePortlet portlet) {
+        super(REFERENCES_MODE, "/WEB-INF/view/configcreator/references.jsp", portlet);
     }
 
     public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model)
@@ -62,6 +63,7 @@
         WARConfigData data = getWARSessionData(request);
         data.readReferencesData(request);
         if (data.isReferenceNotResolved()) {
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg03", request));
             return getMode() + "-before";
         }
         if (data.getSecurity() != null) {

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties Wed Jan  7 12:09:19 2009
@@ -14,5 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 Create\ Deployment\ Plan = Create Deployment Plan
+
 Plan\ Creator = Plan Creator
+
+errorMsg01 = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+
+errorMsg02 = Deployment failed.
+
+errorMsg03 = Some of the references are not resolved. Please resolve them and only then press Next button.
+
+infoMsg01 = The application was successfully deployed.<br/>The application was successfully started.

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo_zh.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo_zh.properties Wed Jan  7 12:09:19 2009
@@ -14,5 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 Create\ Deployment\ Plan = \u521B\u5EFA\u90E8\u7F72\u89C4\u5212
+
 Plan\ Creator = \u521B\u5EFA\u89C4\u5212
+
+errorMsg01 = \u60A8\u63D0\u4F9B\u7684\u5F52\u6863\u6587\u4EF6\u4E0D\u662F\u4E00\u4E2AWAR\u5305. \u8BF7\u6CE8\u610F\u5F53\u524D\u53EA\u652F\u6301WAR\u7C7B\u578B.
+
+errorMsg02 = \u90E8\u7F72\u5931\u8D25\u3002
+
+errorMsg03 = \u90E8\u5206\u5F15\u7528\u672A\u80FD\u88AB\u89E3\u6790, \u8BF7\u624B\u52A8\u89E3\u6790\u540E\u70B9\u51FB\u4E0B\u4E00\u6B65\u6309\u94AE\u3002
+
+infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528\u3002<br/>\u6210\u529F\u542F\u52A8\u5E94\u7528\u3002

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

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

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 12:09:19 2009
@@ -37,6 +37,8 @@
         </supports>
 
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
 
         <portlet-info>
             <title>Create Deployment Plan</title>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp Wed Jan  7 12:09:19 2009
@@ -20,42 +20,11 @@
 <%@ 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="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<script>
-// toggle the display state of an element
-function <portlet:namespace/>toggleDisplay(id) {
-  var element = document.getElementById("<portlet:namespace/>"+id);
-  if (element.style.display == 'inline') {
-      element.style.display='none';
-  } else {
-      element.style.display='inline';
-  }
-}
-</script>
-
-<!-- Abbreviated status message -->
-<c:if test="${!(empty abbrStatusMessage)}">
-    <div id="<portlet:namespace/>abbrStatusMessage" style="display:inline">
-     ${abbrStatusMessage}<br/>
-    <c:if test="${!(empty fullStatusMessage)}">
-    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return false;"><fmt:message key="plancreator.status.detail"/></button>
-    </c:if>
-    </div>
-</c:if>
-<!-- Full status message -->
-<c:if test="${!(empty fullStatusMessage)}">
-    <div id="<portlet:namespace/>fullStatusMessage" style="display:none">
-    <pre>
-<c:out escapeXml="true" value="${fullStatusMessage}"/>
-    </pre>
-    </div>
-</c:if>
-
-<c:if test="${empty fullStatusMessage}">
-<p><a href="/${data.webApp.contextRoot}"><fmt:message key="plancreator.status.launch"/></a></p>
-</c:if>
+<CommonMsg:commonMsg/>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp Wed Jan  7 12:09:19 2009
@@ -20,13 +20,11 @@
 <%@ 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="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<!-- Archive uploaded is not a WAR -->
-<c:if test="${!(empty archiveNotSupported)}">
-  <br /><fmt:message key="plancreator.archive.archiveErr"/> <br /> <br />
-</c:if>
+<CommonMsg:commonMsg/><br>
 
 <form enctype="multipart/form-data" name="<portlet:namespace/>GetArchiveForm" action="<portlet:actionURL/>" method="POST">
   <input type="hidden" name="mode" value="index-after" />

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp Wed Jan  7 12:09:19 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" %>
 <fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
@@ -128,15 +129,12 @@
 }
 </script>
 
+<CommonMsg:commonMsg/>
+
 <p><fmt:message key="plancreator.reference.title"/></p>
 
 <p><fmt:message key="plancreator.reference.desc"/></p>
 
-<!-- References not resolved -->
-<c:if test="${data.referenceNotResolved}">
-  <p><fmt:message key="plancreator.reference.resolveErr"/>
-</c:if>
-
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>ReferencesForm" action="<portlet:actionURL/>" method="POST">
 <input type="hidden" name="mode" value="references-after" />

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java Wed Jan  7 12:09:19 2009
@@ -20,22 +20,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.MessageFormat;
 import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-public class RunSQLHelper {
-
-    private static final Logger log = LoggerFactory.getLogger(RunSQLHelper.class);
+import javax.portlet.PortletRequest;
 
-    public static final String SQL_SUCCESS_MSG = "SQL command/s successful";
+import org.apache.geronimo.console.BasePortlet;
 
-    public static final String SQL_EMPTY_MSG = "SQL Command/s can't be empty";
-
-    private static final String DB_CREATED_MSG = "Database created";
+public class RunSQLHelper {
 
-    private static final String DB_DELETED_MSG = "Database deleted";
+    private static final Logger log = LoggerFactory.getLogger(RunSQLHelper.class);
 
     private static final String DERBY_BACKUP_FOLDER = "derby.backup";
 
@@ -44,20 +41,23 @@
     private static final String BAK_EXTENSION = ".bak";
 
     private static final String BAK_PREFIX = "BAK_";
+    
+    private final BasePortlet portlet;
 
-    public String createDB(String dbName) {
-        String result = DB_CREATED_MSG + ": " + dbName;
-
+    public RunSQLHelper (BasePortlet portlet) {
+        this.portlet = portlet;
+    }
+    
+    public boolean createDB(String dbName, PortletRequest request) {
         Connection conn = null;
         try {
             conn = DerbyConnectionUtil.getDerbyConnection(dbName,
                     DerbyConnectionUtil.CREATE_DB_PROP);
+            portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString("infoMsg01", request), dbName));
+            return true;
         } catch (Throwable e) {
-            if (e instanceof SQLException) {
-                result = getSQLError((SQLException) e);
-            } else {
-                result = e.getMessage();
-            }
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg01", request), e.getMessage());
+            return false;
         } finally {
             // close DB connection
             try {
@@ -65,29 +65,24 @@
                     conn.close();
                 }
             } catch (SQLException e) {
-                result = "Problem closing DB connection";
+                portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg02", request), e.getMessage());
             }
-        }
-
-        return result;
+        }        
     }
 
-    public String backupDB(String derbyHome, String dbName) {
-        return "";
+    public boolean backupDB(String derbyHome, String dbName, PortletRequest request) {
+        return false;
     }
 
-    public String restoreDB(String derbyHome, String dbName) {
-        return "";
+    public boolean restoreDB(String derbyHome, String dbName, PortletRequest request) {
+        return false;
     }
 
-    public String deleteDB(String derbyHome, String dbName) {
-        String result = DB_DELETED_MSG + ": " + dbName;
-
+    public boolean deleteDB(String derbyHome, String dbName, PortletRequest request) {
         // shutdown database before deleting it
         if (!shutdownDB(dbName)) {
-            result = "Database not deleted: " + dbName
-                    + " Couldn't shutdown db: " + dbName;
-            return result;
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg03", request));
+            return false;
         }
 
         try {
@@ -96,10 +91,8 @@
                     + PARENT_FOLDER + File.separatorChar + DERBY_BACKUP_FOLDER);
             if (!derbyBackupFolder.exists()) {
                 if (!derbyBackupFolder.mkdirs()) {
-                    result = "Database not deleted: " + dbName
-                            + " Derby backup folder not created: "
-                            + derbyBackupFolder;
-                    return result;
+                    portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg04", request));
+                    return false;
                 }
             }
 
@@ -118,29 +111,26 @@
                     if (newDBFolder.mkdirs()) {
                         if (!oldDBFolder.renameTo(new File(newDBFolder,
                                 oldDBFolder.getName()))) {
-                            result = "Database not deleted: " + dbName
-                                    + " DB folder not renamed";
-                            return result;
+                            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg05", request));
+                            return false;
                         }
                     }
                 }
             }
+            portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString("infoMsg02", request), dbName));
+            return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg06", request), e.getMessage());
+            return false;
         }
-
-        return result;
     }
 
-    public String runSQL(String connName, String sql, Boolean dsConn) {
-        String result = SQL_SUCCESS_MSG;
-
+    public boolean runSQL(String connName, String sql, Boolean dsConn, PortletRequest request) {
         if ((sql == null) || (sql.trim().length() == 0)) {
-            result = SQL_EMPTY_MSG;
-            return result;
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg07", request));
+            return false;
         }
         
-
         Connection conn = null;
         Statement s = null;
         try {
@@ -161,12 +151,11 @@
                 }
             }
             conn.commit();
+            portlet.addInfoMessage(request, portlet.getLocalizedString("infoMsg03", request));
+            return true;
         } catch (Throwable e) {
-            if (e instanceof SQLException) {
-                result = getSQLError((SQLException) e);
-            } else {
-                result = e.getMessage();
-            }
+            portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg08", request), e.getMessage());
+            return false;
         } finally {
             // close DB connection
             try {
@@ -177,13 +166,9 @@
                     conn.close();
                 }
             } catch (SQLException e) {
-                if (SQL_SUCCESS_MSG.equals(result)) {
-                    result = "Problem closing DB connection: " + e.getMessage();
-                }
+                portlet.addErrorMessage(request, portlet.getLocalizedString("errorMsg02", request), e.getMessage());
             }
         }
-
-        return result;
     }
 
     private boolean shutdownDB(String dbName) {
@@ -204,23 +189,4 @@
         return ok;
     }
 
-    private String getSQLError(SQLException e) {
-        StringBuffer errorMsg = new StringBuffer();
-        while (e != null) {
-            //errorMsg.append(e.toString());
-            errorMsg.append(e.getMessage());
-            errorMsg.append(" * ");
-            e = e.getNextException();
-        }
-
-        return errorMsg.toString();
-    }
-
-    public static void main(String[] args) {
-        new RunSQLHelper().runSQL("derbyDB4",
-                "create table derbyTbl1(num int, addr varchar(40));"
-                        + "create table derbyTbl2(num int, addr varchar(40));"
-                        + "create table derbyTbl3(num int, addr varchar(40));"
-                        + "insert into derb", false);
-    }
 }

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java Wed Jan  7 12:09:19 2009
@@ -53,10 +53,10 @@
 
     private static final String DATABASE_MODE = "database";
 
-    private static RunSQLHelper sqlHelper = new RunSQLHelper();
-
     private static DBViewerHelper dbHelper = new DBViewerHelper();
 
+    private RunSQLHelper sqlHelper;
+    
     private PortletRequestDispatcher normalView;
 
     private PortletRequestDispatcher maximizedView;
@@ -80,10 +80,10 @@
     private String restoreDB;
 
     private String sqlStmts;
-
-    private String actionResult;
     
     private String connectionMode;  // either datasource or database
+    
+    private boolean actionResult;
 
     public void processAction(ActionRequest actionRequest,
             ActionResponse actionResponse) throws PortletException, IOException {
@@ -95,17 +95,16 @@
         backupDB = actionRequest.getParameter("backupDB");
         restoreDB = actionRequest.getParameter("restoreDB");
         sqlStmts = actionRequest.getParameter("sqlStmts");
-        actionResult = "";
         if (CREATEDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.createDB(createDB);
+            sqlHelper.createDB(createDB, actionRequest);
         } else if (DELETEDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.deleteDB(DerbyConnectionUtil.getDerbyHome(), deleteDB);
+            sqlHelper.deleteDB(DerbyConnectionUtil.getDerbyHome(), deleteDB, actionRequest);
         } else if (RUNSQL_ACTION.equals(action)) {
-            actionResult = sqlHelper.runSQL(useDB, sqlStmts, RunSQLPortlet.DATASOURCE_MODE.equals(connectionMode));
+            actionResult = sqlHelper.runSQL(useDB, sqlStmts, RunSQLPortlet.DATASOURCE_MODE.equals(connectionMode), actionRequest);
         } else if (BACKUPDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.backupDB(DerbyConnectionUtil.getDerbyHome(), backupDB);
+            sqlHelper.backupDB(DerbyConnectionUtil.getDerbyHome(), backupDB, actionRequest);
         } else if (RESTOREDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.restoreDB(DerbyConnectionUtil.getDerbyHome(), restoreDB);
+            sqlHelper.restoreDB(DerbyConnectionUtil.getDerbyHome(), restoreDB, actionRequest);
         }
     }
 
@@ -127,20 +126,15 @@
             // check if it's a single Select statement
             if ((sqlStmts != null) && (sqlStmts.trim().indexOf(';') == -1)
                     && sqlStmts.trim().toUpperCase().startsWith("SELECT")
-                    && RunSQLHelper.SQL_SUCCESS_MSG.equals(actionResult)) {
+                    && actionResult) {
                 singleSelectStmt = sqlStmts.trim();
-                // set action result to blank so it won't display
-                actionResult = "";
             } else {
                 singleSelectStmt = "";
             }
-            renderRequest
-                    .setAttribute("singleSelectStmt", singleSelectStmt);
-            renderRequest.setAttribute("ds", DerbyConnectionUtil
-                    .getDataSource(useDB));
+            renderRequest.setAttribute("singleSelectStmt", singleSelectStmt);
+            renderRequest.setAttribute("ds", DerbyConnectionUtil.getDataSource(useDB));
         }
         if ((action != null) && (action.trim().length() > 0)) {
-            renderRequest.setAttribute("actionResult", actionResult);
             //set action to null so that subsequent renders of portlet
             // won't display
             //action result if there is no action to process
@@ -175,6 +169,7 @@
         } else {
             connectionMode = RunSQLPortlet.DATABASE_MODE;
         }
+        sqlHelper = new RunSQLHelper(this);
     }
 
     public void destroy() {

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties Wed Jan  7 12:09:19 2009
@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 DB\ Info = DB Info
 
 DB\ Manager = DB Manager
@@ -27,3 +28,25 @@
 Embedded\ DB = Embedded DB
 
 Run\ SQL = Run SQL
+
+errorMsg01 = Error encountered while creating database.
+
+errorMsg02 = Error encountered while closing database connection.
+
+errorMsg03 = Error encountered while shutting down database.
+
+errorMsg04 = Error encountered while backing up database.
+
+errorMsg05 = Error encountered while renaming database folder.
+
+errorMsg06 = Error encountered while deleting database.
+
+errorMsg07 = SQL command can't be empty.
+
+errorMsg08 = Error encountered while executing SQL command(s).
+
+infoMsg01 = Database created: <b>{0}</b>.
+
+infoMsg02 = Database deleted: <b>{0}</b>.
+
+infoMsg03 = SQL command(s) executed successfully.

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties Wed Jan  7 12:09:19 2009
@@ -14,6 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 DB\ Info = \u6570\u636E\u5E93\u4FE1\u606F
 
 DB\ Manager = \u6570\u636E\u5E93\u7BA1\u7406
@@ -27,3 +28,25 @@
 Embedded\ DB = \u5185\u7F6E\u6570\u636E\u5E93
 
 Run\ SQL = \u8FD0\u884CSQL
+
+errorMsg01 = \u521B\u5EFA\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg02 = \u5173\u95ED\u6570\u636E\u5E93\u8FDE\u63A5\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg03 = \u5173\u95ED\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg04 = \u5907\u4EFD\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg05 = \u91CD\u547D\u540D\u6570\u636E\u5E93\u6587\u4EF6\u5939\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg06 = \u5220\u9664\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+errorMsg07 = \u7A7ASQL\u547D\u4EE4\u3002
+
+errorMsg08 = \u6267\u884CSQL\u547D\u4EE4\u65F6\u9047\u5230\u9519\u8BEF\u3002
+
+infoMsg01 = \u5DF2\u521B\u5EFA\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
+
+infoMsg02 = \u5DF2\u5220\u9664\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
+
+infoMsg03 = SQL\u547D\u4EE4\u6267\u884C\u6210\u529F\u3002

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

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

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  7 12:09:19 2009
@@ -34,6 +34,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>DB Info</title>
             <short-title>DB Info</short-title>
@@ -53,6 +55,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>DB Viewer</title>
             <short-title>DB Viewer</short-title>
@@ -72,6 +76,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Derby Log Viewer</title>
             <short-title>Derby Log Viewer</short-title>
@@ -91,6 +97,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Run SQL</title>
             <short-title>Run SQL</short-title>
@@ -114,6 +122,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Run SQL</title>
             <short-title>Run SQL</short-title>
@@ -136,6 +146,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Database Pools</title>
             <short-title>Database Pools</short-title>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Wed Jan  7 12:09:19 2009
@@ -19,6 +19,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
 <fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
@@ -44,6 +45,8 @@
 }
 </script>
 
+<CommonMsg:commonMsg/><br>
+
 <form name="<portlet:namespace/>DBForm" action="<portlet:actionURL portletMode='view'/>" method="post">
 <input type="hidden" name="action" value="" />
 <table width="100%"  border="0">
@@ -99,14 +102,6 @@
   </tr>
 </table>
 
-<%-- Display action result --%>
-<c:if test="${!empty actionResult}">
-  <fmt:message key="internaldb.common.result"/>:
-  <hr>
-  <c:out value="${actionResult}" />
-  <hr>
-</c:if>
-
 <table width="100%"  border="0">
   <tr>
     <td></td>

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java Wed Jan  7 12:09:19 2009
@@ -57,6 +57,6 @@
         selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
         selenium.click("//input[@value = 'Run SQL']");
         waitForPageLoad();
-        assertTrue(selenium.isTextPresent("SQL command/s successful"));
+        assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
     }
 }

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=732459&r1=732458&r2=732459&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Wed Jan  7 12:09:19 2009
@@ -56,7 +56,7 @@
         selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
         selenium.click("//input[@value = 'Run SQL']");
         waitForPageLoad();
-        assertTrue(selenium.isTextPresent("SQL command/s successful"));
+        assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
     }
 
     /*



Mime
View raw message