From jbossweb-commits at lists.jboss.org Tue Sep  1 09:49:43 2015
Content-Type: multipart/mixed; boundary="===============2985231281777995431=="
MIME-Version: 1.0
From: jbossweb-commits at lists.jboss.org
To: jbossweb-commits at lists.jboss.org
Subject: [jbossweb-commits] JBossWeb SVN: r2626 - in
 branches/7.5.x/src/main/java/org: apache/catalina/valves and 1 other
 directories.
Date: Tue, 01 Sep 2015 09:49:43 -0400
Message-ID: <201509011349.t81DnhHM009225@svn01.web.mwc.hst.phx2.redhat.com>

--===============2985231281777995431==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/Default=
Servlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServle=
t.java	2015-09-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServle=
t.java	2015-09-01 13:49:43 UTC (rev 2626)
@@ -1412,7 +1412,6 @@
             sb.append("<HR size=3D\"1\" noshade=3D\"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/ErrorRepo=
rtValve.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValv=
e.java	2015-09-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValv=
e.java	2015-09-01 13:49:43 UTC (rev 2626)
@@ -214,8 +214,7 @@
         StringBuilder sb =3D 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.getServerI=
nfo()));
-            sb.append("</u></p>");
-
         }
 =

         sb.append("<HR size=3D\"1\" noshade=3D\"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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java	2015-0=
9-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java	2015-0=
9-01 13:49:43 UTC (rev 2626)
@@ -237,12 +237,12 @@
     @Message(id =3D 71, value =3D "root cause")
     String statusRootCause();
 =

-    @Message(id =3D 72, value =3D "note")
-    String statusNote();
+//    @Message(id =3D 72, value =3D "note")
+//    String statusNote();
+//
+//    @Message(id =3D 73, value =3D "The full stack trace of the root caus=
e is available in the %s logs.")
+//    String statusRootCauseInLogs(String log);
 =

-    @Message(id =3D 73, value =3D "The full stack trace of the root cause =
is available in the %s logs.")
-    String statusRootCauseInLogs(String log);
-
     @Message(id =3D 74, value =3D "Exception processing event.")
     String eventValveExceptionDuringEvent();
 =



--===============2985231281777995431==--

