From e2507ce54cf472dacd94621e60c444500cda9166 Mon Sep 17 00:00:00 2001
From: "Chris M. Hostetter" <hossman@apache.org>
Date: Fri, 27 Apr 2012 18:13:39 +0000
Subject: [PATCH] SOLR-3309: web.xml now specifies metadata-complete=true
 (which requires Servlet 2.5) to prevent servlet containers from scanning
 class annotations on startup

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1331529 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                | 4 ++++
 solr/webapp/web/WEB-INF/web.xml | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 59c87bba9ef..a1d89576630 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -524,6 +524,10 @@ Other Changes
 
 * SOLR-3388: HTTP caching is now disabled by default for RequestUpdateHandlers. (ryan)
 
+* SOLR-3309: web.xml now specifies metadata-complete=true (which requires 
+  Servlet 2.5) to prevent servlet containers from scanning class annotations 
+  on startup.  This allows for faster startup times on some servlet containers.
+  (Bill Bell, hossman)
 
 Documentation
 ----------------------
diff --git a/solr/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml
index fe96fd769dc..899c8cc65ae 100644
--- a/solr/webapp/web/WEB-INF/web.xml
+++ b/solr/webapp/web/WEB-INF/web.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
+         version="2.5"
+         metadata-complete="true"
+>
 
   <!-- Uncomment if you are trying to use a Resin version before 3.0.19.
     Their XML implementation isn't entirely compatible with Xerces.