[jboss-cvs] contrib/jetty/src/main/org/mortbay/jetty Server.java

[Jules G. <jul...@us...>]

  User: jules_gosnell
  Date: 02/05/28 15:25:36

  Modified:    jetty/src/main/org/mortbay/jetty Tag: Branch_3_0 Server.java
  Log:
  merge from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +20 -2     contrib/jetty/src/main/org/mortbay/jetty/Server.java
  
  Index: Server.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/Server.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- Server.java	30 Mar 2002 02:22:55 -0000	1.7
  +++ Server.java	28 May 2002 22:25:36 -0000	1.7.2.1
  @@ -34,7 +34,7 @@
    *
    * @see org.mortbay.xml.XmlConfiguration
    * @see org.mortbay.jetty.servlet.ServletHttpContext
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.7.2.1 $
    * @author Greg Wilkins (gregw)
    */
   public class Server extends HttpServer
  @@ -192,7 +192,7 @@
       public WebApplicationContext[] addWebApplications(String webapps)
           throws IOException
       {
  -        return addWebApplications(null,webapps);
  +        return addWebApplications(null,webapps,false);
       }
       
       /* ------------------------------------------------------------ */
  @@ -207,6 +207,23 @@
       public WebApplicationContext[] addWebApplications(String host,String webapps)
           throws IOException
       {
  +        return addWebApplications(host,webapps,false);
  +    }
  +        
  +    /* ------------------------------------------------------------ */
  +    /**  Add Web Applications.
  +     * Add auto webapplications to the server.  The name of the
  +     * webapp directory or war is used as the context name. If a
  +     * webapp is called "root" it is added at "/".
  +     * @param host Virtual host name or null
  +     * @param webapps Directory file name or URL to look for auto
  +     * webapplication.
  +     * @param extract If true, extract war files
  +     * @exception IOException 
  +     */
  +    public WebApplicationContext[] addWebApplications(String host,String webapps, boolean extract)
  +        throws IOException
  +    {
           ArrayList wacs = new ArrayList();
           Resource r=Resource.newResource(webapps);
           if (!r.exists())
  @@ -241,6 +258,7 @@
               WebApplicationContext wac= addWebApplication(host,
                                                            context,
                                                            app);
  +            wac.setExtractWAR(extract);
               wacs.add(wac);
           }