[jbossweb-commits] JBossWeb SVN: r2626 - in branches/7.5.x/src/main/java/org: apache/catalina/valves and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2015-09-01 09:49:43 -0400 (Tue, 01 Sep 2015)
New Revision: 2626
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java
Log:
BZ1241032: Remove version numbers. Submitted by baranowb.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
===================================================================
---
branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2015-09-01
13:45:57 UTC (rev 2625)
+++
branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2015-09-01
13:49:43 UTC (rev 2626)
@@ -1412,7 +1412,6 @@
sb.append("<HR size=\"1\"
noshade=\"noshade\">");
}
-
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body>\r\n");
sb.append("</html>\r\n");
Modified: branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
===================================================================
---
branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2015-09-01
13:45:57 UTC (rev 2625)
+++
branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2015-09-01
13:49:43 UTC (rev 2626)
@@ -214,8 +214,7 @@
StringBuilder sb = new StringBuilder();
sb.append("<html><head><title>");
- sb.append(ServerInfo.getServerInfo()).append(" - ");
- sb.append(MESSAGES.errorReport());
+ sb.append(MESSAGES.statusHeader(statusCode, message));
sb.append("</title>");
sb.append("<style><!--");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
@@ -266,16 +265,9 @@
loops++;
}
- sb.append("<p><b>");
- sb.append(MESSAGES.statusNote());
- sb.append("</b> <u>");
- sb.append(MESSAGES.statusRootCauseInLogs(ServerInfo.getServerInfo()));
- sb.append("</u></p>");
-
}
sb.append("<HR size=\"1\"
noshade=\"noshade\">");
-
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body></html>");
try {
Modified: branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java
===================================================================
--- branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java 2015-09-01 13:45:57
UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java 2015-09-01 13:49:43
UTC (rev 2626)
@@ -237,12 +237,12 @@
@Message(id = 71, value = "root cause")
String statusRootCause();
- @Message(id = 72, value = "note")
- String statusNote();
+// @Message(id = 72, value = "note")
+// String statusNote();
+//
+// @Message(id = 73, value = "The full stack trace of the root cause is available
in the %s logs.")
+// String statusRootCauseInLogs(String log);
- @Message(id = 73, value = "The full stack trace of the root cause is available
in the %s logs.")
- String statusRootCauseInLogs(String log);
-
@Message(id = 74, value = "Exception processing event.")
String eventValveExceptionDuringEvent();