Author: remy.maucherat(a)jboss.com Date: 2009-06-22 10:07:44 -0400 (Mon, 22 Jun 2009) New Revision: 1119 Modified: trunk/conf/web.xml Log: - Sync: MIME type cleanup. Modified: trunk/conf/web.xml =================================================================== --- trunk/conf/web.xml 2009-06-18 14:37:09 UTC (rev 1118) +++ trunk/conf/web.xml 2009-06-22 14:07:44 UTC (rev 1119) @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" @@ -49,14 +65,14 @@ <!-- readmeFile File name to display with the directory --> <!-- contents. [null] --> <!-- --> - <!-- useAcceptRanges Should the Accept-Ranges header be included --> - <!-- in responses where appropriate? [true] --> - <!-- --> <!-- sendfileSize If the connector used supports sendfile, this --> <!-- represents the minimal file size in KB for --> <!-- which sendfile will be used. Use a negative --> <!-- value to always disable sendfile. [48] --> <!-- --> + <!-- useAcceptRanges Should the Accept-Ranges header be included --> + <!-- in responses where appropriate? [true] --> + <!-- --> <!-- For directory listing customization. Checks localXsltFile, then --> <!-- globalXsltFile, then defaults to original behavior. --> <!-- --> @@ -86,34 +102,6 @@ </servlet> - <!-- The "invoker" servlet, which executes anonymous servlet classes --> - <!-- that have not been defined in a web.xml file. Traditionally, this --> - <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map --> - <!-- it to other patterns as well. The extra path info portion of such a --> - <!-- request must be the fully qualified class name of a Java class that --> - <!-- implements Servlet (or extends HttpServlet), or the servlet name --> - <!-- of an existing servlet definition. This servlet supports the --> - <!-- following initialization parameters (default values are in square --> - <!-- brackets): --> - <!-- --> - <!-- debug Debugging detail level for messages logged --> - <!-- by this servlet. [0] --> - -<!-- - <servlet> - <servlet-name>invoker</servlet-name> - <servlet-class> - org.apache.catalina.servlets.InvokerServlet - </servlet-class> - <init-param> - <param-name>debug</param-name> - <param-value>0</param-value> - </init-param> - <load-on-startup>2</load-on-startup> - </servlet> ---> - - <!-- The JSP page compiler and execution servlet, which is the mechanism --> <!-- used by Tomcat to support JSP pages. Traditionally, this servlet --> <!-- is mapped to the URL pattern "*.jsp". This servlet supports the --> @@ -123,41 +111,51 @@ <!-- checkInterval If development is false and checkInterval is --> <!-- greater than zero, background compilations are --> <!-- enabled. checkInterval is the time in seconds --> - <!-- between checks to see if a JSP page needs to --> - <!-- be recompiled. [0] --> + <!-- between checks to see if a JSP page (and its --> + <!-- dependent files) needs to be recompiled. [0] --> <!-- --> - <!-- modificationTestInterval --> - <!-- Causes a JSP (and its dependent files) to not --> - <!-- be checked for modification during the --> - <!-- specified time interval (in seconds) from the --> - <!-- last time the JSP was checked for --> - <!-- modification. A value of 0 will cause the JSP --> - <!-- to be checked on every access. --> - <!-- Used in development mode only. [4] --> - <!-- --> - <!-- compiler Which compiler Ant should use to compile JSP --> - <!-- pages. See the jasper documentation for more --> - <!-- information. --> - <!-- --> <!-- classdebuginfo Should the class file be compiled with --> <!-- debugging information? [true] --> <!-- --> - <!-- classpath What class path should I use while compiling --> - <!-- generated servlets? [Created dynamically --> - <!-- based on the current web application] --> + <!-- compilerSourceVM Compiler source VM. [1.5] --> <!-- --> + <!-- compilerTargetVM Compiler target VM. [1.5] --> + <!-- --> <!-- development Is Jasper used in development mode? If true, --> <!-- the frequency at which JSPs are checked for --> <!-- modification may be specified via the --> <!-- modificationTestInterval parameter. [true] --> <!-- --> + <!-- displaySourceFragment --> + <!-- Should a source fragment be included in --> + <!-- exception messages? [true] --> + <!-- --> + <!-- dumpSmap Should the SMAP info for JSR45 debugging be --> + <!-- dumped to a file? [false] --> + <!-- False if suppressSmap is true --> + <!-- --> <!-- enablePooling Determines whether tag handler pooling is --> - <!-- enabled [true] --> + <!-- enabled. This is a compilation option. It will --> + <!-- not alter the behaviour of JSPs that have --> + <!-- already been compiled. [true] --> <!-- --> + <!-- engineOptionsClass Allows specifying the Options class used to --> + <!-- configure Jasper. If not present, the default --> + <!-- EmbeddedServletOptions will be used. --> + <!-- --> + <!-- errorOnUseBeanInvalidClassAttribute --> + <!-- Should Jasper issue an error when the value of --> + <!-- the class attribute in an useBean action is --> + <!-- not a valid bean class? [true] --> + <!-- --> <!-- fork Tell Ant to fork compiles of JSP pages so that --> <!-- a separate JVM is used for JSP page compiles --> <!-- from the one Tomcat is running in. [true] --> <!-- --> + <!-- genStrAsCharArray Should text strings be generated as char --> + <!-- arrays, to improve performance in some cases? --> + <!-- [false] --> + <!-- --> <!-- ieClassId The class-id value to be sent to Internet --> <!-- Explorer when using <jsp:plugin> tags. --> <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] --> @@ -172,42 +170,28 @@ <!-- print statement per input line, to ease --> <!-- debugging? [true] --> <!-- --> - <!-- trimSpaces Should white spaces in template text between --> - <!-- actions or directives be trimmed? [false] --> + <!-- modificationTestInterval --> + <!-- Causes a JSP (and its dependent files) to not --> + <!-- be checked for modification during the --> + <!-- specified time interval (in seconds) from the --> + <!-- last time the JSP was checked for --> + <!-- modification. A value of 0 will cause the JSP --> + <!-- to be checked on every access. --> + <!-- Used in development mode only. [4] --> <!-- --> - <!-- suppressSmap Should the generation of SMAP info for JSR45 --> - <!-- debugging be suppressed? [false] --> - <!-- --> - <!-- dumpSmap Should the SMAP info for JSR45 debugging be --> - <!-- dumped to a file? [false] --> - <!-- False if suppressSmap is true --> - <!-- --> - <!-- genStrAsCharArray Should text strings be generated as char --> - <!-- arrays, to improve performance in some cases? --> - <!-- [false] --> - <!-- --> - <!-- errorOnUseBeanInvalidClassAttribute --> - <!-- Should Jasper issue an error when the value of --> - <!-- the class attribute in an useBean action is --> - <!-- not a valid bean class? [true] --> - <!-- --> <!-- scratchdir What scratch directory should we use when --> <!-- compiling JSP pages? [default work directory --> <!-- for the current web application] --> <!-- --> + <!-- suppressSmap Should the generation of SMAP info for JSR45 --> + <!-- debugging be suppressed? [false] --> + <!-- --> + <!-- trimSpaces Should white spaces in template text between --> + <!-- actions or directives be trimmed? [false] --> + <!-- --> <!-- xpoweredBy Determines whether X-Powered-By response --> <!-- header is added by generated servlet [false] --> <!-- --> - <!-- compilerTargetVM Compiler target VM --> - <!-- default is System.properties --> - <!-- java.specification.version > 1.4 --> - <!-- [1.5] else [1.4] --> - <!-- --> - <!-- compilerSourceVM Compiler source VM --> - <!-- default is System.properties --> - <!-- java.specification.version > 1.4 --> - <!-- [1.5] else [1.4] --> - <!-- --> <!-- If you wish to use Jikes to compile JSP pages: --> <!-- Please see the "Using Jikes" section of the Jasper-HowTo --> <!-- page in the Tomcat documentation. --> @@ -340,14 +324,6 @@ <url-pattern>/</url-pattern> </servlet-mapping> - <!-- The mapping for the invoker servlet --> -<!-- - <servlet-mapping> - <servlet-name>invoker</servlet-name> - <url-pattern>/servlet/*</url-pattern> - </servlet-mapping> ---> - <!-- The mapping for the JSP servlet --> <servlet-mapping> <servlet-name>jsp</servlet-name> @@ -408,11 +384,6 @@ <!-- Should "virtual" paths be interpreted as --> <!-- relative to the context root, instead of --> <!-- the server root? (0=false, 1=true) [0] --> - <!-- --> - <!-- --> - <!-- IMPORTANT: To use the SSI filter, you also need to rename the --> - <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file --> - <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar --> <!-- <filter> @@ -924,9 +895,13 @@ </mime-mapping> <mime-mapping> <extension>ppt</extension> - <mime-type>application/powerpoint</mime-type> + <mime-type>application/vnd.ms-powerpoint</mime-type> </mime-mapping> <mime-mapping> + <extension>pps</extension> + <mime-type>application/vnd.ms-powerpoint</mime-type> + </mime-mapping> + <mime-mapping> <extension>ps</extension> <mime-type>application/postscript</mime-type> </mime-mapping> @@ -1013,6 +988,14 @@ <mime-type>application/x-sv4crc</mime-type> </mime-mapping> <mime-mapping> + <extension>svg</extension> + <mime-type>image/svg+xml</mime-type> + </mime-mapping> + <mime-mapping> + <extension>svgz</extension> + <mime-type>image/svg+xml</mime-type> + </mime-mapping> + <mime-mapping> <extension>swf</extension> <mime-type>application/x-shockwave-flash</mime-type> </mime-mapping> @@ -1085,6 +1068,10 @@ <mime-type>application/xhtml+xml</mime-type> </mime-mapping> <mime-mapping> + <extension>xls</extension> + <mime-type>application/vnd.ms-excel</mime-type> + </mime-mapping> + <mime-mapping> <extension>xml</extension> <mime-type>application/xml</mime-type> </mime-mapping> @@ -1109,22 +1096,14 @@ <mime-type>image/x-xwindowdump</mime-type> </mime-mapping> <mime-mapping> - <extension>wav</extension> - <mime-type>audio/x-wav</mime-type> - </mime-mapping> - <mime-mapping> - <extension>svg</extension> - <mime-type>image/svg+xml</mime-type> - </mime-mapping> - <mime-mapping> - <extension>svgz</extension> - <mime-type>image/svg+xml</mime-type> - </mime-mapping> - <mime-mapping> <extension>vsd</extension> <mime-type>application/x-visio</mime-type> </mime-mapping> <mime-mapping> + <extension>wav</extension> + <mime-type>audio/x-wav</mime-type> + </mime-mapping> + <mime-mapping> <!-- Wireless Bitmap --> <extension>wbmp</extension> <mime-type>image/vnd.wap.wbmp</mime-type> @@ -1158,6 +1137,10 @@ <mime-type>x-world/x-vrml</mime-type> </mime-mapping> <mime-mapping> + <extension>wspolicy</extension> + <mime-type>application/wspolicy+xml</mime-type> + </mime-mapping> + <mime-mapping> <extension>Z</extension> <mime-type>application/x-compress</mime-type> </mime-mapping> @@ -1169,18 +1152,6 @@ <extension>zip</extension> <mime-type>application/zip</mime-type> </mime-mapping> - <mime-mapping> - <extension>xls</extension> - <mime-type>application/vnd.ms-excel</mime-type> - </mime-mapping> - <mime-mapping> - <extension>doc</extension> - <mime-type>application/vnd.ms-word</mime-type> - </mime-mapping> - <mime-mapping> - <extension>ppt</extension> - <mime-type>application/vnd.ms-powerpoint</mime-type> - </mime-mapping> <!-- ==================== Default Welcome File List ===================== --> <!-- When a request URI refers to a directory, the default servlet looks -->