cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp WarpConnector.java

[pier]

pier        00/12/08 01:42:49

  Modified:    catalina/src/share/org/apache/catalina/connector/warp
                        WarpConnector.java
  Log:
  Host mapping must not be done at Connector level but at Engine level.
  
  Revision  Changes    Path
  1.5       +1 -40     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java
  
  Index: WarpConnector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WarpConnector.java        2000/12/08 02:57:05     1.4
  +++ WarpConnector.java        2000/12/08 09:42:49     1.5
  @@ -78,7 +78,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Pier Fumagalli</a>
    * @author Copyright &copy; 1999, 2000 <a href="http://www.apache.org">The
    *         Apache Software Foundation.
  - * @version CVS $Id: WarpConnector.java,v 1.4 2000/12/08 02:57:05 pier Exp $
  + * @version CVS $Id: WarpConnector.java,v 1.5 2000/12/08 09:42:49 pier Exp $
    */
   public class WarpConnector implements Connector, Lifecycle, Runnable {
   
  @@ -114,10 +114,6 @@
       private int port=8008;
       /** The number of concurrent connections we can handle. */
       private int acceptcount=10;
  -    /** The root path for web applications. */
  -    private String appbase="";
  -    /** The current Host ID. */
  -    private int hostid=0;
   
       // ------------------------------------------------------------ CONSTRUCTOR
   
  @@ -176,22 +172,6 @@
       }
   
       /**
  -     * Set up a virtual host in our Engine and return the associated host ID.
  -     */
  -    public int setupHost(String name) {
  -        WarpHost host=new WarpHost();
  -        int id=this.hostid++;
  -
  -        host.setName(name);
  -        host.setAppBase(this.getAppBase());
  -        host.setHostID(id);
  -        
  -        this.getContainer().addChild(host);
  -        
  -        return(id);
  -    }
  -    
  -    /**
        * Begin processing requests via this Connector.
        */
       public void start() throws LifecycleException {
  @@ -385,25 +365,6 @@
       public void setAcceptCount(int acceptcount) {
           if (DEBUG) this.debug("Setting accept count to "+acceptcount);
           this.acceptcount=acceptcount;
  -    }
  -
  -    /**
  -     * Return the application root for this Connector. This can be an absolute
  -     * pathname, a relative pathname, or a URL.
  -     */
  -    public String getAppBase() {
  -        return (this.appbase);
  -    }
  -
  -    /**
  -     * Set the application root for this Connector. This can be an absolute
  -     * pathname, a relative pathname, or a URL.
  -     */
  -    public void setAppBase(String appbase) {
  -        if (appbase==null) return;
  -        if (DEBUG) this.debug("Setting application root to "+appbase);
  -        String old=this.appbase;
  -        this.appbase=appbase;
       }
   
       // ------------------------------------------ LOGGING AND DEBUGGING METHODS