HADOOP-736. Roll back to Jetty 5.1.4, reverting changes in revisions 472349 and 472202, from HADOOP-565.

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

CHANGES.txt

@@ -122,6 +122,9 @@ Trunk (unreleased changes)
     location and moved to the final location when reduce is complete.
     (Sanjay Dahiya via cutting)
 
+36. HADOOP-736.  Roll back to Jetty 5.1.4, due to performance problems
+    with Jetty 6.0.1.
+
 
 Release 0.8.0 - 2006-11-03
 

bin/hadoop

@@ -103,7 +103,7 @@ for f in $HADOOP_HOME/lib/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 
-for f in $HADOOP_HOME/lib/jsp-2.0/*.jar; do
+for f in $HADOOP_HOME/lib/jetty-ext/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 

lib/jetty-5.1.4.LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

lib/slf4j-jcl.LICENSE.txt

@@ -1,29 +0,0 @@
- Copyright (c) 2004-2005 SLF4J.ORG
- Copyright (c) 2004-2005 QOS.ch
-
- All rights reserved.
- 
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute, and/or sell copies of  the Software, and to permit persons
- to whom  the Software is furnished  to do so, provided  that the above
- copyright notice(s) and this permission notice appear in all copies of
- the  Software and  that both  the above  copyright notice(s)  and this
- permission notice appear in supporting documentation.
- 
- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR  A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF  THIRD PARTY  RIGHTS. IN  NO EVENT  SHALL THE  COPYRIGHT  HOLDER OR
- HOLDERS  INCLUDED IN  THIS  NOTICE BE  LIABLE  FOR ANY  CLAIM, OR  ANY
- SPECIAL INDIRECT  OR CONSEQUENTIAL DAMAGES, OR  ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS  OF USE, DATA OR PROFITS, WHETHER  IN AN ACTION OF
- CONTRACT, NEGLIGENCE  OR OTHER TORTIOUS  ACTION, ARISING OUT OF  OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
- Except as  contained in  this notice, the  name of a  copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.

src/java/org/apache/hadoop/mapred/StatusHttpServer.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.mapred;
 
 import java.io.*;
-import java.net.BindException;
 import java.net.URL;
 import java.net.URLDecoder;
 
@@ -27,16 +26,13 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.thread.BoundedThreadPool;
-import org.mortbay.util.MultiException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.util.*;
-
+import org.mortbay.http.HttpContext;
+import org.mortbay.http.handler.ResourceHandler;
+import org.mortbay.http.SocketListener;
+import org.mortbay.jetty.servlet.WebApplicationContext;
 
 /**
  * Create a Jetty embedded server to answer http requests. The primary goal
@@ -51,8 +47,9 @@ public class StatusHttpServer {
   private static final boolean isWindows = 
     System.getProperty("os.name").startsWith("Windows");
   private org.mortbay.jetty.Server webServer;
-  private WebAppContext webAppContext ;  
+  private SocketListener listener;
   private boolean findPort;
+  private WebApplicationContext webAppContext;
   private static final Log LOG =
     LogFactory.getLog(StatusHttpServer.class.getName());
   
@@ -66,37 +63,34 @@ public class StatusHttpServer {
    */
   public StatusHttpServer(String name, String bindAddress, int port, 
                           boolean findPort) throws IOException {
-    webServer = new org.mortbay.jetty.Server(port);
+    webServer = new org.mortbay.jetty.Server();
     this.findPort = findPort;
-
-    ContextHandlerCollection contexts = new ContextHandlerCollection();
+    listener = new SocketListener();
+    listener.setPort(port);
+    listener.setHost(bindAddress);
+    webServer.addListener(listener);
 
     // set up the context for "/logs/"
-    Context logContext = new Context(contexts,"/logs");
-    
+    HttpContext logContext = new HttpContext();
+    logContext.setContextPath("/logs/*");
     String logDir = System.getProperty("hadoop.log.dir");
     logContext.setResourceBase(logDir);
-    logContext.addServlet("org.mortbay.jetty.servlet.DefaultServlet","/");
-    
+    logContext.addHandler(new ResourceHandler());
+    webServer.addContext(logContext);
+
     // set up the context for "/static/*"
     String appDir = getWebAppsPath();
-    Context staticContext = new Context(contexts,"/static");
+    HttpContext staticContext = new HttpContext();
+    staticContext.setContextPath("/static/*");
     staticContext.setResourceBase(appDir + File.separator + "static");
-    staticContext.addServlet("org.mortbay.jetty.servlet.DefaultServlet","/");
+    staticContext.addHandler(new ResourceHandler());
+    webServer.addContext(staticContext);
 
     // set up the context for "/" jsp files
-    webAppContext = new WebAppContext() ;
-    webAppContext.setContextPath("/");
-    webAppContext.setWar(appDir + File.separator + name); 
-    contexts.addHandler(webAppContext); 
-
-    Context stackContext = new Context(contexts,"/stacks");
-    stackContext.addServlet(StackServlet.class, "/"); 
-    // used as default but still set, in case it changes in future versions
-    webServer.setThreadPool(new BoundedThreadPool()); 
-    webServer.setHandler(contexts);
+    webAppContext = 
+      webServer.addWebApplication("/", appDir + File.separator + name);
+    addServlet("stacks", "/stacks", StackServlet.class);
   }
-  
 
   /**
    * Set a value in the webapp context. These values are available to the jsp
@@ -117,18 +111,20 @@ public class StatusHttpServer {
   public <T extends HttpServlet> 
   void addServlet(String name, String pathSpec, 
                   Class<T> servletClass) {
-    WebAppContext context = webAppContext;
+    WebApplicationContext context = webAppContext;
     try {
       if (name == null) {
-        context.addServlet(servletClass, pathSpec);
+        context.addServlet(pathSpec, servletClass.getName());
       } else {
-        ServletHolder holder = new ServletHolder(servletClass); 
-        holder.setName(name); 
-        context.addServlet(holder, pathSpec);
+        context.addServlet(name, pathSpec, servletClass.getName());
       } 
-    } catch (Throwable ex) {
+    } catch (ClassNotFoundException ex) {
       throw makeRuntimeException("Problem instantiating class", ex);
-    } 
+    } catch (InstantiationException ex) {
+      throw makeRuntimeException("Problem instantiating class", ex);
+    } catch (IllegalAccessException ex) {
+      throw makeRuntimeException("Problem instantiating class", ex);
+    }
   }
   
   private static RuntimeException makeRuntimeException(String msg, 
@@ -171,13 +167,12 @@ public class StatusHttpServer {
    * @return the port
    */
   public int getPort() {
-    return webServer.getConnectors()[0].getPort(); 
+    return listener.getPort();
   }
 
   public void setThreads(int min, int max) {
-    BoundedThreadPool pool = (BoundedThreadPool) webServer.getThreadPool() ;
-    pool.setMinThreads(min); 
-    pool.setMaxThreads(max); 
+    listener.setMinThreads(min);
+    listener.setMaxThreads(max);
   }
   /**
    * Start the server. Does not wait for the server to start.
@@ -188,34 +183,27 @@ public class StatusHttpServer {
         try {
           webServer.start();
           break;
-        } catch(BindException be){
-          if( findPort ){
-            webServer.getConnectors()[0].setPort(getPort() + 1);
-          }else{
-            throw be ; 
-          }
-        }catch (MultiException ex) {
+        } catch (org.mortbay.util.MultiException ex) {
           // look for the multi exception containing a bind exception,
           // in that case try the next port number.
           boolean needNewPort = false;
           for(int i=0; i < ex.size(); ++i) {
-            Throwable sub = ex.getThrowable(i);
-            
+            Exception sub = ex.getException(i);
             if (sub instanceof java.net.BindException) {
               needNewPort = true;
+              break;
             }
           }
           if (!findPort || !needNewPort) {
             throw ex;
           } else {
-            // Not using multiple connectors
-           webServer.getConnectors()[0].setPort(getPort() + 1);
+            listener.setPort(listener.getPort() + 1);
           }
         }
       }
-    }catch (IOException ie) {
+    } catch (IOException ie) {
       throw ie;
-    }catch (Exception e) {
+    } catch (Exception e) {
       IOException ie = new IOException("Problem starting http server");
       ie.initCause(e);
       throw ie;
@@ -226,13 +214,7 @@ public class StatusHttpServer {
    * stop the server
    */
   public void stop() throws InterruptedException {
-    try{
-      webServer.stop();
-    }catch(InterruptedException ex){
-      throw ex ; 
-    }catch(Exception e){
-      e.printStackTrace(); 
-    }
+    webServer.stop();
   }
   
   /**