simplify how tomcat maven plugin is use to start container for it test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1333932 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index a19bb3576ff8ffca0e8290def3bf766e2f613eba..1a36d93a3bd439bf7bcac602b32da5fbcba81b5c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -276,9 +276,6 @@
                     <copy todir="${project.build.directory}/local-repo">
                       <fileset dir="src/test/resources/local-repo"/>
                     </copy>
-                    <copy todir="${project.build.directory}/tomcat7x">
-                      <fileset dir="src/test/tomcat7x"/>
-                    </copy>
                   </tasks>
                 </configuration>
               </execution>
@@ -320,8 +317,6 @@
                 </goals>
                 <phase>pre-integration-test</phase>
                 <configuration>
-                  <additionalConfigFilesDir>${project.build.directory}/tomcat7x/conf</additionalConfigFilesDir>
-                  <configurationDir>${project.build.directory}/tomcat7x</configurationDir>
                   <path>/archiva</path>
                   <port>${container.test.port}</port>
                   <uriEncoding>UTF-8</uriEncoding>
@@ -334,9 +329,8 @@
                     <derby.system.home>${project.build.directory}</derby.system.home>
                     <archiva.devMode>true</archiva.devMode>
                   </systemProperties>
-                  <contextFile>src/test/${container.name}/Catalina/localhost/archiva.xml</contextFile>
+                  <contextFile>${project.build.testOutputDirectory}/archiva.xml</contextFile>
                   <useNaming>true</useNaming>
-                  <serverXml>${project.build.directory}/tomcat7x/conf/server.xml</serverXml>
                 </configuration>
               </execution>
               <execution>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/archiva.xml
new file mode 100644 (file)
index 0000000..57dc7f8
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/archiva.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<Context path="/archiva"
+         docBase="${webappDirectory}">
+
+  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+            username="sa"
+            password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:${project.build.directory}/database/users;create=true"
+      />
+</Context>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/Catalina/localhost/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/Catalina/localhost/archiva.xml
deleted file mode 100644 (file)
index af06920..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/Catalina/localhost/archiva.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<Context path="/archiva"
-         docBase="${catalina.base}/webapps/archiva">
-
-  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
-            username="sa"
-            password=""
-            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:target/database/users;create=true"
-      />
-</Context>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.policy b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.policy
deleted file mode 100644 (file)
index 167e10f..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.policy
+++ /dev/null
@@ -1,7 +0,0 @@
-    grant {\r
-                 permission java.security.AllPermission;\r
-              };\r
-\r
-grant codeBase "file:${catalina.home}/lib/tomcat-juli.jar" {\r
- permission java.lang.RuntimePermission "setContextClassLoader";\r
-};
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.properties b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.properties
deleted file mode 100644 (file)
index 4cb90ce..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/catalina.properties
+++ /dev/null
@@ -1,81 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more\r
-# contributor license agreements.  See the NOTICE file distributed with\r
-# this work for additional information regarding copyright ownership.\r
-# The ASF licenses this file to You under the Apache License, Version 2.0\r
-# (the "License"); you may not use this file except in compliance with\r
-# the License.  You may obtain a copy of the License at\r
-#\r
-#     http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-#\r
-# List of comma-separated packages that start with or equal this string\r
-# will cause a security exception to be thrown when\r
-# passed to checkPackageAccess unless the\r
-# corresponding RuntimePermission ("accessClassInPackage."+package) has\r
-# been granted.\r
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.\r
-#\r
-# List of comma-separated packages that start with or equal this string\r
-# will cause a security exception to be thrown when\r
-# passed to checkPackageDefinition unless the\r
-# corresponding RuntimePermission ("defineClassInPackage."+package) has\r
-# been granted.\r
-#\r
-# by default, no packages are restricted for definition, and none of\r
-# the class loaders supplied with the JDK call checkPackageDefinition.\r
-#\r
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.\r
-\r
-#\r
-#\r
-# List of comma-separated paths defining the contents of the "common" \r
-# classloader. Prefixes should be used to define what is the repository type.\r
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.\r
-# If left as blank,the JVM system loader will be used as Catalina's "common" \r
-# loader.\r
-# Examples:\r
-#     "foo": Add this folder as a class repository\r
-#     "foo/*.jar": Add all the JARs of the specified folder as class \r
-#                  repositories\r
-#     "foo/bar.jar": Add bar.jar as a class repository\r
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar\r
-\r
-#\r
-# List of comma-separated paths defining the contents of the "server" \r
-# classloader. Prefixes should be used to define what is the repository type.\r
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.\r
-# If left as blank, the "common" loader will be used as Catalina's "server" \r
-# loader.\r
-# Examples:\r
-#     "foo": Add this folder as a class repository\r
-#     "foo/*.jar": Add all the JARs of the specified folder as class \r
-#                  repositories\r
-#     "foo/bar.jar": Add bar.jar as a class repository\r
-server.loader=\r
-\r
-#\r
-# List of comma-separated paths defining the contents of the "shared" \r
-# classloader. Prefixes should be used to define what is the repository type.\r
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,\r
-# the "common" loader will be used as Catalina's "shared" loader.\r
-# Examples:\r
-#     "foo": Add this folder as a class repository\r
-#     "foo/*.jar": Add all the JARs of the specified folder as class \r
-#                  repositories\r
-#     "foo/bar.jar": Add bar.jar as a class repository \r
-# Please note that for single jars, e.g. bar.jar, you need the URL form\r
-# starting with file:.\r
-shared.loader=\r
-\r
-#\r
-# String cache configuration.\r
-tomcat.util.buf.StringCache.byte.enabled=true\r
-#tomcat.util.buf.StringCache.char.enabled=true\r
-#tomcat.util.buf.StringCache.trainThreshold=500000\r
-#tomcat.util.buf.StringCache.cacheSize=5000\r

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/context.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/context.xml
deleted file mode 100644 (file)
index 876067a..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/context.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  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.
--->
-<!-- The contents of this file will be loaded for each web application -->
-<Context>
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-    <!--
-    <Manager pathname="" />
-    -->
-
-    <!-- Uncomment this to enable Comet connection tacking (provides events
-         on session expiration as well as webapp lifecycle) -->
-    <!--
-    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-    -->
-
-</Context>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/logging.properties b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/logging.properties
deleted file mode 100644 (file)
index 9808c73..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/logging.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more\r
-# contributor license agreements.  See the NOTICE file distributed with\r
-# this work for additional information regarding copyright ownership.\r
-# The ASF licenses this file to You under the Apache License, Version 2.0\r
-# (the "License"); you may not use this file except in compliance with\r
-# the License.  You may obtain a copy of the License at\r
-#\r
-#     http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-handlers = java.util.logging.ConsoleHandler\r
-\r
-############################################################\r
-# Handler specific properties.\r
-# Describes specific configuration info for Handlers.\r
-############################################################\r
-\r
-java.util.logging.ConsoleHandler.level = FINE\r
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter\r
-\r
-############################################################\r
-# Facility specific properties.\r
-# Provides extra control for each logger.\r
-############################################################\r
-\r
-org.apache.catalina.level = @catalina.logging.level@\r
-org.apache.catalina.startup.HostConfig.level = INFO\r
-org.apache.catalina.session.ManagerBase.level = INFO\r
-\r
-\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler\r
-\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler\r
-\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = java.util.logging.ConsoleHandler\r
-\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO\r
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/server.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/server.xml
deleted file mode 100644 (file)
index 5c4edcc..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/server.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<!-- Note:  A "Server" is not itself a "Container", so you may not\r
-     define subcomponents such as "Valves" at this level.\r
-     Documentation at /docs/config/server.html\r
- -->\r
-<Server port="9695" shutdown="SHUTDOWN">\r
-\r
-  <!-- Global JNDI resources\r
-       Documentation at /docs/jndi-resources-howto.html\r
-  -->\r
-  <GlobalNamingResources>\r
-\r
-  </GlobalNamingResources>\r
-\r
-  <Service name="Catalina">\r
-\r
-    <Connector port="9696" protocol="HTTP/1.1"\r
-               connectionTimeout="20000" \r
-               redirectPort="8443" />\r
-\r
-    <Engine name="Catalina" defaultHost="localhost">\r
-\r
-      <Valve className="org.apache.catalina.valves.AccessLogValve"\r
-             resolveHosts="false" pattern="%t-m:%m-url:%U-%q-%Dms"/>\r
-\r
-      <Host name="localhost"  appBase="webapps"\r
-            unpackWARs="true" autoDeploy="true"\r
-            xmlValidation="false" xmlNamespaceAware="false">\r
-\r
-      </Host>\r
-    </Engine>\r
-  </Service>\r
-</Server>\r

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/web.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/web.xml
deleted file mode 100644 (file)
index 05f7c77..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat7x/conf/web.xml
+++ /dev/null
@@ -1,1205 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"\r
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"\r
-    version="2.5">\r
-\r
-  <!-- ======================== Introduction ============================== -->\r
-  <!-- This document defines default values for *all* web applications      -->\r
-  <!-- loaded into this instance of Tomcat.  As each application is         -->\r
-  <!-- deployed, this file is processed, followed by the                    -->\r
-  <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->\r
-  <!-- applications.                                                        -->\r
-  <!--                                                                      -->\r
-  <!-- WARNING:  Do not configure application-specific resources here!      -->\r
-  <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->\r
-\r
-\r
-  <!-- ================== Built In Servlet Definitions ==================== -->\r
-\r
-\r
-  <!-- The default servlet for all web applications, that serves static     -->\r
-  <!-- resources.  It processes all requests that are not mapped to other   -->\r
-  <!-- servlets with servlet mappings (defined either here or in your own   -->\r
-  <!-- web.xml file.  This servlet supports the following initialization    -->\r
-  <!-- parameters (default values are in square brackets):                  -->\r
-  <!--                                                                      -->\r
-  <!--   debug               Debugging detail level for messages logged     -->\r
-  <!--                       by this servlet.  [0]                          -->\r
-  <!--                                                                      -->\r
-  <!--   fileEncoding        Encoding to be used to read static resources   -->\r
-  <!--                       [platform default]                             -->\r
-  <!--                                                                      -->\r
-  <!--   input               Input buffer size (in bytes) when reading      -->\r
-  <!--                       resources to be served.  [2048]                -->\r
-  <!--                                                                      -->\r
-  <!--   listings            Should directory listings be produced if there -->\r
-  <!--                       is no welcome file in this directory?  [false] -->\r
-  <!--                       WARNING: Listings for directories with many    -->\r
-  <!--                       entries can be slow and may consume            -->\r
-  <!--                       significant proportions of server resources.   -->\r
-  <!--                                                                      -->\r
-  <!--   output              Output buffer size (in bytes) when writing     -->\r
-  <!--                       resources to be served.  [2048]                -->\r
-  <!--                                                                      -->\r
-  <!--   readonly            Is this context "read only", so HTTP           -->\r
-  <!--                       commands like PUT and DELETE are               -->\r
-  <!--                       rejected?  [true]                              -->\r
-  <!--                                                                      -->\r
-  <!--   readmeFile          File name to display with the directory        -->\r
-  <!--                       contents. [null]                               -->\r
-  <!--                                                                      -->\r
-  <!--   sendfileSize        If the connector used supports sendfile, this  -->\r
-  <!--                       represents the minimal file size in KB for     -->\r
-  <!--                       which sendfile will be used. Use a negative    -->\r
-  <!--                       value to always disable sendfile.  [48]        -->\r
-  <!--                                                                      -->\r
-  <!--   useAcceptRanges     Should the Accept-Ranges header be included    -->\r
-  <!--                       in responses where appropriate? [true]         -->\r
-  <!--                                                                      -->\r
-  <!--  For directory listing customization. Checks localXsltFile, then     -->\r
-  <!--  globalXsltFile, then defaults to original behavior.                 -->\r
-  <!--                                                                      -->\r
-  <!--   localXsltFile       Make directory listings an XML doc and         -->\r
-  <!--                       pass the result to this style sheet residing   -->\r
-  <!--                       in that directory. This overrides              -->\r
-  <!--                       contextXsltFile and globalXsltFile[null]       -->\r
-  <!--                                                                      -->\r
-  <!--   contextXsltFile     Make directory listings an XML doc and         -->\r
-  <!--                       pass the result to this style sheet which is   -->\r
-  <!--                       relative to the context root. This overrides   -->\r
-  <!--                       globalXsltFile[null]                           -->\r
-  <!--                                                                      -->\r
-  <!--   globalXsltFile      Site wide configuration version of             -->\r
-  <!--                       localXsltFile This argument is expected        -->\r
-  <!--                       to be a physical file. [null]                  -->\r
-  <!--                                                                      -->\r
-  <!--                                                                      -->\r
-\r
-    <servlet>\r
-        <servlet-name>default</servlet-name>\r
-        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>\r
-        <init-param>\r
-            <param-name>debug</param-name>\r
-            <param-value>0</param-value>\r
-        </init-param>\r
-        <init-param>\r
-            <param-name>listings</param-name>\r
-            <param-value>false</param-value>\r
-        </init-param>\r
-        <load-on-startup>1</load-on-startup>\r
-    </servlet>\r
-\r
-\r
-  <!-- This servlet has been deprecated due to security concerns. Servlets  -->\r
-  <!-- should be explicitly mapped in web.xml                               -->\r
-  <!--                                                                      -->\r
-  <!-- The "invoker" servlet, which executes anonymous servlet classes      -->\r
-  <!-- that have not been defined in a web.xml file.  Traditionally, this   -->\r
-  <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map   -->\r
-  <!-- it to other patterns as well.  The extra path info portion of such a -->\r
-  <!-- request must be the fully qualified class name of a Java class that  -->\r
-  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->\r
-  <!-- of an existing servlet definition.     This servlet supports the     -->\r
-  <!-- following initialization parameters (default values are in square    -->\r
-  <!-- brackets):                                                           -->\r
-  <!--                                                                      -->\r
-  <!--   debug               Debugging detail level for messages logged     -->\r
-  <!--                       by this servlet.  [0]                          -->\r
-\r
-<!--\r
-    <servlet>\r
-        <servlet-name>invoker</servlet-name>\r
-        <servlet-class>\r
-          org.apache.catalina.servlets.InvokerServlet\r
-        </servlet-class>\r
-        <init-param>\r
-            <param-name>debug</param-name>\r
-            <param-value>0</param-value>\r
-        </init-param>\r
-        <load-on-startup>2</load-on-startup>\r
-    </servlet>\r
--->\r
-\r
-\r
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->\r
-  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->\r
-  <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->\r
-  <!-- following initialization parameters (default values are in square    -->\r
-  <!-- brackets):                                                           -->\r
-  <!--                                                                      -->\r
-  <!--   checkInterval       If development is false and checkInterval is   -->\r
-  <!--                       greater than zero, background compilations are -->\r
-  <!--                       enabled. checkInterval is the time in seconds  -->\r
-  <!--                       between checks to see if a JSP page (and its   -->\r
-  <!--                       dependent files) needs to  be recompiled. [0]  -->\r
-  <!--                                                                      -->\r
-  <!--   classdebuginfo      Should the class file be compiled with         -->\r
-  <!--                       debugging information?  [true]                 -->\r
-  <!--                                                                      -->\r
-  <!--   classpath           What class path should I use while compiling   -->\r
-  <!--                       generated servlets?  [Created dynamically      -->\r
-  <!--                       based on the current web application]          -->\r
-  <!--                                                                      -->\r
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->\r
-  <!--                       pages.  See the jasper documentation for more  -->\r
-  <!--                       information.                                   -->\r
-  <!--                                                                      -->\r
-  <!--   compilerSourceVM    Compiler source VM. [1.5]                      -->\r
-  <!--                                                                      -->\r
-  <!--   compilerTargetVM    Compiler target VM. [1.5]                      -->  \r
-  <!--                                                                      -->\r
-  <!--   development         Is Jasper used in development mode? If true,   -->\r
-  <!--                       the frequency at which JSPs are checked for    -->\r
-  <!--                       modification may be specified via the          -->\r
-  <!--                       modificationTestInterval parameter. [true]     -->\r
-  <!--                                                                      -->\r
-  <!--   displaySourceFragment                                              -->\r
-  <!--                       Should a source fragment be included in        -->\r
-  <!--                       exception messages? [true]                     -->\r
-  <!--                                                                      -->\r
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->\r
-  <!--                       dumped to a file? [false]                      -->\r
-  <!--                       False if suppressSmap is true                  -->\r
-  <!--                                                                      -->\r
-  <!--   enablePooling       Determines whether tag handler pooling is      -->\r
-  <!--                       enabled. This is a compilation option. It will -->\r
-  <!--                       not alter the behaviour of JSPs that have      -->\r
-  <!--                       already been compiled. [true]                  -->\r
-  <!--                                                                      -->\r
-  <!--   engineOptionsClass  Allows specifying the Options class used to    -->\r
-  <!--                       configure Jasper. If not present, the default  -->\r
-  <!--                       EmbeddedServletOptions will be used.           -->\r
-  <!--                                                                      -->\r
-  <!--   errorOnUseBeanInvalidClassAttribute                                -->\r
-  <!--                       Should Jasper issue an error when the value of -->\r
-  <!--                       the class attribute in an useBean action is    -->\r
-  <!--                       not a valid bean class?  [true]                -->\r
-  <!--                                                                      -->\r
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->\r
-  <!--                       a separate JVM is used for JSP page compiles   -->\r
-  <!--                       from the one Tomcat is running in. [true]      -->\r
-  <!--                                                                      -->\r
-  <!--   genStrAsCharArray   Should text strings be generated as char       -->\r
-  <!--                       arrays, to improve performance in some cases?  -->\r
-  <!--                       [false]                                        -->\r
-  <!--                                                                      -->\r
-  <!--   ieClassId           The class-id value to be sent to Internet      -->\r
-  <!--                       Explorer when using <jsp:plugin> tags.         -->\r
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->\r
-  <!--                                                                      -->\r
-  <!--   javaEncoding        Java file encoding to use for generating java  -->\r
-  <!--                       source files. [UTF8]                           -->\r
-  <!--                                                                      -->\r
-  <!--   keepgenerated       Should we keep the generated Java source code  -->\r
-  <!--                       for each page instead of deleting it? [true]   -->\r
-  <!--                                                                      -->\r
-  <!--   mappedfile          Should we generate static content with one     -->\r
-  <!--                       print statement per input line, to ease        -->\r
-  <!--                       debugging?  [true]                             -->\r
-  <!--                                                                      -->\r
-  <!--   modificationTestInterval                                           -->\r
-  <!--                       Causes a JSP (and its dependent files) to not  -->\r
-  <!--                       be checked for modification during the         -->\r
-  <!--                       specified time interval (in seconds) from the  -->\r
-  <!--                       last time the JSP was checked for              -->\r
-  <!--                       modification. A value of 0 will cause the JSP  -->\r
-  <!--                       to be checked on every access.                 -->\r
-  <!--                       Used in development mode only. [4]             -->\r
-  <!--                                                                      -->\r
-  <!--   recompileOnFail     If a JSP compilation fails should the          -->\r
-  <!--                       modificationTestInterval be ignored and the    -->\r
-  <!--                       next access trigger a re-compilation attempt?  -->\r
-  <!--                       Used in development mode only and is disabled  -->\r
-  <!--                       by default as compilation may be expensive and -->\r
-  <!--                       could lead to excessive resource usage.        -->\r
-  <!--                       [false]                                        -->\r
-  <!--                                                                      -->\r
-  <!--   scratchdir          What scratch directory should we use when      -->\r
-  <!--                       compiling JSP pages?  [default work directory  -->\r
-  <!--                       for the current web application]               -->\r
-  <!--                                                                      -->\r
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->\r
-  <!--                       debugging be suppressed?  [false]              -->\r
-  <!--                                                                      -->\r
-  <!--   trimSpaces          Should white spaces in template text between   -->\r
-  <!--                       actions or directives be trimmed?  [false]     -->\r
-  <!--                                                                      -->\r
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->\r
-  <!--                       header is added by generated servlet  [false]  -->\r
-  <!--                                                                      -->\r
-  <!-- If you wish to use Jikes to compile JSP pages:                       -->\r
-  <!--   Please see the "Using Jikes" section of the Jasper-HowTo           -->\r
-  <!--   page in the Tomcat documentation.                                  -->\r
-\r
-    <servlet>\r
-        <servlet-name>jsp</servlet-name>\r
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>\r
-        <init-param>\r
-            <param-name>fork</param-name>\r
-            <param-value>false</param-value>\r
-        </init-param>\r
-        <init-param>\r
-            <param-name>xpoweredBy</param-name>\r
-            <param-value>false</param-value>\r
-        </init-param>\r
-        <load-on-startup>3</load-on-startup>\r
-    </servlet>\r
-\r
-\r
-  <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->\r
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->\r
-  <!--                                                                      -->\r
-  <!-- Server Side Includes processing servlet, which processes SSI         -->\r
-  <!-- directives in HTML pages consistent with similar support in web      -->\r
-  <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->\r
-  <!-- URL pattern "*.shtml".  This servlet supports the following          -->\r
-  <!-- initialization parameters (default values are in square brackets):   -->\r
-  <!--                                                                      -->\r
-  <!--   buffered            Should output from this servlet be buffered?   -->\r
-  <!--                       (0=false, 1=true)  [0]                         -->\r
-  <!--                                                                      -->\r
-  <!--   debug               Debugging detail level for messages logged     -->\r
-  <!--                       by this servlet.  [0]                          -->\r
-  <!--                                                                      -->\r
-  <!--   expires             The number of seconds before a page with SSI   -->\r
-  <!--                       directives will expire.  [No default]          -->\r
-  <!--                                                                      -->\r
-  <!--   isVirtualWebappRelative                                            -->\r
-  <!--                       Should "virtual" paths be interpreted as       -->\r
-  <!--                       relative to the context root, instead of       -->\r
-  <!--                       the server root?  (0=false, 1=true) [0]        -->\r
-  <!--                                                                      -->\r
-  <!--   inputEncoding       The encoding to assume for SSI resources if    -->\r
-  <!--                       one is not available from the resource.        -->\r
-  <!--                       [Platform default]                             -->\r
-  <!--                                                                      -->\r
-  <!--   outputEncoding      The encoding to use for the page that results  -->\r
-  <!--                       from the SSI processing. [UTF-8]               -->\r
-  <!--                                                                      -->\r
-  <!--   allowExec           Is use of the exec command enabled? [false]    -->\r
-\r
-<!--\r
-    <servlet>\r
-        <servlet-name>ssi</servlet-name>\r
-        <servlet-class>\r
-          org.apache.catalina.ssi.SSIServlet\r
-        </servlet-class>\r
-        <init-param>\r
-          <param-name>buffered</param-name>\r
-          <param-value>1</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>debug</param-name>\r
-          <param-value>0</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>expires</param-name>\r
-          <param-value>666</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>isVirtualWebappRelative</param-name>\r
-          <param-value>0</param-value>\r
-        </init-param>\r
-        <load-on-startup>4</load-on-startup>\r
-    </servlet>\r
--->\r
-\r
-\r
-  <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->\r
-  <!-- execution of external applications that conform to the CGI spec      -->\r
-  <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->\r
-  <!-- "/cgi-bin/*", which means that any CGI applications that are         -->\r
-  <!-- executed must be present within the web application.  This servlet   -->\r
-  <!-- supports the following initialization parameters (default values     -->\r
-  <!-- are in square brackets):                                             -->\r
-  <!--                                                                      -->\r
-  <!--   cgiPathPrefix        The CGI search path will start at             -->\r
-  <!--                        webAppRootDir + File.separator + this prefix. -->\r
-  <!--                        [WEB-INF/cgi]                                 -->\r
-  <!--                                                                      -->\r
-  <!--   debug                Debugging detail level for messages logged    -->\r
-  <!--                        by this servlet.  [0]                         -->\r
-  <!--                                                                      -->\r
-  <!--   executable           Name of the executable used to run the        -->\r
-  <!--                        script. [perl]                                -->\r
-  <!--                                                                      -->\r
-  <!--   parameterEncoding    Name of parameter encoding to be used with    -->\r
-  <!--                        CGI servlet.                                  -->\r
-  <!--                        [System.getProperty("file.encoding","UTF-8")] -->\r
-  <!--                                                                      -->\r
-  <!--   passShellEnvironment Should the shell environment variables (if    -->\r
-  <!--                        any) be passed to the CGI script? [false]     -->\r
-  <!--                                                                      -->\r
-  <!--   stderrTimeout        The time (in milliseconds) to wait for the    -->\r
-  <!--                        reading of stderr to complete before          -->\r
-  <!--                        terminating the CGI process. [2000]           -->\r
-\r
-<!--\r
-    <servlet>\r
-        <servlet-name>cgi</servlet-name>\r
-        <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>\r
-        <init-param>\r
-          <param-name>debug</param-name>\r
-          <param-value>0</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>cgiPathPrefix</param-name>\r
-          <param-value>WEB-INF/cgi</param-value>\r
-        </init-param>\r
-         <load-on-startup>5</load-on-startup>\r
-    </servlet>\r
--->\r
-\r
-\r
-  <!-- ================ Built In Servlet Mappings ========================= -->\r
-\r
-\r
-  <!-- The servlet mappings for the built in servlets defined above.  Note  -->\r
-  <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->\r
-  <!-- must uncomment these mappings (or add them to your application's own -->\r
-  <!-- web.xml deployment descriptor) to enable these services              -->\r
-\r
-    <!-- The mapping for the default servlet -->\r
-    <servlet-mapping>\r
-        <servlet-name>default</servlet-name>\r
-        <url-pattern>/</url-pattern>\r
-    </servlet-mapping>\r
-\r
-    <!-- The mapping for the deprecated invoker servlet -->\r
-<!--\r
-    <servlet-mapping>\r
-        <servlet-name>invoker</servlet-name>\r
-        <url-pattern>/servlet/*</url-pattern>\r
-    </servlet-mapping>\r
--->\r
-\r
-    <!-- The mapping for the JSP servlet -->\r
-    <servlet-mapping>\r
-        <servlet-name>jsp</servlet-name>\r
-        <url-pattern>*.jsp</url-pattern>\r
-    </servlet-mapping>\r
-\r
-    <servlet-mapping>\r
-        <servlet-name>jsp</servlet-name>\r
-        <url-pattern>*.jspx</url-pattern>\r
-    </servlet-mapping>\r
-\r
-    <!-- The mapping for the SSI servlet -->\r
-<!--\r
-    <servlet-mapping>\r
-        <servlet-name>ssi</servlet-name>\r
-        <url-pattern>*.shtml</url-pattern>\r
-    </servlet-mapping>\r
--->\r
-\r
-    <!-- The mapping for the CGI Gateway servlet -->\r
-\r
-<!--\r
-    <servlet-mapping>\r
-        <servlet-name>cgi</servlet-name>\r
-        <url-pattern>/cgi-bin/*</url-pattern>\r
-    </servlet-mapping>\r
--->\r
-\r
-\r
-  <!-- ================== Built In Filter Definitions ===================== -->\r
-\r
-  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->\r
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->\r
-  <!--                                                                      -->\r
-  <!-- Server Side Includes processing filter, which processes SSI          -->\r
-  <!-- directives in HTML pages consistent with similar support in web      -->\r
-  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->\r
-  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->\r
-  <!-- selectively enable/disable SSI processing based on mime types. For   -->\r
-  <!-- this to work you will need to uncomment the .shtml mime type         -->\r
-  <!-- definition towards the bottom of this file.                          -->\r
-  <!-- The contentType init param allows you to apply SSI processing to JSP -->\r
-  <!-- pages, javascript, or any other content you wish.  This filter       -->\r
-  <!-- supports the following initialization parameters (default values are -->\r
-  <!-- in square brackets):                                                 -->\r
-  <!--                                                                      -->\r
-  <!--   contentType         A regex pattern that must be matched before    -->\r
-  <!--                       SSI processing is applied.                     -->\r
-  <!--                       [text/x-server-parsed-html(;.*)?]              -->\r
-  <!--                                                                      -->\r
-  <!--   debug               Debugging detail level for messages logged     -->\r
-  <!--                       by this servlet.  [0]                          -->\r
-  <!--                                                                      -->\r
-  <!--   expires             The number of seconds before a page with SSI   -->\r
-  <!--                       directives will expire.  [No default]          -->\r
-  <!--                                                                      -->\r
-  <!--   isVirtualWebappRelative                                            -->\r
-  <!--                       Should "virtual" paths be interpreted as       -->\r
-  <!--                       relative to the context root, instead of       -->\r
-  <!--                       the server root?  (0=false, 1=true) [0]        -->\r
-  <!--                                                                      -->\r
-  <!--   allowExec           Is use of the exec command enabled? [false]    -->\r
-\r
-<!--\r
-    <filter>\r
-        <filter-name>ssi</filter-name>\r
-        <filter-class>\r
-          org.apache.catalina.ssi.SSIFilter\r
-        </filter-class>\r
-        <init-param>\r
-          <param-name>contentType</param-name>\r
-          <param-value>text/x-server-parsed-html(;.*)?</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>debug</param-name>\r
-          <param-value>0</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>expires</param-name>\r
-          <param-value>666</param-value>\r
-        </init-param>\r
-        <init-param>\r
-          <param-name>isVirtualWebappRelative</param-name>\r
-          <param-value>0</param-value>\r
-        </init-param>\r
-    </filter>\r
--->\r
-\r
-\r
-  <!-- ==================== Built In Filter Mappings ====================== -->\r
-\r
-  <!-- The mapping for the SSI Filter -->\r
-<!--\r
-    <filter-mapping>\r
-        <filter-name>ssi</filter-name>\r
-        <url-pattern>*.shtml</url-pattern>\r
-    </filter-mapping>\r
--->\r
-\r
-\r
-  <!-- ==================== Default Session Configuration ================= -->\r
-  <!-- You can set the default session timeout (in minutes) for all newly   -->\r
-  <!-- created sessions by modifying the value below.                       -->\r
-\r
-    <session-config>\r
-        <session-timeout>30</session-timeout>\r
-    </session-config>\r
-\r
-\r
-  <!-- ===================== Default MIME Type Mappings =================== -->\r
-  <!-- When serving static resources, Tomcat will automatically generate    -->\r
-  <!-- a "Content-Type" header based on the resource's filename extension,  -->\r
-  <!-- based on these mappings.  Additional mappings can be added here (to  -->\r
-  <!-- apply to all web applications), or in your own application's web.xml -->\r
-  <!-- deployment descriptor.                                               -->\r
-\r
-    <mime-mapping>\r
-        <extension>abs</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ai</extension>\r
-        <mime-type>application/postscript</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>aif</extension>\r
-        <mime-type>audio/x-aiff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>aifc</extension>\r
-        <mime-type>audio/x-aiff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>aiff</extension>\r
-        <mime-type>audio/x-aiff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>aim</extension>\r
-        <mime-type>application/x-aim</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>art</extension>\r
-        <mime-type>image/x-jg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>asf</extension>\r
-        <mime-type>video/x-ms-asf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>asx</extension>\r
-        <mime-type>video/x-ms-asf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>au</extension>\r
-        <mime-type>audio/basic</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>avi</extension>\r
-        <mime-type>video/x-msvideo</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>avx</extension>\r
-        <mime-type>video/x-rad-screenplay</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>bcpio</extension>\r
-        <mime-type>application/x-bcpio</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>bin</extension>\r
-        <mime-type>application/octet-stream</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>bmp</extension>\r
-        <mime-type>image/bmp</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>body</extension>\r
-        <mime-type>text/html</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>cdf</extension>\r
-        <mime-type>application/x-cdf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>cer</extension>\r
-        <mime-type>application/x-x509-ca-cert</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>class</extension>\r
-        <mime-type>application/java</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>cpio</extension>\r
-        <mime-type>application/x-cpio</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>csh</extension>\r
-        <mime-type>application/x-csh</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>css</extension>\r
-        <mime-type>text/css</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>dib</extension>\r
-        <mime-type>image/bmp</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>doc</extension>\r
-        <mime-type>application/msword</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>dtd</extension>\r
-        <mime-type>application/xml-dtd</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>dv</extension>\r
-        <mime-type>video/x-dv</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>dvi</extension>\r
-        <mime-type>application/x-dvi</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>eps</extension>\r
-        <mime-type>application/postscript</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>etx</extension>\r
-        <mime-type>text/x-setext</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>exe</extension>\r
-        <mime-type>application/octet-stream</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>gif</extension>\r
-        <mime-type>image/gif</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>gtar</extension>\r
-        <mime-type>application/x-gtar</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>gz</extension>\r
-        <mime-type>application/x-gzip</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>hdf</extension>\r
-        <mime-type>application/x-hdf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>hqx</extension>\r
-        <mime-type>application/mac-binhex40</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>htc</extension>\r
-        <mime-type>text/x-component</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>htm</extension>\r
-        <mime-type>text/html</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>html</extension>\r
-        <mime-type>text/html</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>hqx</extension>\r
-        <mime-type>application/mac-binhex40</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ief</extension>\r
-        <mime-type>image/ief</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jad</extension>\r
-        <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jar</extension>\r
-        <mime-type>application/java-archive</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>java</extension>\r
-        <mime-type>text/plain</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jnlp</extension>\r
-        <mime-type>application/x-java-jnlp-file</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jpe</extension>\r
-        <mime-type>image/jpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jpeg</extension>\r
-        <mime-type>image/jpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jpg</extension>\r
-        <mime-type>image/jpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>js</extension>\r
-        <mime-type>text/javascript</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jsf</extension>\r
-        <mime-type>text/plain</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>jspf</extension>\r
-        <mime-type>text/plain</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>kar</extension>\r
-        <mime-type>audio/x-midi</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>latex</extension>\r
-        <mime-type>application/x-latex</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>m3u</extension>\r
-        <mime-type>audio/x-mpegurl</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mac</extension>\r
-        <mime-type>image/x-macpaint</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>man</extension>\r
-        <mime-type>application/x-troff-man</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mathml</extension>\r
-        <mime-type>application/mathml+xml</mime-type> \r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>me</extension>\r
-        <mime-type>application/x-troff-me</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mid</extension>\r
-        <mime-type>audio/x-midi</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>midi</extension>\r
-        <mime-type>audio/x-midi</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mif</extension>\r
-        <mime-type>application/x-mif</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mov</extension>\r
-        <mime-type>video/quicktime</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>movie</extension>\r
-        <mime-type>video/x-sgi-movie</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mp1</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mp2</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mp3</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mp4</extension>\r
-        <mime-type>video/mp4</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpa</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpe</extension>\r
-        <mime-type>video/mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpeg</extension>\r
-        <mime-type>video/mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpega</extension>\r
-        <mime-type>audio/x-mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpg</extension>\r
-        <mime-type>video/mpeg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>mpv2</extension>\r
-        <mime-type>video/mpeg2</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ms</extension>\r
-        <mime-type>application/x-wais-source</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>nc</extension>\r
-        <mime-type>application/x-netcdf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>oda</extension>\r
-        <mime-type>application/oda</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Database -->\r
-        <extension>odb</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.database</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Chart -->\r
-        <extension>odc</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.chart</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Formula -->\r
-        <extension>odf</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.formula</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Drawing -->\r
-        <extension>odg</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Image -->\r
-        <extension>odi</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.image</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Master Document -->\r
-        <extension>odm</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Presentation -->\r
-        <extension>odp</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Spreadsheet -->\r
-        <extension>ods</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Text -->\r
-        <extension>odt</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.text</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ogg</extension>\r
-        <mime-type>application/ogg</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Drawing Template -->\r
-        <extension>otg </extension>\r
-        <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- HTML Document Template -->\r
-        <extension>oth</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Presentation Template -->\r
-        <extension>otp</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Spreadsheet Template -->\r
-        <extension>ots</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- OpenDocument Text Template -->\r
-        <extension>ott</extension>\r
-        <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pbm</extension>\r
-        <mime-type>image/x-portable-bitmap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pct</extension>\r
-        <mime-type>image/pict</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pdf</extension>\r
-        <mime-type>application/pdf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pgm</extension>\r
-        <mime-type>image/x-portable-graymap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pic</extension>\r
-        <mime-type>image/pict</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pict</extension>\r
-        <mime-type>image/pict</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pls</extension>\r
-        <mime-type>audio/x-scpls</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>png</extension>\r
-        <mime-type>image/png</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pnm</extension>\r
-        <mime-type>image/x-portable-anymap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pnt</extension>\r
-        <mime-type>image/x-macpaint</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ppm</extension>\r
-        <mime-type>image/x-portable-pixmap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ppt</extension>\r
-        <mime-type>application/vnd.ms-powerpoint</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>pps</extension>\r
-        <mime-type>application/vnd.ms-powerpoint</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ps</extension>\r
-        <mime-type>application/postscript</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>psd</extension>\r
-        <mime-type>image/x-photoshop</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>qt</extension>\r
-        <mime-type>video/quicktime</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>qti</extension>\r
-        <mime-type>image/x-quicktime</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>qtif</extension>\r
-        <mime-type>image/x-quicktime</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ras</extension>\r
-        <mime-type>image/x-cmu-raster</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>rdf</extension>\r
-        <mime-type>application/rdf+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>rgb</extension>\r
-        <mime-type>image/x-rgb</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>rm</extension>\r
-        <mime-type>application/vnd.rn-realmedia</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>roff</extension>\r
-        <mime-type>application/x-troff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>rtf</extension>\r
-        <mime-type>application/rtf</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>rtx</extension>\r
-        <mime-type>text/richtext</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>sh</extension>\r
-        <mime-type>application/x-sh</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>shar</extension>\r
-        <mime-type>application/x-shar</mime-type>\r
-    </mime-mapping>\r
-<!--\r
-    <mime-mapping>\r
-        <extension>shtml</extension>\r
-        <mime-type>text/x-server-parsed-html</mime-type>\r
-    </mime-mapping>\r
--->\r
-    <mime-mapping>\r
-        <extension>smf</extension>\r
-        <mime-type>audio/x-midi</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>sit</extension>\r
-        <mime-type>application/x-stuffit</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>snd</extension>\r
-        <mime-type>audio/basic</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>src</extension>\r
-        <mime-type>application/x-wais-source</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>sv4cpio</extension>\r
-        <mime-type>application/x-sv4cpio</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>sv4crc</extension>\r
-        <mime-type>application/x-sv4crc</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>svg</extension>\r
-        <mime-type>image/svg+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>svgz</extension>\r
-        <mime-type>image/svg+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>swf</extension>\r
-        <mime-type>application/x-shockwave-flash</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>t</extension>\r
-        <mime-type>application/x-troff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tar</extension>\r
-        <mime-type>application/x-tar</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tcl</extension>\r
-        <mime-type>application/x-tcl</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tex</extension>\r
-        <mime-type>application/x-tex</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>texi</extension>\r
-        <mime-type>application/x-texinfo</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>texinfo</extension>\r
-        <mime-type>application/x-texinfo</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tif</extension>\r
-        <mime-type>image/tiff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tiff</extension>\r
-        <mime-type>image/tiff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tr</extension>\r
-        <mime-type>application/x-troff</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>tsv</extension>\r
-        <mime-type>text/tab-separated-values</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>txt</extension>\r
-        <mime-type>text/plain</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ulw</extension>\r
-        <mime-type>audio/basic</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>ustar</extension>\r
-        <mime-type>application/x-ustar</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>vxml</extension>\r
-        <mime-type>application/voicexml+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xbm</extension>\r
-        <mime-type>image/x-xbitmap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xht</extension>\r
-        <mime-type>application/xhtml+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xhtml</extension>\r
-        <mime-type>application/xhtml+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xls</extension>\r
-        <mime-type>application/vnd.ms-excel</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xml</extension>\r
-        <mime-type>application/xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xpm</extension>\r
-        <mime-type>image/x-xpixmap</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xsl</extension>\r
-        <mime-type>application/xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xslt</extension>\r
-        <mime-type>application/xslt+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xul</extension>\r
-        <mime-type>application/vnd.mozilla.xul+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>xwd</extension>\r
-        <mime-type>image/x-xwindowdump</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>vsd</extension>\r
-        <mime-type>application/x-visio</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>wav</extension>\r
-        <mime-type>audio/x-wav</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- Wireless Bitmap -->\r
-        <extension>wbmp</extension>\r
-        <mime-type>image/vnd.wap.wbmp</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- WML Source -->\r
-        <extension>wml</extension>\r
-        <mime-type>text/vnd.wap.wml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- Compiled WML -->\r
-        <extension>wmlc</extension>\r
-        <mime-type>application/vnd.wap.wmlc</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- WML Script Source -->\r
-        <extension>wmls</extension>\r
-        <mime-type>text/vnd.wap.wmlscript</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <!-- Compiled WML Script -->\r
-        <extension>wmlscriptc</extension>\r
-        <mime-type>application/vnd.wap.wmlscriptc</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>wmv</extension>\r
-        <mime-type>video/x-ms-wmv</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>wrl</extension>\r
-        <mime-type>x-world/x-vrml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>wspolicy</extension>\r
-        <mime-type>application/wspolicy+xml</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>Z</extension>\r
-        <mime-type>application/x-compress</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>z</extension>\r
-        <mime-type>application/x-compress</mime-type>\r
-    </mime-mapping>\r
-    <mime-mapping>\r
-        <extension>zip</extension>\r
-        <mime-type>application/zip</mime-type>\r
-    </mime-mapping>\r
-\r
-  <!-- ==================== Default Welcome File List ===================== -->\r
-  <!-- When a request URI refers to a directory, the default servlet looks  -->\r
-  <!-- for a "welcome file" within that directory and, if present,          -->\r
-  <!-- to the corresponding resource URI for display.  If no welcome file   -->\r
-  <!-- is present, the default servlet either serves a directory listing,   -->\r
-  <!-- or returns a 404 status, depending on how it is configured.          -->\r
-  <!--                                                                      -->\r
-  <!-- If you define welcome files in your own application's web.xml        -->\r
-  <!-- deployment descriptor, that list *replaces* the list configured      -->\r
-  <!-- here, so be sure that you include any of the default values that     -->\r
-  <!-- you wish to include.                                                 -->\r
-\r
-    <welcome-file-list>\r
-        <welcome-file>index.html</welcome-file>\r
-        <welcome-file>index.htm</welcome-file>\r
-        <welcome-file>index.jsp</welcome-file>\r
-    </welcome-file-list>\r
-\r
-</web-app>\r