You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2007/05/23 21:57:00 UTC

svn commit: r541050 - in /lucene/solr/trunk: ./ example/ example/etc/ example/ext/ example/lib/ example/lib/jsp-2.1/ example/lib/jsp/ example/logs/

Author: ryan
Date: Wed May 23 12:56:58 2007
New Revision: 541050

URL: http://svn.apache.org/viewvc?view=rev&rev=541050
Log:
SOLR-128: Upgraded Jetty to the latest stable release 6.1.3

Added:
    lucene/solr/trunk/example/lib/jetty-6.1.3.jar   (with props)
    lucene/solr/trunk/example/lib/jetty-util-6.1.3.jar   (with props)
    lucene/solr/trunk/example/lib/jsp-2.1/
    lucene/solr/trunk/example/lib/jsp-2.1/ant-1.6.5.jar   (with props)
    lucene/solr/trunk/example/lib/jsp-2.1/core-3.1.1.jar   (with props)
    lucene/solr/trunk/example/lib/jsp-2.1/jsp-2.1.jar   (with props)
    lucene/solr/trunk/example/lib/jsp-2.1/jsp-api-2.1.jar   (with props)
    lucene/solr/trunk/example/lib/servlet-api-2.5-6.1.3.jar   (with props)
    lucene/solr/trunk/example/logs/   (with props)
Removed:
    lucene/solr/trunk/example/etc/LICENSE.javax.servlet.txt
    lucene/solr/trunk/example/etc/LICENSE.javax.xml.html
    lucene/solr/trunk/example/etc/LICENSE.jsse.txt
    lucene/solr/trunk/example/etc/admin.xml
    lucene/solr/trunk/example/etc/jetty-jmx.xml
    lucene/solr/trunk/example/ext/
    lucene/solr/trunk/example/lib/javax.servlet.jar
    lucene/solr/trunk/example/lib/jsp/
    lucene/solr/trunk/example/lib/org.mortbay.jetty.jar
    lucene/solr/trunk/example/lib/org.mortbay.jmx.jar
Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/NOTICE.txt
    lucene/solr/trunk/example/etc/jetty.xml
    lucene/solr/trunk/example/etc/webdefault.xml
    lucene/solr/trunk/example/start.jar

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?view=diff&rev=541050&r1=541049&r2=541050
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed May 23 12:56:58 2007
@@ -248,6 +248,8 @@
     commandline, and defering commits.  Tutorial modified to take
     advantage of these options so there is no need for curl.
     (hossman)
+
+12. SOLR-128: Upgraded Jetty to the latest stable release 6.1.3 (ryan)
     
 Optimizations 
  1. SOLR-114: HashDocSet specific implementations of union() and andNot()

Modified: lucene/solr/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/NOTICE.txt?view=diff&rev=541050&r1=541049&r2=541050
==============================================================================
--- lucene/solr/trunk/NOTICE.txt (original)
+++ lucene/solr/trunk/NOTICE.txt Wed May 23 12:56:58 2007
@@ -14,7 +14,7 @@
 (specifically, the XPP3 XML pull parser)
 
 This product includes software developed by Mort Bay Consulting
-(specifically, Jetty 5.1, the bundled servlet container in example)
+(specifically, Jetty 6.1.3, the bundled servlet container in example)
 
 This product includes software developed by Dr Martin Porter,
 Copyright 2001 and and Richard Boulton (for the Java developments),

Modified: lucene/solr/trunk/example/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/etc/jetty.xml?view=diff&rev=541050&r1=541049&r2=541050
==============================================================================
--- lucene/solr/trunk/example/etc/jetty.xml (original)
+++ lucene/solr/trunk/example/etc/jetty.xml Wed May 23 12:56:58 2007
@@ -1,252 +1,203 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
 
-
-
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
 <!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
 
-  <!-- =============================================================== -->
-  <!-- Configure Logging                                               -->
-  <!-- =============================================================== -->
-
-  
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Configure Jetty Logging.                                        -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Uncomment if using jetty logging.
-  <Call class="org.mortbay.log.LogFactory" name="getFactory">
-    <Call name="getInstance">
-      <Arg/>
-      <Call name="reset"/>
-      <Call name="add">
-        <Arg>
-          <New class="org.mortbay.log.OutputStreamLogSink">
-            <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.jetty.log</Set>
-            <Set name="retainDays">90</Set>
-            <Set name="append">true</Set>
-            <Set name="logLabels">true</Set>
-            <Set name="logStackSize">true</Set>
-            <Set name="logStackTrace">false</Set>
-            <Set name="logOneLine">false</Set>
-            <Set name="suppressStack">false</Set>
-            <Set name="logTimeZone">GMT</Set>
-          </New>
-        </Arg>
-      </Call>
-    </Call>
-  </Call>
-  -->
-  
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8983                       -->
-  <!-- The default port can be changed using: java -Djetty.port=80     -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SocketListener">
-        <Set name="Port"><SystemProperty name="jetty.port" default="8983"/></Set>
-	<Set name="PoolName">P1</Set>
-        <Set name="MinThreads">20</Set>
-        <Set name="MaxThreads">200</Set>
-        <Set name="lowResources">50</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="LowResourcePersistTimeMs">2000</Set>
-        <Set name="acceptQueueSize">0</Set>
-        <Set name="ConfidentialPort">8443</Set>
-        <Set name="IntegralPort">8443</Set>
-      </New>
-    </Arg>
-  </Call>
 
+<Configure id="Server" class="org.mortbay.jetty.Server">
 
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a HTTPS SSL listener on port 8443                           -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE 
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SslListener">
-        <Set name="Port">8443</Set>
-	<Set name="PoolName">P1</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="lowResources">30</Set>
-        <Set name="LowResourcePersistTimeMs">2000</Set>
-        <Set name="Keystore"><SystemProperty name="jetty.home" default="."/>/etc/demokeystore</Set>
-	<Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-	<Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-
-        <Set name="HttpHandler">
-          <New class="org.mortbay.http.handler.MsieSslHandler">
-	    <Set name="UserAgentSubString">MSIE 5</Set>
-	  </New>
-        </Set>
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Set name="ThreadPool">
+      <!-- Default bounded blocking threadpool 
+      -->
+      <New class="org.mortbay.thread.BoundedThreadPool">
+        <Set name="minThreads">10</Set>
+        <Set name="lowThreads">50</Set>
+        <Set name="maxThreads">250</Set>
       </New>
-    </Arg>
-  </Call>
-  -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a AJP13 listener on port 8009                               -->
-  <!-- This protocol can be used with mod_jk in apache, IIS etc.       -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!--
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.ajp.AJP13Listener">
-        <Set name="Port">8009</Set>
-        <Set name="MinThreads">5</Set>
-        <Set name="MaxThreads">20</Set>
-        <Set name="MaxIdleTimeMs">0</Set>
-        <Set name="confidentialPort">443</Set>
+
+      <!-- Optional Java 5 bounded threadpool with job queue 
+      <New class="org.mortbay.thread.concurrent.ThreadPool">
+        <Arg type="int">0</Arg>
+        <Set name="corePoolSize">10</Set>
+        <Set name="maximumPoolSize">250</Set>
       </New>
-    </Arg>
-  </Call>
-  -->
-
-
-  <!-- =============================================================== -->
-  <!-- Set the default web application configuration mechanisms:       -->
-  <!--   XMLConfiguration       - handles WEB-INF/web.xml              -->
-  <!--   JettyWebConfiguration  - handles WEB-INF/jetty-web.xml        -->
-  <!--   jsr77.Configuration    - Adds jsr77 statistics to servlets    -->
-  <!--                                                                 -->
-  <!-- Order of these classes is significant. The defaults set here    -->
-  <!-- can be overridden by calling setConfigurationClassNames() on    -->
-  <!-- the webapp context.                                             -->
-  <!-- The TagLibconfiguration scans any tld files found for           -->
-  <!-- additional j2ee listener classes - needed for JSF               -->
-  <!-- The jsr77 configuration requires additional jars on the         -->
-  <!-- on the classpath and it needs jmx enabled.                      -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="WebApplicationConfigurationClassNames">
-    <Array type="java.lang.String">
-      <Item>org.mortbay.jetty.servlet.XMLConfiguration</Item>
-      <Item>org.mortbay.jetty.servlet.JettyWebConfiguration</Item>
-
-      <!--
-      <Item>org.mortbay.jetty.servlet.TagLibConfiguration</Item>
-      <Item>org.mortbay.jetty.servlet.jsr77.Configuration</Item>
       -->
-    </Array>
-  </Set>
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the webdefault.xml resource for the defaults descriptor   -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="rootWebApp">root</Set>
-  
-  <Call name="addWebApplications">
-    <Arg></Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/webapps/</Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Arg>
-    <Arg type="boolean">true</Arg><!--extract WARs-->
-    <Arg type="boolean">false</Arg><!-- java 2 compliant class loader -->
-  </Call>
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a specific web application                    -->
-  <!-- + Set Unpack WAR files                                          -->
-  <!-- + Set Default Descriptor.  Resource, file or URL                -->
-  <!-- + Set java 2 complaint classloading                             -->
-  <!-- + Set Virtual Hosts. A Null host or empty array means all hosts -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <Call name="addWebApplication">
-    <Arg>/context</Arg>
-    <Arg>./webapps/root</Arg>
-
-    <Set name="extractWAR">false</Set> 
-    <Set name="defaultsDescriptor">org/mortbay/jetty/servlet/webdefault.xml</Set>
-    <Set name="classLoaderJava2Compliant">true</Set> 
-
-    <Set name="virtualHosts">
-      <Array type="java.lang.String">
-        <Item></Item>
-        <Item>127.0.0.1</Item>
-        <Item>localhost</Item>
-        <Item>www.acme.com</Item>
-      </Array>
     </Set>
-  </Call>
-  -->
 
-  <!-- =============================================================== -->
-  <!-- Configure the Request Log                                       -->
-  <!-- =============================================================== -->
-  <!-- Uncomment for request logging.
-  <Set name="RequestLog">
-    <New class="org.mortbay.http.NCSARequestLog">
-      <Arg><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Arg>
-      <Set name="retainDays">90</Set>
-      <Set name="append">true</Set>
-      <Set name="extended">false</Set>
-      <Set name="LogTimeZone">GMT</Set>
-    </New>
-  </Set>
-  -->
-
-  <!-- =============================================================== -->
-  <!-- Configure the Other Server Options                              -->
-  <!-- =============================================================== -->
-  <Set name="requestsPerGC">2000</Set>
-  <Set name="statsOn">false</Set>
-  <Set class="org.mortbay.util.FileResource" name="checkAliases" type="boolean">true</Set>
-
-  <!-- System classes cannot be overriden by a HttpContext or webapp 
-  <Set name="systemClasses">
-    <Array type="java.lang.String">
-      <Item>java.</Item>
-      <Item>javax.servlet.</Item>
-      <Item>javax.xml.</Item>
-      <Item>org.mortbay.</Item>
-      <Item>org.xml.</Item>
-      <Item>org.w3c.</Item>
-      <Item>org.apache.commons.logging.</Item>
-    </Array>
-  </Set>
-  -->
-
-  <!-- Server classes are hidden from a HttpContext or webapp
-  <Set name="serverClasses">
-    <Array type="java.lang.String">
-      <Item>-org.mortbay.http.PathMap</Item>
-      <Item>org.mortbay.http.</Item>
-      <Item>-org.mortbay.jetty.servlet.Default</Item>
-      <Item>-org.mortbay.jetty.servlet.Invoker</Item>
-      <Item>-org.mortbay.jetty.servlet.JSR154Filter</Item>
-      <Item>org.mortbay.jetty.</Item>
-      <Item>org.mortbay.start.</Item>
-      <Item>org.mortbay.stop.</Item>
-    </Array>
-  </Set>
-  -->
 
-</Configure>
 
+    <!-- =========================================================== -->
+    <!-- Set connectors                                              -->
+    <!-- =========================================================== -->
+    <!-- One of each type!                                           -->
+    <!-- =========================================================== -->
+
+    <!-- Use this connector for many frequently idle connections
+         and for threadless continuations.
+    -->    
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="maxIdleTime">30000</Set>
+            <Set name="Acceptors">2</Set>
+            <Set name="confidentialPort">8443</Set>
+          </New>
+      </Arg>
+    </Call>
+        
 
+    <!-- Use this connector if NIO is not available.
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.bio.SocketConnector">
+            <Set name="port">8081</Set>
+            <Set name="maxIdleTime">50000</Set>
+            <Set name="lowResourceMaxIdleTime">1500</Set>
+          </New>
+      </Arg>
+    </Call>
+    -->
 
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- To add a HTTPS SSL listener                                     -->
+    <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
+    <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    
+    <!-- =========================================================== -->
+    <!-- Set up global session ID manager                            -->
+    <!-- =========================================================== -->
+    <!--
+    <Set name="sessionIdManager">
+      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+        <Set name="workerName">node1</Set>
+      </New>
+    </Set>
+    -->
 
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            --> 
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.mortbay.jetty.Handler">
+           <Item>
+             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+           </Item>
+           <Item>
+             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+    
+    <!-- =========================================================== -->
+    <!-- Configure the context deployer                              -->
+    <!-- A context deployer will deploy contexts described in        -->
+    <!-- configuration files discovered in a directory.              -->
+    <!-- The configuration directory can be scanned for hot          -->
+    <!-- deployments at the configured scanInterval.                 -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy contexts configured   -->
+    <!-- in the $JETTY_HOME/contexts directory                       -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.ContextDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
+          <Set name="scanInterval">1</Set>
+        </New>
+      </Arg>
+    </Call>
 
+    <!-- =========================================================== -->
+    <!-- Configure the webapp deployer.                              -->
+    <!-- A webapp  deployer will deploy standard webapps discovered  -->
+    <!-- in a directory at startup, without the need for additional  -->
+    <!-- configuration files.    It does not support hot deploy or   -->
+    <!-- non standard contexts (see ContextDeployer above).          -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy webapps from the      -->
+    <!-- $JETTY_HOME/webapps directory                               -->
+    <!--                                                             -->
+    <!-- Normally only one type of deployer need be used.            -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
+				  <Set name="parentLoaderPriority">false</Set>
+				  <Set name="extract">true</Set>
+				  <Set name="allowDuplicates">false</Set>
+          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+        </New>
+      </Arg>
+    </Call>
 
+    <!-- =========================================================== -->
+    <!-- Configure Authentication Realms                             -->
+    <!-- Realms may be configured for the entire server here, or     -->
+    <!-- they can be configured for a specific web app in a context  -->
+    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- example).                                                   -->
+    <!-- =========================================================== -->
+    <Set name="UserRealms">
+      <Array type="org.mortbay.jetty.security.UserRealm">
+        <!--
+        <Item>
+          <New class="org.mortbay.jetty.security.HashUserRealm">
+            <Set name="name">Test Realm</Set>
+            <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+          </New>
+        </Item>
+	-->
+      </Array>
+    </Set>
 
+    <!-- =========================================================== -->
+    <!-- Configure Request Log                                       -->
+    <!-- Request logs  may be configured for the entire server here, -->
+    <!-- or they can be configured for a specific web app in a       -->
+    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+    <!-- for an example).                                            -->
+    <!-- =========================================================== -->
+    <Ref id="RequestLog">
+      <Set name="requestLog">
+        <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+          <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
+          <Set name="retainDays">90</Set>
+          <Set name="append">true</Set>
+          <Set name="extended">false</Set>
+          <Set name="LogTimeZone">GMT</Set>
+        </New>
+      </Set>
+    </Ref>
+
+    <!-- =========================================================== -->
+    <!-- extra options                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <!-- ensure/prevent Server: header being sent to browsers        -->
+    <Set name="sendServerVersion">true</Set>
 
+</Configure>
 

Modified: lucene/solr/trunk/example/etc/webdefault.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/etc/webdefault.xml?view=diff&rev=541050&r1=541049&r2=541050
==============================================================================
--- lucene/solr/trunk/example/etc/webdefault.xml (original)
+++ lucene/solr/trunk/example/etc/webdefault.xml Wed May 23 12:56:58 2007
@@ -8,22 +8,21 @@
 <!-- descriptor, it is applied before the contexts own web.xml file        -->
 <!--                                                                       -->
 <!-- A context may be assigned a default descriptor by:                    -->
-<!--  + Allowing the default defaultweb.xml to be applied                  -->
 <!--  + Calling WebApplicationContext.setDefaultsDescriptor                -->
 <!--  + Passed an arg to addWebApplications                                -->
 <!--                                                                       -->
-<!-- If a defaults descriptor is set, it is first looked for as a system   -->
-<!-- resource. The jetty jar contains a webdefault.xml file as a resource  -->
-<!-- at "org/mortbay/jetty/servlet/webdefault.xml".   If a system resource -->
-<!-- is not found, then a normal resource is tried, thus a filename or URL -->
-<!-- may be used to specify an arbitrary file.                             -->
+<!-- This file is used both as the resource within the jetty.jar (which is -->
+<!-- used as the default if no explicit defaults descriptor is set) and it -->
+<!-- is copied to the etc directory of the Jetty distro and explicitly     -->
+<!-- by the jetty.xml file.                                                -->
 <!--                                                                       -->
 <!-- ===================================================================== -->
 <web-app 
-   xmlns="http://java.sun.com/xml/ns/j2ee" 
+   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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
-   version="2.4"> 
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
+   metadata-complete="true"
+   version="2.5"> 
 
   <description>
     Default web.xml file.  
@@ -31,7 +30,6 @@
   </description>
 
 
-
   <!-- ==================================================================== -->
   <!-- Context params to control Session Cookies                            -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
@@ -52,6 +50,11 @@
   </context-param>
   -->
 
+  <context-param>
+    <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
+    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar|</param-value>
+  </context-param>
+            
 
 
   <!-- ==================================================================== -->
@@ -66,17 +69,12 @@
   <!--   dirAllowed       If true, directory listings are returned if no    -->
   <!--                    welcome file is found. Else 403 Forbidden.        -->
   <!--                                                                      -->
-  <!--   putAllowed       If true, the PUT method is allowed                -->
-  <!--                                                                      -->
-  <!--   delAllowed       If true, the DELETE method is allowed             -->
-  <!--                                                                      -->
   <!--   redirectWelcome  If true, redirect welcome file requests           -->
   <!--                    else use request dispatcher forwards              -->
   <!--                                                                      -->
-  <!--   minGzipLength    If set to a positive integer, then static content -->
-  <!--                    larger than this will be served as gzip content   -->
-  <!--                    encoded if a matching resource is found ending    -->
-  <!--                    with ".gz"                                        -->
+  <!--   gzip             If set to true, then static content will be served--> 
+  <!--                    as gzip content encoded if a matching resource is -->
+  <!--                    found ending with ".gz"                           -->
   <!--                                                                      -->
   <!--   resoureBase      Can be set to replace the context resource base   -->
   <!--                                                                      -->
@@ -85,11 +83,20 @@
   <!--                    servlet context root. Useful for only serving     -->
   <!--                    static content from only specific subdirectories. -->
   <!--                                                                      -->
-  <!-- The MOVE method is allowed if PUT and DELETE are allowed             -->
+  <!--   useFileMappedBuffer                                                -->
+  <!--                    If set to true (the default), a  memory mapped    -->
+  <!--                    file buffer will be used to serve static content  -->
+  <!--                    when using an NIO connector. Setting this value   -->
+  <!--                    to false means that a direct buffer will be used  -->
+  <!--                    instead. If you are having trouble with Windows   -->
+  <!--                    file locking, set this to false.                  -->
+  <!--                                                                      -->
+  <!--  cacheControl      If set, all static content will have this value   -->
+  <!--                    set as the cache-control header.                  -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet>
     <servlet-name>default</servlet-name>
-    <servlet-class>org.mortbay.jetty.servlet.Default</servlet-class>
+    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
     <init-param>
       <param-name>acceptRanges</param-name>
       <param-value>true</param-value>
@@ -99,21 +106,35 @@
       <param-value>true</param-value>
     </init-param>
     <init-param>
-      <param-name>putAllowed</param-name>
+      <param-name>redirectWelcome</param-name>
       <param-value>false</param-value>
     </init-param>
     <init-param>
-      <param-name>delAllowed</param-name>
-      <param-value>false</param-value>
+      <param-name>maxCacheSize</param-name>
+      <param-value>2000000</param-value>
     </init-param>
     <init-param>
-      <param-name>redirectWelcome</param-name>
+      <param-name>maxCachedFileSize</param-name>
+      <param-value>254000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFiles</param-name>
+      <param-value>1000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>gzip</param-name>
       <param-value>false</param-value>
     </init-param>
     <init-param>
-      <param-name>minGzipLength</param-name>
-      <param-value>8192</param-value>
+      <param-name>useFileMappedBuffer</param-name>
+      <param-value>false</param-value>
+    </init-param>  
+    <!--
+    <init-param>
+      <param-name>cacheControl</param-name>
+      <param-value>max-age=3600,public</param-value>
     </init-param>
+    -->
     <load-on-startup>0</load-on-startup>
   </servlet> 
 
@@ -125,7 +146,7 @@
   <!-- This is the jasper JSP servlet from the jakarta project              -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
+  <!-- used by Glassfish to support JSP pages.  Traditionally, this servlet -->
   <!-- is mapped to URL patterh "*.jsp".  This servlet supports the         -->
   <!-- following initialization parameters (default values are in square    -->
   <!-- brackets):                                                           -->
@@ -145,6 +166,8 @@
   <!--   classpath           What class path should I use while compiling   -->
   <!--                       generated servlets?  [Created dynamically      -->
   <!--                       based on the current web application]          -->
+  <!--                       Set to ? to make the container explicitly set  -->
+  <!--                       this parameter.                                -->
   <!--                                                                      -->
   <!--   development         Is Jasper used in development mode (will check -->
   <!--                       for JSP modification on every access)?  [true] -->
@@ -161,7 +184,7 @@
   <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
   <!--                                                                      -->
   <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF8]                           -->
+  <!--                       source files. [UTF-8]                          -->
   <!--                                                                      -->
   <!--   keepgenerated       Should we keep the generated Java source code  -->
   <!--                       for each page instead of deleting it? [true]   -->
@@ -200,10 +223,10 @@
   <!--   the property "-Dbuild.compiler.emacs=true" when starting Jetty     -->
   <!--   to cause Jikes to emit error messages in a format compatible with  -->
   <!--   Jasper.                                                            -->
-  <!--   If you get an error reporting that jikes can't use UTF8 encoding,  -->
+  <!--   If you get an error reporting that jikes can't use UTF-8 encoding, -->
   <!--   try setting the init parameter "javaEncoding" to "ISO-8859-1".     -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <servlet>
+  <servlet id="jsp">
     <servlet-name>jsp</servlet-name>
     <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
     <init-param>
@@ -218,15 +241,27 @@
         <param-name>xpoweredBy</param-name>
         <param-value>false</param-value>
     </init-param>
+    <!--  
+    <init-param>
+        <param-name>classpath</param-name>
+        <param-value>?</param-value>
+    </init-param>
+    -->
     <load-on-startup>0</load-on-startup>
   </servlet>
 
-  <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jsp</url-pattern> </servlet-mapping>
-  <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jspf</url-pattern> </servlet-mapping>
-  <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jspx</url-pattern> </servlet-mapping>
-  <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.xsp</url-pattern> </servlet-mapping>
-
-
+  <servlet-mapping> 
+    <servlet-name>jsp</servlet-name> 
+    <url-pattern>*.jsp</url-pattern> 
+    <url-pattern>*.jspf</url-pattern>
+    <url-pattern>*.jspx</url-pattern>
+    <url-pattern>*.xsp</url-pattern>
+    <url-pattern>*.JSP</url-pattern> 
+    <url-pattern>*.JSPF</url-pattern>
+    <url-pattern>*.JSPX</url-pattern>
+    <url-pattern>*.XSP</url-pattern>
+  </servlet-mapping>
+  
   <!-- ==================================================================== -->
   <!-- Dynamic Servlet Invoker.                                             -->
   <!-- This servlet invokes anonymous servlets that have not been defined   -->
@@ -339,35 +374,6 @@
   </locale-encoding-mapping-list>
 
   
-  <!-- ==================================================================== -->
-  <!-- JSR154 Stupidness                                                    -->
-  <!-- This filter implements some of the JSR154 (servlet 2.4) "features",  -->
-  <!-- which are rather stupid and expensive to implement. Thus they are    -->
-  <!-- not included in the core Jetty architecture.   It is HIGHLY          -->
-  <!-- RECOMMENDED that this filter NOT be used, unless you need:           -->
-  <!--    RequestAttributeListeners - If you actually have a real use for   -->
-  <!--       these, please tell the jetty lists what they are and why you   -->
-  <!--       can't use a normal filter/wrapper for this?                    -->
-  <!--    SRV.6.2.2 Dispatachers  - where the container cannot wrap the     -->
-  <!--       request or response. See                                       -->
-  <!--       http://jetty.mortbay.org/jetty/doc/servlet24.html#d0e711       -->
-  <!--       to find out why this is stupid.                                -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- UNCOMMENT For compliant behaviour
-  <filter>
-    <filter-name>jsr154</filter-name>
-    <filter-class>org.mortbay.jetty.servlet.JSR154Filter</filter-class>
-    <init-param><param-name>unwrappedDispatch</param-name><param-value>true</param-value></init-param>
-  </filter>
-  <filter-mapping>
-      <filter-name>jsr154</filter-name>
-      <url-pattern>/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>FORWARD</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-      <dispatcher>ERROR</dispatcher>
-  </filter-mapping>
-  -->
   
 </web-app>
 

Added: lucene/solr/trunk/example/lib/jetty-6.1.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jetty-6.1.3.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jetty-6.1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/jetty-util-6.1.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jetty-util-6.1.3.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jetty-util-6.1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/jsp-2.1/ant-1.6.5.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jsp-2.1/ant-1.6.5.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jsp-2.1/ant-1.6.5.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/jsp-2.1/core-3.1.1.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jsp-2.1/core-3.1.1.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jsp-2.1/core-3.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/jsp-2.1/jsp-2.1.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jsp-2.1/jsp-2.1.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jsp-2.1/jsp-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/jsp-2.1/jsp-api-2.1.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/jsp-2.1/jsp-api-2.1.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/jsp-2.1/jsp-api-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/example/lib/servlet-api-2.5-6.1.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/lib/servlet-api-2.5-6.1.3.jar?view=auto&rev=541050
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/example/lib/servlet-api-2.5-6.1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: lucene/solr/trunk/example/logs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 23 12:56:58 2007
@@ -0,0 +1 @@
+*.log

Modified: lucene/solr/trunk/example/start.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/start.jar?view=diff&rev=541050&r1=541049&r2=541050
==============================================================================
Binary files - no diff available.