Index: src/java/org/apache/commons/httpclient/ConnectTimeoutException.java =================================================================== RCS file: src/java/org/apache/commons/httpclient/ConnectTimeoutException.java diff -N src/java/org/apache/commons/httpclient/ConnectTimeoutException.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/java/org/apache/commons/httpclient/ConnectTimeoutException.java 13 Jul 2003 20:30:10 -0000 @@ -0,0 +1,100 @@ +/* + * $Header: $ + * $Revision: $ + * $Date: $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.commons.httpclient; + +/** + * A timeout while connecting to an HTTP server or waiting for an + * available connection from an HttpConnectionManager. + * + * @author Laura Werner + * + * @since 2.1 + */ +public class ConnectTimeoutException extends HttpTimeoutException { + + /** + * Creates a ConnectTimeoutException with a null detail message. + */ + public ConnectTimeoutException() { + super(); + } + + /** + * Creates a ConnectTimeoutException with the specified detail message. + * + * @param message The exception detail message + */ + public ConnectTimeoutException(String message) { + super(message); + } + + /** + * Creates a new ConnectTimeoutException with the specified detail message and cause. + * + * @param message the exception detail message + * @param cause the Throwable that caused this exception, or null + * if the cause is unavailable, unknown, or not a Throwable + */ + public ConnectTimeoutException(String message, Throwable cause) { + super(message, cause); + } + +} Index: src/java/org/apache/commons/httpclient/HeaderElement.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HeaderElement.java,v retrieving revision 1.18 diff -u -r1.18 HeaderElement.java --- src/java/org/apache/commons/httpclient/HeaderElement.java 14 Apr 2003 04:06:55 -0000 1.18 +++ src/java/org/apache/commons/httpclient/HeaderElement.java 13 Jul 2003 20:30:11 -0000 @@ -288,7 +288,7 @@ nextToken += "," + tokenizer.nextToken(); } } catch (NoSuchElementException exception) { - throw new HttpException( + throw new ProtocolException( "Bad header format: wrong number of quotation marks"); } @@ -322,7 +322,7 @@ } } } catch (NoSuchElementException exception) { - throw new HttpException + throw new ProtocolException ("Bad header format: parsing with wrong header elements"); } @@ -341,7 +341,7 @@ if (header[i] == ';' && !inAString) { NameValuePair pair = parsePair(header, startPos, i); if (pair == null) { - throw new HttpException( + throw new ProtocolException( "Bad header format: empty name/value pair in" + nextToken); Index: src/java/org/apache/commons/httpclient/HttpException.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpException.java,v retrieving revision 1.13 diff -u -r1.13 HttpException.java --- src/java/org/apache/commons/httpclient/HttpException.java 28 Jan 2003 04:40:20 -0000 1.13 +++ src/java/org/apache/commons/httpclient/HttpException.java 13 Jul 2003 20:30:11 -0000 @@ -63,13 +63,14 @@ package org.apache.commons.httpclient; +import java.io.IOException; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.lang.reflect.Method; + /** * Signals that an HTTP or HttpClient exception has occurred. *

- * Why is it from URIException? - * To simplify the programming style for the inherited exception instances. - * - *

* The usage of the reserved status and reason codes *