[Hyperic-hq-discuss] hq r14480 - in trunk: src/org/hyperic/hq/events web/WEB-INF/classes web/common

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-04-05 16:21:31 -0700 (Mon, 05 Apr 2010)
New Revision: 14480
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14480

Modified:
   trunk/src/org/hyperic/hq/events/Resources.properties
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/common/Error.jsp
   trunk/web/common/GenericError.jsp
Log:
[HHQ-3799] - Remove For Help message from stack traces

Modified: trunk/src/org/hyperic/hq/events/Resources.properties
===================================================================
--- trunk/src/org/hyperic/hq/events/Resources.properties	2010-04-05 23:01:58 UTC (rev 14479)
+++ trunk/src/org/hyperic/hq/events/Resources.properties	2010-04-05 23:21:31 UTC (rev 14480)
@@ -49,4 +49,4 @@
 event.clone.platform.message.end=Cloning ended. {1} platforms cloned from master platform [{0}]
 
 event.hqdbhealth.email.subject=Hyperic HQ Shutdown Notification
-event.hqdbhealth.email.message=Hyperic HQ initiated an automatic application shutdown at {0} due to a loss of database connectivity. Please verify that your HQ database is up and functioning prior to restarting HQ.\n\nHQ server.log information at the time of shutdown contained the following information, which may be useful for database diagnostic purposes:\n\n{1}\n\nPlease contact Hyperic Support with any questions, or for guidance on steps to system recovery.
+event.hqdbhealth.email.message=Hyperic HQ initiated an automatic application shutdown at {0} due to a loss of database connectivity. Please verify that your HQ database is up and functioning prior to restarting HQ.\n\nHQ server.log information at the time of shutdown contained the following information, which may be useful for database diagnostic purposes:\n\n{1}

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-04-05 23:01:58 UTC (rev 14479)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-04-05 23:21:31 UTC (rev 14480)
@@ -185,8 +185,8 @@
 error.Error.Tab=Error
 error.Error.ThePageRequestedEtc=The page requested cannot be displayed due to some error.
 error.Error.YouCan=You can 
-error.Error.StackTraceHereLink= view the stack trace,
-error.Error.HideStackTraceLink= hide the stack trace,
+error.Error.StackTraceHereLink= view the stack trace.
+error.Error.HideStackTraceLink= hide the stack trace.
 error.Error.ReturnTo=Return to the 
 error.Error.PreviousPageLink=previous page, 
 error.Error.DashboardLink=Dashboard,
@@ -243,8 +243,6 @@
 errors.jsp.problem=There was a problem generating your page.
 errors.jsp.ClickHere=Click here
 errors.jsp.ToSee=to see the complete stack trace.
-errors.jsp.contactsupport=For help on this issue contact Hyperic Support:
-errors.jsp.callhyperic=Call <b>1-888-4Hyperic</b> (1-888-449-7374)
 #
 errors.cam.general=An unknown application error occurred.
 error.input.badchars=Input should not contain any of the following characters: |, ?, &, <, >, ', "

Modified: trunk/web/common/Error.jsp
===================================================================
--- trunk/web/common/Error.jsp	2010-04-05 23:01:58 UTC (rev 14479)
+++ trunk/web/common/Error.jsp	2010-04-05 23:21:31 UTC (rev 14480)
@@ -129,7 +129,7 @@
 "<table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n" + 
 "	<tr>\n" + 
 "		<td class=\"ErrorBlock\"><img src=\"<html:rewrite page="/images/"/>tt_error.gif\" width=\"10\" height=\"11\" hspace=\"5\" border=\"0\"/></td>\n" + 
-"		<td class=\"ErrorBlock\" width=\"100%\"><fmt:message key="errors.jsp.problem"/> <a href=\"javascript:displayStackTrace<%= randomNum %>()\"><fmt:message key="errors.jsp.ClickHere"/></a> <fmt:message key="errors.jsp.ToSee"/><br><fmt:message key="errors.jsp.contactsupport"/>  - <fmt:message key="errors.jsp.callhyperic"/></td>\n" +
+"		<td class=\"ErrorBlock\" width=\"100%\"><fmt:message key="errors.jsp.problem"/> <a href=\"javascript:displayStackTrace<%= randomNum %>()\"><fmt:message key="errors.jsp.ClickHere"/></a> <fmt:message key="errors.jsp.ToSee"/></td>\n" +
 "	</tr>\n" +
 "</table>\n" + 
 "</td>\n" + 

Modified: trunk/web/common/GenericError.jsp
===================================================================
--- trunk/web/common/GenericError.jsp	2010-04-05 23:01:58 UTC (rev 14479)
+++ trunk/web/common/GenericError.jsp	2010-04-05 23:21:31 UTC (rev 14480)
@@ -70,7 +70,6 @@
       <fmt:message key="error.Error.YouCan"/>          
       <span id="stacktrace_link">
       <html:link href="javascript:displayStackTrace()"><fmt:message key="error.Error.StackTraceHereLink"/></html:link>
-      <fmt:message key="errors.jsp.contactsupport"/>  - <fmt:message key="errors.jsp.callhyperic"/><br/><br/>
       </span>
       <fmt:message key="error.Error.ReturnTo"/>
       <html:link href="javascript:history.back(1)"><fmt:message key="error.Error.PreviousPageLink"/></html:link>