geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r781081 [4/4] - in /geronimo/server/branches/2.1: plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/ plugins/console/console-base-portl...
Date Tue, 02 Jun 2009 17:01:01 GMT
Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties Tue Jun  2 17:00:57 2009
@@ -16,3 +16,73 @@
 #=====================================================================
 
 Monitoring = Monitoring
+
+errorMsg01 = Failed to create a connection to server.
+
+errorMsg02 = Server with server_id = <b>{0}</b> could not be enabled.
+
+errorMsg03 = Server with server_id = <b>{0}</b> could not be disabled.
+
+errorMsg04 = DATABASE ERROR:
+
+errorMsg05 = Unable to connect to server <b>{0}</b>.
+
+errorMsg06 = MBean <b>{0}</b> could <b>NOT</b> be tracked on server <b>{1}</b>.
+
+errorMsg07 = MBean <b>{0}</b> could <b>NOT</b> be removed from tracking on server <b>{1}</b>.
+
+errorMsg08 = Server id <b>{0}</b> not found in database.
+
+errorMsg09 = Snapshot thread could <b>NOT</b> be stopped on server <b>{0}</b>.
+
+errorMsg10 = Snapshot thread could <b>NOT</b> be started on server <b>{0}</b>.
+
+errorMsg11 = Error encountered while updating view <b>{0}</b>.
+
+errorMsg12 = Error encountered while adding view <b>{0}</b>.
+
+errorMsg13 = Error encountered while updating server.
+
+errorMsg14 = Error encountered while adding server.
+
+errorMsg15 = Error encountered while deleting server.
+
+errorMsg16 = Error encountered while deleting view.
+
+errorMsg17 = Error encountered while adding graph.
+
+errorMsg18 = Error encountered while updating graph.
+
+errorMsg19 = Error encountered while deleting graph.
+
+infoMsg01 = Connection was successfully established.
+
+infoMsg02 = Server <b>{0}</b> was successfully enabled.
+
+infoMsg03 = Server <b>{0}</b> was successfully disabled.
+
+infoMsg04 = MBean <b>{0}</b> tracking on server <b>{1}</b>.
+
+infoMsg05 = MBean <b>{0}</b> removed from tracking on server <b>{1}</b>.
+
+infoMsg06 = Snapshot thread stopped on server <b>{0}</b>.
+
+infoMsg07 = Snapshot thread started on server <b>{0}</b>.
+
+infoMsg08 = View <b>{0}</b> has been updated.
+
+infoMsg09 = View <b>{0}</b> has been added.
+
+infoMsg10 = Server has been updated.
+
+infoMsg11 = Server <b>{0}</b> at <b>{1}</b> has been added.
+
+infoMsg12 = Server and associated graphs have been deleted.
+
+infoMsg13 = View has been deleted.
+
+infoMsg14 = Graph <b>{0}</b> has been added.
+
+infoMsg15 = Graph <b>{0}</b> has been updated.
+
+infoMsg16 = Graph <b>{0}</b> has been deleted.
\ No newline at end of file

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

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/CommonMsg.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/portlet.xml?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/portlet.xml Tue Jun  2 17:00:57 2009
@@ -34,6 +34,10 @@
             <portlet-mode>HELP</portlet-mode>
             <portlet-mode>EDIT</portlet-mode>
         </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Monitoring</title>
         </portlet-info>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph"%>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder"%>
 <%@ page import="java.util.Set"%>
@@ -36,7 +37,6 @@
 <portlet:defineObjects />
 
 <%
-            String message = (String) request.getAttribute("message");
             String mbean = (String) request.getAttribute("mbean");
             String dataname1 = (String) request.getAttribute("dataname");
             String server_id = (String) request.getAttribute("server_id");
@@ -52,8 +52,6 @@
             ArrayList<String> serverNames = new ArrayList<String>();
             Long snapshotDuration = 5L;
 
-            if (message == null)
-                message = new String("");
             if (mbean == null)
                 mbean = new String("");
             if (dataname1 == null)
@@ -414,14 +412,9 @@
 //-->
 </script>
 <!-- </head> -->
-<%
-if (!message.equals("")) {
-%>
-<div align="left" style="width: 500px"><%=message%><br>
-</div>
-<%
-}
-%>
+
+<CommonMsg:commonMsg/><br>
+
 <table>
 	<tr>
 		<!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -35,7 +36,6 @@
 
 <%
 
-String message = (String) request.getAttribute("message");
 String name = (String) request.getAttribute("name");
 String ip = (String) request.getAttribute("ip");
 String username = (String) request.getAttribute("username");
@@ -44,7 +44,6 @@
 String port = (String) request.getAttribute("port");
 String protocol = (String) request.getAttribute("protocol");
 
-if(message == null)     message = "";
 if(name == null)        name = "";
 if(ip == null)          ip = "";
 if(username == null)    username = "";
@@ -111,14 +110,8 @@
 </script>
 <!-- </head> -->
         
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 500px">
-<%=message %></b><br>
-</div>
-<%} %>
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -34,15 +35,6 @@
 <fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
-<%
-
-String message = (String) request.getAttribute("message");
-
-
-if (message == null)
-    message = new String("");
-
-%>
 <!-- <head> -->
     <script type='text/javascript' src='/dojo/dojo.js'>
     </script>
@@ -72,14 +64,8 @@
 </script>
 <!-- </head> -->
         
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 650px">
-<%=message %><br>
-</div>
-<%} %>
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -38,16 +39,11 @@
 <%
 
 String graph_id = (String) request.getAttribute("graph_id");
-String message = (String) request.getAttribute("message");
 
 DBManager DBase = new DBManager();
 Connection con = DBase.getConnection();
 
 
-if (message == null)
-    message = new String("");
-
-
 PreparedStatement pStmt = con.prepareStatement("SELECT * FROM graphs WHERE graph_id="+graph_id);
 ResultSet rs = pStmt.executeQuery();
 
@@ -442,14 +438,8 @@
 </script>
 <!-- </head> -->
         
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 500px">
-<%=message %><br>
-</div>
-<%} %>
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp Tue Jun  2 17:00:57 2009
@@ -19,6 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -41,7 +42,6 @@
 
 String server_id = (String) request.getAttribute("server_id");
 
-String message = (String) request.getAttribute("message");
 String name = (String) request.getAttribute("name");
 String ip = (String) request.getAttribute("ip");
 String username = (String) request.getAttribute("username");
@@ -51,7 +51,6 @@
 String retention = (String) request.getAttribute("retention");
 String port = (String)request.getAttribute("port");
 String protocol = (String) request.getAttribute("protocol");
-if(message == null)     message = "";
 if(name == null)        name = "";
 if(ip == null)          ip = "";
 if(username == null)    username = "";
@@ -187,14 +186,8 @@
 </script>
 <!-- </head> -->
         
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 500px">
-<%=message %></b><br>
-</div>
-<%} %>
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -37,7 +38,6 @@
 <%
 
 String view_id = (String) request.getAttribute("view_id"); 
-String message = (String) request.getAttribute("message");
 
 
 DBManager DBase = new DBManager();
@@ -46,9 +46,6 @@
 PreparedStatement pStmt = con.prepareStatement("SELECT * FROM views WHERE view_id="+view_id);
 ResultSet rs = pStmt.executeQuery();
 
-if (message == null)
-    message = new String("");
-
 if (rs.next())
 {    
     String added = rs.getString("added").substring(0,16);
@@ -90,14 +87,8 @@
 </script>
 <!-- </head> -->
         
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 650px">
-<%=message %><br>
-</div>
-<%} %>
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp Tue Jun  2 17:00:57 2009
@@ -18,6 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.sql.Connection" %>
 <%@ page import="java.sql.PreparedStatement" %>
@@ -34,12 +35,9 @@
 }
 //-->
 </script>
-<%
-    String message = (String) request.getAttribute("message"); 
-    if (message != null) {
-%>
-        <p><%= message %></p>
-<%  }  %>
+
+<CommonMsg:commonMsg/><br>
+
 <table>
    <tr>
        <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp Tue Jun  2 17:00:57 2009
@@ -18,6 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.sql.Connection" %>
 <%@ page import="java.sql.DatabaseMetaData" %>
@@ -35,13 +36,9 @@
 }
 //-->
 </script>
-<%
-    String message = (String) request.getAttribute("message"); 
-    if (message != null)
-    {
-%>
-        <p><%= message %></p>
-<%  } %>
+
+<CommonMsg:commonMsg/>
+
 <br>
 <table width="100%" style="border-style: solid;
 border-width: 1px;">

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.ArrayList" %>
@@ -40,7 +41,6 @@
 PreparedStatement pStmt = con.prepareStatement("SELECT view_id, name, description, graph_count, added, modified FROM views WHERE enabled=1 AND view_id="+view_id);
 ResultSet rs = pStmt.executeQuery();
 GraphsBuilder run = new GraphsBuilder(con);
-String errors = new String("");
 
 if (rs.next())
 {
@@ -72,7 +72,7 @@
                 graphs.add( graph );
             }
         } catch (Exception e) {
-            errors = errors + "<li>Graph " + ids.get(i) + " could not be drawn due to server being offline</li>";
+            
         }
     }
     
@@ -112,6 +112,8 @@
     </script>
 <!-- </head> -->
 
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->
@@ -140,14 +142,6 @@
 {
     
 }
-if (!errors.equals(""))
-{
-    %>
-    <ul>
-    <font color="red"><%=errors%></font>
-    </ul>
-    <%
-}
 %>
 
         </td>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.sql.Connection" %>
 <%@ page import="java.sql.DatabaseMetaData" %>
@@ -27,15 +28,9 @@
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
 <fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
-<%
-    String message = (String) request.getAttribute("message"); 
-if (!message.equals(""))
-{
-%>
-<div align="left" style="width: 650px">
-<%=message %><br>
-</div>
-<%} %>
+
+<CommonMsg:commonMsg/><br>
+
 <table>
    <tr>
        <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Tue Jun  2 17:00:57 2009
@@ -17,6 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.ArrayList" %>
@@ -41,7 +42,6 @@
 <%
 
 String server_id = (String) request.getAttribute("server_id"); 
-String message = (String) request.getAttribute("message");
 
 DBManager DBase = new DBManager();
 Connection con = DBase.getConnection();
@@ -52,9 +52,6 @@
 Integer collecting = 0;
 Long snapshotDuration = new Long(0);
 
-if (message == null)
-    message = new String("");
-
 DBase = new DBManager();
 con = DBase.getConnection();
 PreparedStatement pStmt = con.prepareStatement("SELECT * FROM servers WHERE enabled=1 AND server_id="+server_id);
@@ -84,7 +81,6 @@
     } catch (Exception e) {
         isOnline = false;
         collecting = 0;
-        message = message + "<br><font color='red'><strong><li>Server is offline</li></strong></font>";
     }
     
 %>
@@ -100,14 +96,9 @@
 //-->
 </script>
 <!-- </head> -->
-            <%
- if (!message.equals(""))
- {
- %>
-<div align="left" style="width: 500px">
-<%=message %><br>
-</div>
-<%} %>
+
+<CommonMsg:commonMsg/><br>
+
 <table>
     <tr>
         <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Tue Jun  2 17:00:57 2009
@@ -18,6 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.sql.Connection" %>
 <%@ page import="java.sql.DatabaseMetaData" %>
@@ -27,15 +28,9 @@
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
 <fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
-<%
-    String message = (String) request.getAttribute("message"); 
-if (!message.equals(""))
-{
-%>
-<div align="left" style="width: 650px">
-<%=message %><br>
-</div>
-<%} %>
+
+<CommonMsg:commonMsg/><br>
+
 <table>
    <tr>
        <!-- Body -->

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java Tue Jun  2 17:00:57 2009
@@ -26,6 +26,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.deployment.xbeans.PatternType;
@@ -138,6 +139,10 @@
         super(mode, viewName);
     }
 
+    public AbstractHandler(String mode, String viewName, BasePortlet portlet) {
+        super(mode, viewName, portlet);
+    }
+
     public static class WARConfigModel implements MultiPageModel {
         public WARConfigModel(PortletRequest request) {
         }

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/CreatePlanPortlet.java Tue Jun  2 17:00:57 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);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java Tue Jun  2 17:00:57 2009
@@ -30,6 +30,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -40,8 +41,8 @@
 public class DeployStatusHandler extends AbstractHandler {
     private static final Log log = LogFactory.getLog(DisplayPlanHandler.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)
@@ -62,8 +63,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(request, status[0]), status[1]);
+            }
+            else {
+                portlet.addInfoMessage(request, portlet.getLocalizedString(request, status[0]));
+            }
         } catch (MalformedURLException e) {
             log.error(e.getMessage(), e);
         }

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java Tue Jun  2 17:00:57 2009
@@ -28,6 +28,7 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -38,8 +39,8 @@
 public class GetArchiveHandler extends AbstractHandler {
     private static final Log log = LogFactory.getLog(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)
@@ -50,9 +51,6 @@
     public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model)
             throws PortletException, IOException {
         setNewSessionData(request);
-        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)
@@ -68,7 +66,7 @@
         // TODO Is there a better way of checking whether the archive is a WAR or not?
         int i = fileName.length() - 4;
         if (!fileName.substring(i).equalsIgnoreCase(".war")) {
-            response.setRenderParameter(ARCHIVE_NOT_SUPPORTED_PARAMETER, "true");
+            portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg01"));
             return getMode();
         }
 

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java Tue Jun  2 17:00:57 2009
@@ -504,25 +504,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/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java Tue Jun  2 17:00:57 2009
@@ -28,6 +28,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -38,8 +39,8 @@
 public class ReferencesHandler extends AbstractHandler {
     private static final Log log = LogFactory.getLog(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)
@@ -77,6 +78,7 @@
             return DEPENDENCIES_MODE + "-before";
         }
         data.setReferenceNotResolved(true);
+        portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg03"));
         return getMode() + "-before";
     }
 

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

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

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

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Jun  2 17:00:57 2009
@@ -37,6 +37,9 @@
         </supports>
 
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
 
         <portlet-info>
             <title>Create Deployment Plan</title>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp Tue Jun  2 17:00:57 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.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/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp Tue Jun  2 17:00:57 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/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.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" %>
 <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/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java Tue Jun  2 17:00:57 2009
@@ -24,21 +24,17 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.MessageFormat;
 
+import javax.portlet.PortletRequest;
+
+import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.kernel.util.InputUtils;
 
 public class RunSQLHelper {
 
     private final static Log log = LogFactory.getLog(RunSQLHelper.class);
 
-    public static final String SQL_SUCCESS_MSG = "SQL command/s successful";
-
-    public static final String SQL_EMPTY_MSG = "SQL Command/s can't be empty";
-
-    private static final String DB_CREATED_MSG = "Database created";
-
-    private static final String DB_DELETED_MSG = "Database deleted";
-
     private static final String DERBY_BACKUP_FOLDER = "derby.backup";
 
     private static final String PARENT_FOLDER = "..";
@@ -47,23 +43,26 @@
 
     private static final String BAK_PREFIX = "BAK_";
 
-    public String createDB(String dbName) {
+    private final BasePortlet portlet;
+
+    public RunSQLHelper (BasePortlet portlet) {
+        this.portlet = portlet;
+    }
+
+    public boolean createDB(String dbName, PortletRequest request) {
 
         // ensure there are no illegal chars in DB name
         InputUtils.validateSafeInput(dbName);
 
-        String result = DB_CREATED_MSG + ": " + dbName;
-
         Connection conn = null;
         try {
             conn = DerbyConnectionUtil.getDerbyConnection(dbName,
                     DerbyConnectionUtil.CREATE_DB_PROP);
+            portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg01"), dbName));
+            return true;
         } catch (Throwable e) {
-            if (e instanceof SQLException) {
-                result = getSQLError((SQLException) e);
-            } else {
-                result = e.getMessage();
-            }
+            portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg01"), e.getMessage());
+            return false;
         } finally {
             // close DB connection
             try {
@@ -71,29 +70,24 @@
                     conn.close();
                 }
             } catch (SQLException e) {
-                result = "Problem closing DB connection";
+                portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg02"), 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(request, "errorMsg03"));
+            return false;
         }
 
         try {
@@ -102,10 +96,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(request, "errorMsg04"));
+                    return false;
                 }
             }
 
@@ -124,28 +116,25 @@
                     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(request, "errorMsg05"));
+                            return false;
                         }
                     }
                 }
             }
+            portlet.addInfoMessage(request, MessageFormat.format(portlet.getLocalizedString(request, "infoMsg02"), dbName));
+            return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg06"), 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(request, "errorMsg07"));
+            return false;
         }
-        
 
         Connection conn = null;
         Statement s = null;
@@ -167,14 +156,18 @@
                 }
             }
             conn.commit();
+            portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg03"));
+            return true;
         } catch (SQLException e) {
             try {
                 conn.rollback();
             } catch (Exception unHandledException) {
             }
-            result = getSQLError(e);
+            portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg08"), e.getMessage());
+            return false;
         } catch (Throwable e) {
-            result = e.getMessage();
+            portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg08"), e.getMessage());
+            return false;
         } finally {
             // close DB connection
             try {
@@ -186,13 +179,9 @@
                     conn.close();
                 }
             } catch (SQLException e) {
-                if (SQL_SUCCESS_MSG.equals(result)) {
-                    result = "Problem closing DB connection: " + e.getMessage();
-                }
+                portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg02"), e.getMessage());
             }
         }
-
-        return result;
     }
 
     private boolean shutdownDB(String dbName) {
@@ -213,23 +202,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/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java Tue Jun  2 17:00:57 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;
@@ -81,10 +81,10 @@
 
     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 {
         // Getting parameters here because it fails on doView()
@@ -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);
+            actionResult = sqlHelper.createDB(createDB, actionRequest);
         } else if (DELETEDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.deleteDB(DerbyConnectionUtil.getDerbyHome(), deleteDB);
+            actionResult = 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);
+            actionResult = sqlHelper.backupDB(DerbyConnectionUtil.getDerbyHome(), backupDB, actionRequest);
         } else if (RESTOREDB_ACTION.equals(action)) {
-            actionResult = sqlHelper.restoreDB(DerbyConnectionUtil.getDerbyHome(), restoreDB);
+            actionResult = 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/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties Tue Jun  2 17:00:57 2009
@@ -27,3 +27,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.
\ No newline at end of file

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

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

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Jun  2 17:00:57 2009
@@ -34,6 +34,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>DB Info</title>
             <short-title>DB Info</short-title>
@@ -53,6 +56,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>DB Viewer</title>
             <short-title>DB Viewer</short-title>
@@ -72,6 +78,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Derby Log Viewer</title>
             <short-title>Derby Log Viewer</short-title>
@@ -91,6 +100,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Run SQL</title>
             <short-title>Run SQL</short-title>
@@ -114,6 +126,9 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Run SQL</title>
             <short-title>Run SQL</short-title>
@@ -136,6 +151,9 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Database Pools</title>
             <short-title>Database Pools</short-title>

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Tue Jun  2 17:00:57 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/>
 
@@ -51,6 +52,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">
@@ -106,14 +109,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/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java Tue Jun  2 17:00:57 2009
@@ -68,7 +68,7 @@
             selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
             selenium.click("//input[@value = 'Run SQL']");
             selenium.waitForPageToLoad("30000");
-            assertTrue(selenium.isTextPresent("SQL command/s successful"));
+            assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
         } finally {
             logout();
         }

Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Tue Jun  2 17:00:57 2009
@@ -66,7 +66,7 @@
             selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
             selenium.click("//input[@value = 'Run SQL']");
             selenium.waitForPageToLoad("30000");
-            assertTrue(selenium.isTextPresent("SQL command/s successful"));
+            assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
         } finally {
             logout();
         }

Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=781081&r1=781080&r2=781081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java (original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java Tue Jun  2 17:00:57 2009
@@ -33,7 +33,7 @@
             selenium.waitForPageToLoad("30000");
             selenium.click("//input[@value='Install']");
             selenium.waitForPageToLoad("30000");
-            assertTrue(selenium.isTextPresent("Deployment failed:"));
+            assertTrue(selenium.isTextPresent("Deployment Failed"));
         } finally {
             logout();
         }



Mime
View raw message