Return-Path: 
 <scm-return-35164-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 85710 invoked from network); 27 Jan 2009 22:15:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 27 Jan 2009 22:15:21 -0000
Received: (qmail 60461 invoked by uid 500); 27 Jan 2009 00:47:17 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 60388 invoked by uid 500); 27 Jan 2009 00:47:16 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 60247 invoked by uid 99); 27 Jan 2009 00:47:16 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 16:47:16 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 23:30:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 654C82388B5C; Mon, 26 Jan 2009 23:05:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r737923 -
 /geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
Date: Mon, 26 Jan 2009 23:05:34 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090126230534.654C82388B5C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Mon Jan 26 23:05:34 2009
New Revision: 737923

URL: http://svn.apache.org/viewvc?rev=737923&view=rev
Log:
remove html message formatting from java code.  We should consider merging the new message processing in G-4484 from trunk back to this branch.

Modified:
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=737923&r1=737922&r2=737923&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Mon Jan 26 23:05:34 2009
@@ -250,9 +250,9 @@
         try {
             MRCConnector mrc = new MRCConnector(ip, username, password, port, protocol);
 
-            return "<font color=\"green\"><strong><li>Connection was successfully established.</li></strong></font>";
+            return "Connection was successfully established.";
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>Failed to create a connection to server.</li></strong></font>";
+            return "Failed to create a connection to server.";
         }
     }
 
@@ -279,8 +279,8 @@
                 stmt
                         .executeUpdate("UPDATE GRAPHS SET ENABLED = 0 WHERE SERVER_ID="
                                 + server_id);
-                message = "<font color=\"green\"><strong><li>Server " + name
-                        + " was successfully disabled.</li></strong></font>";
+                message = "Server " + name
+                        + " was successfully disabled.";
             } else {
                 stmt
                         .executeUpdate("UPDATE SERVERS SET ENABLED = 1 WHERE SERVER_ID="
@@ -288,18 +288,18 @@
                 stmt
                         .executeUpdate("UPDATE GRAPHS SET ENABLED = 1 WHERE SERVER_ID="
                                 + server_id);
-                message = "<font color=\"green\"><strong><li>Server " + name
-                        + " was successfully enabled.</li></strong></font>";
+                message = "Server " + name
+                        + " was successfully enabled.";
             }
         } catch (SQLException e) {
             if (!b)
-                message = "<font color=\"red\"><strong><li>[ERROR] Server with server_id = "
+                message = "[ERROR] Server with server_id = "
                         + server_id
-                        + " could not be disabled.</li></strong></font>";
+                        + " could not be disabled.";
             else
-                message = "<font color=\"red\"><strong><li>[ERROR] Server with server_id = "
+                message = "[ERROR] Server with server_id = "
                         + server_id
-                        + " could not be enabled.</li></strong></font>";
+                        + " could not be enabled.";
         } finally {
             if (conn != null) {
                 try {
@@ -534,14 +534,14 @@
                 }
             con.close();
             actionResponse.setRenderParameter("message",
-                    "<font color=\"green\"><strong><li>View " + name
-                            + " has been updated</li></strong></font>");
+                    "View " + name
+                            + " has been updated");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error updating View "
-                            + name + "</li></strong></font>" + e.getMessage());
+                    "Error updating View "
+                            + name + " " + e.getMessage());
             return;
         }
     }
@@ -580,12 +580,12 @@
             }
             con.close();
             actionResponse.setRenderParameter("message",
-                    "<font color=\"green\"><strong><li>View " + name
-                            + " has been added</li></strong></font>");
+                    "View " + name
+                            + " has been added");
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error adding View " + name
-                            + "</li></strong></font>" + e.getMessage());
+                    "Error adding View " + name
+                            + " " + e.getMessage());
         } finally {
             try {
                 con.close();
@@ -640,7 +640,7 @@
                     actionResponse
                             .setRenderParameter(
                                     "message",
-                                    "<font color=\"red\"><strong><li>Error updating server</li></strong></font>"
+                                    "Error updating server "
                                             + "Password was not found in the database for server_id="
                                             + server_id);
                     con.close();
@@ -675,10 +675,10 @@
             actionResponse
                     .setRenderParameter(
                             "message",
-                            "<font color=\"green\"><strong><li>Server has been updated</li></strong></font>");
+                            "Server has been updated");
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error updating server</li></strong></font>"
+                    "Error updating server "
                             + e.getMessage());
         }
     }
@@ -713,12 +713,12 @@
                             + protocol + ")");
             pStmt.executeUpdate();
             actionResponse.setRenderParameter("message",
-                    "<font color=\"green\"><strong><li>Server " + name + " at "
-                            + ip + " has been added.</li></strong></font>");
+                    "Server " + name + " at "
+                            + ip + " has been added.");
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error adding server</li></strong></font>"
+                    "Error adding server "
                             + e.getMessage());
         } finally {
             try {
@@ -749,12 +749,12 @@
             actionResponse
                     .setRenderParameter(
                             "message",
-                            "<font color=\"green\"><strong><li>Server and associated graphs have been deleted</li></strong></font>");
+                            "Server and associated graphs have been deleted");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error deleting server</li></strong></font>"
+                    "Error deleting server "
                             + e.getMessage());
             return;
         }
@@ -779,12 +779,12 @@
             con.close();
             actionResponse
                     .setRenderParameter("message",
-                            "<font color=\"green\"><strong><li>View has been deleted</li></strong></font>");
+                            "View has been deleted");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error deleting view</li></strong></font>"
+                    "Error deleting view "
                             + e.getMessage());
             return;
         }
@@ -848,13 +848,13 @@
             pStmt.executeUpdate();
             con.close();
             actionResponse.setRenderParameter("message",
-                    "<font color=\"green\"><strong><li>Graph " + name
-                            + " has been added.</li></strong></font>");
+                    "Graph " + name
+                            + " has been added.");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error adding graph</li></strong></font>"
+                    "Error adding graph "
                             + e.getMessage());
             return;
         }
@@ -921,13 +921,13 @@
             pStmt.executeUpdate();
             con.close();
             actionResponse.setRenderParameter("message",
-                    "<font color=\"green\"><strong><li>Graph " + name
-                            + " has been updated.</li></strong></font>");
+                    "Graph " + name
+                            + " has been updated.");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error editing graph</li></strong></font>"
+                    "Error editing graph "
                             + e.getMessage());
             return;
         }
@@ -966,12 +966,12 @@
             con.close();
             actionResponse
                     .setRenderParameter("message",
-                            "<font color=\"green\"><strong><li>Graph has been deleted</li></strong></font>");
+                            "Graph has been deleted");
             return;
 
         } catch (Exception e) {
             actionResponse.setRenderParameter("message",
-                    "<font color=\"red\"><strong><li>Error deleting graph</li></strong></font>"
+                    "Error deleting graph "
                             + e.getMessage());
             return;
         }
@@ -995,9 +995,9 @@
                             + server_id);
             rs = pStmt.executeQuery();
             if (!rs.next()) {
-                return "<font color=\"red\"><strong><li>DATABASE ERROR: Server id "
+                return "DATABASE ERROR: Server id "
                         + server_id
-                        + " not found in database</li></strong></font>";
+                        + " not found in database";
             }
             server_ip = rs.getString("ip");
             password = rs.getString("password");
@@ -1005,38 +1005,36 @@
             port = rs.getInt("port");
             protocol = rs.getInt("protocol");
         } catch (SQLException e) {
-            return "<font color=\"red\"><strong><li>DATABASE ERROR: "
-                    + e.getMessage() + "</li></strong></font>";
+            return "DATABASE ERROR: "
+                    + e.getMessage();
         }
         // attempt to connect to the mrc server
         try {
             con.close();
             mrc = new MRCConnector(server_ip, username, password, port, protocol);
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Unable to connect to server "
+            return "MRC ERROR: Unable to connect to server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
 
         // tell the mrc server to start tracking an mbean
         try {
             if (mrc.startTrackingMbean(mbean)) {
                 String mbarr[] = mbean.split("name=");
-                return "<font color=\"green\"><strong><li>MBean " + mbarr[1]
-                        + " tracking on server " + rs.getString("name")
-                        + "</li></strong></font>";
+                return "MBean " + mbarr[1]
+                        + " tracking on server " + rs.getString("name");
             } else {
                 String mbarr[] = mbean.split("name=");
-                return "<font color=\"red\"><strong><li>ERROR: MBean "
-                        + mbarr[1] + " could <b>NOT</b> be tracked on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                return "ERROR: MBean "
+                        + mbarr[1] + " could NOT be tracked on server "
+                        + rs.getString("name");
             }
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: MBean " + mbean
-                    + " could <b>NOT</b> be tracked on server " + server_ip
-                    + ": " + e.getMessage() + "</li></strong></font>";
+            return "MRC ERROR: MBean " + mbean
+                    + " could NOT be tracked on server " + server_ip
+                    + ": " + e.getMessage();
         }
     }
 
@@ -1058,9 +1056,9 @@
                             + server_id);
             rs = pStmt.executeQuery();
             if (!rs.next()) {
-                return "<font color=\"red\"><strong><li>DATABASE ERROR: Server id "
+                return "DATABASE ERROR: Server id "
                         + server_id
-                        + " not found in database</li></strong></font>";
+                        + " not found in database";
             }
             server_ip = rs.getString("ip");
             password = rs.getString("password");
@@ -1068,39 +1066,37 @@
             port = rs.getInt("port");
             protocol = rs.getInt("protocol");
         } catch (SQLException e) {
-            return "<font color=\"red\"><strong><li>DATABASE ERROR: "
-                    + e.getMessage() + "</li></strong></font>";
+            return "DATABASE ERROR: "
+                    + e.getMessage();
         }
         // attempt to connect to the mrc-server
         try {
             con.close();
                 mrc = new MRCConnector(server_ip, username, password, port, protocol);
        } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Unable to connect to server "
+            return "MRC ERROR: Unable to connect to server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
         // tell the mrc-server to stop tracking some mbean
         try {
             if (mrc.stopTrackingMbean(mbean)) {
                 String mbarr[] = mbean.split("name=");
-                return "<font color=\"green\"><strong><li>MBean " + mbarr[1]
+                return "MBean " + mbarr[1]
                         + " removed from tracking on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                        + rs.getString("name");
             } else {
                 String mbarr[] = mbean.split("name=");
-                return "<font color=\"red\"><strong><li>ERROR: MBean "
+                return "ERROR: MBean "
                         + mbarr[1]
-                        + " could <b>NOT</b> be removed from tracking on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                        + " could NOT be removed from tracking on server "
+                        + rs.getString("name");
             }
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: MBean " + mbean
-                    + " could <b>NOT</b> be removed from tracking on server "
-                    + server_ip + ": " + e.getMessage()
-                    + "</li></strong></font>";
+            return "MRC ERROR: MBean " + mbean
+                    + " could NOT be removed from tracking on server "
+                    + server_ip + ": " + e.getMessage();
         }
     }
 
@@ -1122,9 +1118,9 @@
                             + server_id);
             rs = pStmt.executeQuery();
             if (!rs.next()) {
-                return "<font color=\"red\"><strong><li>DATABASE ERROR: Server id "
+                return "DATABASE ERROR: Server id "
                         + server_id
-                        + " not found in database</li></strong></font>";
+                        + " not found in database";
             }
             server_ip = rs.getString("ip");
             password = rs.getString("password");
@@ -1132,36 +1128,34 @@
             port = rs.getInt("port");
             protocol = rs.getInt("protocol");
         } catch (SQLException e) {
-            return "<font color=\"red\"><strong><li>DATABASE ERROR: "
-                    + e.getMessage() + "</li></strong></font>";
+            return "DATABASE ERROR: "
+                    + e.getMessage();
         }
         // attempt to connect to the mrc-server
         try {
             con.close();
             mrc = new MRCConnector(server_ip, username, password, port, protocol);
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Unable to connect to server "
+            return "MRC ERROR: Unable to connect to server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
         // tell the mrc-server to stop taking snapshots
         try {
             if (mrc.stopSnapshotThread()) {
-                return "<font color=\"green\"><strong><li>Snapshot thread stopped on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                return "Snapshot thread stopped on server "
+                        + rs.getString("name");
             } else {
-                return "<font color=\"red\"><strong><li>ERROR: Snapshot thread could <b>NOT</b> be stopped on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                return "ERROR: Snapshot thread could NOT be stopped on server "
+                        + rs.getString("name");
             }
 
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Snapshot thread could <b>NOT</b> be stopped on server "
+            return "MRC ERROR: Snapshot thread could NOT be stopped on server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
     }
 
@@ -1183,9 +1177,9 @@
                             + server_id);
             rs = pStmt.executeQuery();
             if (!rs.next()) {
-                return "<font color=\"red\"><strong><li>DATABASE ERROR: Server id "
+                return "DATABASE ERROR: Server id "
                         + server_id
-                        + " not found in database</li></strong></font>";
+                        + " not found in database";
             }
             server_ip = rs.getString("ip");
             password = rs.getString("password");
@@ -1193,35 +1187,33 @@
             port = rs.getInt("port");
             protocol = rs.getInt("protocol");
         } catch (SQLException e) {
-            return "<font color=\"red\"><strong><li>DATABASE ERROR: "
-                    + e.getMessage() + "</li></strong></font>";
+            return "DATABASE ERROR: "
+                    + e.getMessage();
         }
         // attempt to connect to the mrc-server
         try {
             con.close();
             mrc = new MRCConnector(server_ip, username, password, port, protocol);
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Unable to connect to server "
+            return "MRC ERROR: Unable to connect to server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
         // tell the mrc-server to start the collection of statistics
         try {
             if (mrc.startSnapshotThread(new Long(snapshotDuration))) {
-                return "<font color=\"green\"><strong><li>Snapshot thread started on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                return "Snapshot thread started on server "
+                        + rs.getString("name");
             } else {
-                return "<font color=\"red\"><strong><li>ERROR: Snapshot thread could <b>NOT</b> be started on server "
-                        + rs.getString("name") + "</li></strong></font>";
+                return "ERROR: Snapshot thread could NOT be started on server "
+                        + rs.getString("name");
             }
         } catch (Exception e) {
-            return "<font color=\"red\"><strong><li>MRC ERROR: Snapshot thread could <b>NOT</b> be started on server "
+            return "MRC ERROR: Snapshot thread could NOT be started on server "
                     + server_ip
                     + ": "
-                    + e.getMessage()
-                    + "</li></strong></font>";
+                    + e.getMessage();
         }
     }