Author: remy.maucherat(a)jboss.com Date: 2012-09-24 10:28:07 -0400 (Mon, 24 Sep 2012) New Revision: 2084 Added: trunk/src/main/resources/org/apache/catalina/startup/ trunk/src/main/resources/org/apache/catalina/startup/Authenticators.properties Removed: trunk/src/main/java/org/apache/catalina/startup/Authenticators.properties trunk/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties trunk/src/main/java/org/apache/catalina/util/ServerInfo.properties Modified: trunk/src/main/java/org/apache/catalina/util/ServerInfo.java trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java trunk/src/main/java/org/jboss/web/CatalinaMessages.java Log: Tweaking after basic Servlet and JSP logging testing. Deleted: trunk/src/main/java/org/apache/catalina/startup/Authenticators.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/startup/Authenticators.properties 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/apache/catalina/startup/Authenticators.properties 2012-09-24 14:28:07 UTC (rev 2084) @@ -1,5 +0,0 @@ -BASIC=org.apache.catalina.authenticator.BasicAuthenticator -CLIENT-CERT=org.apache.catalina.authenticator.SSLAuthenticator -DIGEST=org.apache.catalina.authenticator.DigestAuthenticator -FORM=org.apache.catalina.authenticator.FormAuthenticator -NONE=org.apache.catalina.authenticator.NonLoginAuthenticator Deleted: trunk/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties 2012-09-24 14:28:07 UTC (rev 2084) @@ -1,2 +0,0 @@ -en=ISO-8859-1 -fr=ISO-8859-1 Modified: trunk/src/main/java/org/apache/catalina/util/ServerInfo.java =================================================================== --- trunk/src/main/java/org/apache/catalina/util/ServerInfo.java 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/apache/catalina/util/ServerInfo.java 2012-09-24 14:28:07 UTC (rev 2084) @@ -19,8 +19,7 @@ package org.apache.catalina.util; -import java.io.InputStream; -import java.util.Properties; +import org.jboss.web.Version; /** @@ -40,42 +39,8 @@ /** * The server information String with which we identify ourselves. */ - private static String serverInfo = null; + private static String serverInfo = "JBoss Web/" + Version.getVersionString(); - /** - * The server built String. - */ - private static String serverBuilt = null; - - /** - * The server's version number String. - */ - private static String serverNumber = null; - - static { - - try { - InputStream is = ServerInfo.class.getResourceAsStream - ("/org/apache/catalina/util/ServerInfo.properties"); - Properties props = new Properties(); - props.load(is); - is.close(); - serverInfo = props.getProperty("server.info"); - serverBuilt = props.getProperty("server.built"); - serverNumber = props.getProperty("server.number"); - } catch (Throwable t) { - ; - } - if (serverInfo == null) - serverInfo = "Apache Tomcat"; - if (serverBuilt == null) - serverBuilt = "unknown"; - if (serverNumber == null) - serverNumber = "5.5.0.0"; - - } - - // --------------------------------------------------------- Public Methods @@ -88,38 +53,4 @@ } - /** - * Return the server built time for this version of Tomcat. - */ - public static String getServerBuilt() { - - return (serverBuilt); - - } - - /** - * Return the server's version number. - */ - public static String getServerNumber() { - - return (serverNumber); - - } - - public static void main(String args[]) { - System.out.println("Server version: " + getServerInfo()); - System.out.println("Server built: " + getServerBuilt()); - System.out.println("Server number: " + getServerNumber()); - System.out.println("OS Name: " + - System.getProperty("os.name")); - System.out.println("OS Version: " + - System.getProperty("os.version")); - System.out.println("Architecture: " + - System.getProperty("os.arch")); - System.out.println("JVM Version: " + - System.getProperty("java.runtime.version")); - System.out.println("JVM Vendor: " + - System.getProperty("java.vm.vendor")); - } - } Deleted: trunk/src/main/java/org/apache/catalina/util/ServerInfo.properties =================================================================== --- trunk/src/main/java/org/apache/catalina/util/ServerInfo.properties 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/apache/catalina/util/ServerInfo.properties 2012-09-24 14:28:07 UTC (rev 2084) @@ -1,3 +0,0 @@ -server.info=JBoss Web/@VERSION@ -server.number=@VERSION_NUMBER@ -server.built=@VERSION_BUILT@ \ No newline at end of file Modified: trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java =================================================================== --- trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-09-24 14:28:07 UTC (rev 2084) @@ -224,7 +224,9 @@ sb.append("<h1>"); sb.append(MESSAGES.statusHeader(statusCode, message)).append("</h1>"); sb.append("<HR size=\"1\" noshade=\"noshade\">"); - sb.append("<p><b>type</b> "); + sb.append("<p><b>"); + sb.append(MESSAGES.statusType()); + sb.append("</b> "); if (throwable != null) { sb.append(MESSAGES.exceptionReport()); } else { Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-21 14:14:07 UTC (rev 2083) +++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-24 14:28:07 UTC (rev 2084) @@ -823,4 +823,7 @@ @Message(id = 308, value = "Request filter invalid pattern %s") IllegalArgumentException requestFilterInvalidPattern(String pattern, @Cause Throwable t); + @Message(id = 309, value = "type") + String statusType(); + } Copied: trunk/src/main/resources/org/apache/catalina/startup/Authenticators.properties (from rev 2049, trunk/src/main/java/org/apache/catalina/startup/Authenticators.properties) =================================================================== --- trunk/src/main/resources/org/apache/catalina/startup/Authenticators.properties (rev 0) +++ trunk/src/main/resources/org/apache/catalina/startup/Authenticators.properties 2012-09-24 14:28:07 UTC (rev 2084) @@ -0,0 +1,5 @@ +BASIC=org.apache.catalina.authenticator.BasicAuthenticator +CLIENT-CERT=org.apache.catalina.authenticator.SSLAuthenticator +DIGEST=org.apache.catalina.authenticator.DigestAuthenticator +FORM=org.apache.catalina.authenticator.FormAuthenticator +NONE=org.apache.catalina.authenticator.NonLoginAuthenticator