You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/05/01 23:28:19 UTC

cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib WebdavSession.java WebdavResource.java

remm        01/05/01 14:28:18

  Modified:    src/webdav/client/src/org/apache/webdav/lib
                        WebdavSession.java WebdavResource.java
  Log:
  - Update some package names to org.apache.commons.httpclient.
  - Rename some class names from WebdavXXX to HttpXXX.
  
  Revision  Changes    Path
  1.2       +13 -13    jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java
  
  Index: WebdavSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebdavSession.java	2001/04/30 16:45:58	1.1
  +++ WebdavSession.java	2001/05/01 21:28:17	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v 1.1 2001/04/30 16:45:58 jericho Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/30 16:45:58 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavSession.java,v 1.2 2001/05/01 21:28:17 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/05/01 21:28:17 $
    *
    * ====================================================================
    *
  @@ -68,9 +68,9 @@
   import java.util.Enumeration;
   import java.net.MalformedURLException;
   import org.apache.util.HttpURL;
  -import org.apache.webdav.lib.WebdavClient;
  -import org.apache.webdav.lib.Credentials;
  -import org.apache.webdav.lib.StreamInterceptor;
  +import org.apache.commons.httpclient.HttpClient;
  +import org.apache.commons.httpclient.Credentials;
  +import org.apache.commons.httpclient.StreamInterceptor;
   
   /**
    *
  @@ -117,14 +117,14 @@
   
   
       /**
  -     * Get a <code>WebdavClient</code> instance.
  +     * Get a <code>HttpClient</code> instance.
        * This method returns a new client instance.
        *
        * @param httpURL The http URL to connect.  only used the authority part.
  -     * @return An instance of <code>WebdavClient</code>.
  +     * @return An instance of <code>HttpClient</code>.
        * @exception IOException
        */
  -    public WebdavClient getSessionInstance(HttpURL httpURL)
  +    public HttpClient getSessionInstance(HttpURL httpURL)
           throws IOException {
   
           String authority = httpURL.getAuthority();
  @@ -132,7 +132,7 @@
               clientInfo.addElement(authority);
           }
           
  -        WebdavClient client = new WebdavClient(httpURL.toURL());
  +        HttpClient client = new HttpClient(httpURL.toURL());
           String userName = httpURL.getUserName();
           if (userName != null && userName.length() > 0) {
               String password = httpURL.getPassword();
  @@ -208,14 +208,14 @@
      /**
        * Close an session and delete the connection information.
        *
  -     * @param client The WebdavClient instance.
  +     * @param client The HttpClient instance.
        * @exception IOException Error in closing socket.
        */
  -    public void closeSession(WebdavClient client)
  +    public void closeSession(HttpClient client)
           throws IOException {
   
           HttpURL httpURL =
  -            new HttpURL(client.getUserName(), client.getPassword(),
  +            new HttpURL(client.getUserName(), client.getPassword(), 
                           client.getHost(), client.getPort());
           String authority = httpURL.getAuthority();
           if (isSession(authority)) {
  
  
  
  1.2       +136 -132  jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java
  
  Index: WebdavResource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebdavResource.java	2001/04/30 16:45:58	1.1
  +++ WebdavResource.java	2001/05/01 21:28:18	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v 1.1 2001/04/30 16:45:58 jericho Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/30 16:45:58 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavResource.java,v 1.2 2001/05/01 21:28:18 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/05/01 21:28:18 $
    *
    * ====================================================================
    *
  @@ -83,7 +83,11 @@
   import org.apache.util.DOMUtils;
   
   import org.apache.util.HttpURL;
  -import org.apache.webdav.lib.*;
  +import org.apache.commons.httpclient.*;
  +import org.apache.commons.httpclient.methods.GetMethod;
  +import org.apache.commons.httpclient.methods.HeadMethod;
  +import org.apache.commons.httpclient.methods.PostMethod;
  +import org.apache.commons.httpclient.methods.PutMethod;
   import org.apache.webdav.lib.methods.*;
   import org.apache.webdav.lib.properties.ResourceTypeProperty;
   
  @@ -112,11 +116,11 @@
        * @param httpURL The specified http URL.
        * @param action The action to set properties of this resource.
        * @param depth The depth to find properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResource(HttpURL httpURL, int action, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(httpURL, action, depth);
       }
  @@ -127,11 +131,11 @@
        *
        * @param httpURL The specified http URL.
        * @param depth The depth to find properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResource(HttpURL httpURL, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(httpURL, defaultAction, depth);
   
  @@ -142,11 +146,11 @@
        * The constructor.
        *
        * @param httpURL The specified http URL.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResource(HttpURL httpURL)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(httpURL);
       }
  @@ -156,11 +160,11 @@
        * The constructor.
        *
        * @param httpURL The specified http URL string.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResource(String httpURL)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(httpURL);
       }
  @@ -316,9 +320,9 @@
   
   
       /**
  -     * The WebdavClient instance for this resource.
  +     * The HttpClient instance for this resource.
        */
  -    private WebdavClient client;
  +    private HttpClient client;
   
   
       /**
  @@ -481,7 +485,7 @@
        * @param depth The depth to find properties.
        */
       private void setNameProperties(int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Vector properties = new Vector();
           properties.addElement(DISPLAYNAME);
  @@ -497,7 +501,7 @@
        * @param depth The depth to find properties.
        */
       private void setBasicProperties(int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Vector properties = new Vector();
           properties.addElement(DISPLAYNAME);
  @@ -517,7 +521,7 @@
        * @param propertyNames The property-names.
        */
       private void setNamedProp(int depth, Vector propertyNames)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Enumeration responses = propfindMethod(depth, propertyNames);
           setWebdavProperties(responses);
  @@ -530,7 +534,7 @@
        * @param depth The depth
        */
       private void setAllProp(int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Enumeration responses = propfindMethod(depth);
           setWebdavProperties(responses);
  @@ -543,11 +547,11 @@
        *
        * @param httpURL The parent http URL to get properties.
        * @param depth The depth.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException The socket error with a server.
        */
       private void setWebdavProperties(Enumeration responses)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Make the resources in the collection empty.
           childResources.removeAll();
  @@ -792,7 +796,7 @@
        * @param httpURL the specified HttpURL.
        * @param action The action to decide properties to find.
        * @param depth The depth to find properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -800,7 +804,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setHttpURL(HttpURL httpURL, int action, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           if (!isSession(httpURL)) {
               if (client != null) {
  @@ -821,7 +825,7 @@
        *
        * @param httpURL the specified HttpURL.
        * @param depth The depth to find properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -829,7 +833,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setHttpURL(HttpURL httpURL, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Follow the default action.
           setHttpURL(httpURL, defaultAction, depth);
  @@ -843,7 +847,7 @@
        * @param additionalPath The added relative path.
        * @param action The action to decide properties to find.
        * @param depth The depth.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -852,7 +856,7 @@
        */
       public void setHttpURL
           (HttpURL httpURL, String additionalPath, int action, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           this.httpURL = new HttpURL(httpURL, additionalPath);
           setHttpURL(this.httpURL, action, depth);
  @@ -865,7 +869,7 @@
        * @param httpURL The specified HttpURL.
        * @param additionalPath The added relative path.
        * @param action The action to decide properties to find.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -874,7 +878,7 @@
        */
       public void setHttpURL
           (HttpURL httpURL, String additionalPath, int action)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           this.httpURL = new HttpURL(httpURL, additionalPath);
           setHttpURL(this.httpURL, action, defaultDepth);
  @@ -886,7 +890,7 @@
        *
        * @param httpURL The specified HttpURL.
        * @param additionalPath The added relative path.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -894,7 +898,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setHttpURL(HttpURL httpURL, String additionalPath)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           this.httpURL = new HttpURL(httpURL, additionalPath);
           setHttpURL(this.httpURL, defaultAction, defaultDepth);
  @@ -905,7 +909,7 @@
        * Set the HttpURL for this WebdavResource.
        *
        * @param httpURL the specified HttpURL.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(java.lang.String)
        * @see #setHttpURL(java.net.URL)
  @@ -913,7 +917,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setHttpURL(HttpURL httpURL)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(httpURL, defaultDepth);
       }
  @@ -923,7 +927,7 @@
        * Set the HttpURL of this WebdavResource.
        *
        * @param httpURL the specified http URL string.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(HttpURL)
        * @see #setHttpURL(java.net.URL)
  @@ -931,7 +935,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setHttpURL(String httpURL)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setHttpURL(new HttpURL(httpURL));
       }
  @@ -963,7 +967,7 @@
        * Set the path part of this WebdavResource.
        *
        * @param path the specified path.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #setHttpURL(HttpURL)
        * @see #setHttpURL(java.lang.String)
  @@ -971,7 +975,7 @@
        * @see #setUserInfo(java.lang.String, java.lang.String)
        */
       public void setPath(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           httpURL.setPath(path);
           setHttpURL(httpURL);
  @@ -1011,7 +1015,7 @@
        * @see #setPath(java.lang.String)
        */
       public void setUserInfo(String userName, String password)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           httpURL.setUserInfo(userName, password);
           setHttpURL(httpURL);
  @@ -1307,7 +1311,7 @@
        * @param depth The depth.
        */
       public void setProperties(int action, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           switch (action) {
           case NAME:
  @@ -1334,7 +1338,7 @@
        * @param action The action to find properties for this resource.
        */
       public void setProperties(int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
           
           setProperties(defaultAction, depth);
       }
  @@ -1478,11 +1482,11 @@
        * Get all resources in this collection with the depth 1.
        *
        * @return resources in this collection with the depth 1.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResources getChildResources()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setProperties(DepthSupport.DEPTH_1);
   
  @@ -1495,11 +1499,11 @@
        * collection of this resources.
        *
        * @return An array of child resources in this resource.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public WebdavResource[] listWebdavResources()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
           
           return getChildResources().listResources();
       }
  @@ -1510,11 +1514,11 @@
        * collection denoted by this pathname.
        *
        * @return An array of pathnames denoting the resources.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public String[] list()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setNameProperties(DepthSupport.DEPTH_1);
           Enumeration hrefs = childResources.getResourceNames();
  @@ -1545,11 +1549,11 @@
        * array 3: getlastmodifieddate
        *
        * @return An array of pathnames and more denoting the resources.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Vector listBasic()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           setBasicProperties(DepthSupport.DEPTH_1);
           Enumeration hrefs = childResources.getResourceNames();
  @@ -1619,11 +1623,11 @@
        * Get InputStream for the GET method.
        *
        * @return InputStream
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public InputStream getMethodData()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // use disk to save by default
           GetMethod method = new GetMethod(httpURL.getPath());
  @@ -1641,11 +1645,11 @@
        * Get data as a String for the GET method.
        *
        * @return InputStream
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public String getMethodDataAsString()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           GetMethod method = new GetMethod(httpURL.getPath());
           method.setUseDisk(useDiskForGet);
  @@ -1663,11 +1667,11 @@
        *
        * @param file The local file.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean getMethod(File file)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           return getMethod(httpURL.getPathQuery(), file);
       }
  @@ -1679,11 +1683,11 @@
        * @param path the path string.
        * @param file The local file.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean getMethod(String path, File file)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // use disk to save by default
           GetMethod method = new GetMethod(HttpURL.getPathQuery(path), file);
  @@ -1703,11 +1707,11 @@
        *
        * @param data String</cdoe> data to send.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(String data)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = putMethod(httpURL.getPath(), data);
           if (result)
  @@ -1722,11 +1726,11 @@
        * @param path the path to request.
        * @param data String</cdoe> to send.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(String path, String data)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           PutMethod method = new PutMethod(HttpURL.getPath(path));
           method.sendData(data);
  @@ -1745,11 +1749,11 @@
        *
        * @param File the filename to get on local.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(File file)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = putMethod(httpURL.getPath(), file);
           if (result)
  @@ -1764,11 +1768,11 @@
        * @param path the relative HttpURL to request.
        * @param File the filename to get on local.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(String path, File file)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           PutMethod method = new PutMethod(HttpURL.getPath(path));
           method.sendData(file);
  @@ -1790,11 +1794,11 @@
        *
        * @param url The URL to get a resource.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(URL url)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = putMethod(httpURL.getPath(), url);
           if (result)
  @@ -1809,11 +1813,11 @@
        * @param path The http URL to request.
        * @param url The URL to get a resource.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean putMethod(String path, URL url)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           PutMethod method = new PutMethod(HttpURL.getPath(path));
           method.sendData(url);
  @@ -1831,11 +1835,11 @@
        * Execute OPTIONS method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean optionsMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           return optionsMethod(httpURL.getPath());
       }
  @@ -1846,12 +1850,12 @@
        *
        * @param path the path string.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        * @see #getAllowedOptions()
        */
       public boolean optionsMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           OptionsMethod method;
           if (path.trim().equals("*"))
  @@ -1882,11 +1886,11 @@
        * @param path the path to send the request.
        * @param aMethod a method to check it's supported.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean optionsMethod(String path, String aMethod)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           if (aMethod != null && optionsMethod(httpURL.getPath())) {
               while (allowedMethods.hasMoreElements()) {
  @@ -1905,14 +1909,14 @@
        *
        * @param httpURL the http URL.
        * @return the allowed methods and capabilities.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public static Enumeration optionsMethod(HttpURL httpURL)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           WebdavSession session = new WebdavSession();
  -        WebdavClient client = session.getSessionInstance(httpURL);
  +        HttpClient client = session.getSessionInstance(httpURL);
   
           OptionsMethod method = new OptionsMethod(httpURL.getPath());
           client.executeMethod(method);
  @@ -1948,11 +1952,11 @@
        *
        * @param depth
        * @return the response entity body that has pairs of href and properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           thisResource = true;
           return propfindMethod(httpURL.getPath(), depth);
  @@ -1972,11 +1976,11 @@
        * @param path the path to request.
        * @param depth
        * @return the response entity body that has pairs of href and properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(String path, int depth)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Check the path alright.
           path = HttpURL.getPath(path);
  @@ -2010,11 +2014,11 @@
        * @param depth The depth.
        * @param properties The named properties.
        * @return The response entity body that has pairs of href and properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(int depth, Vector properties)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           thisResource = true;
           return propfindMethod(httpURL.getPath(), depth, properties);
  @@ -2035,12 +2039,12 @@
        * @param depth The depth.
        * @param properties The named properties.
        * @return The response entity body that has pairs of href and properties.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(String path, int depth,
                                         Vector properties)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Check the path alright.
           path = HttpURL.getPath(path);
  @@ -2067,11 +2071,11 @@
        *
        * @param property the WebDAV property to find.
        * @return Enumeration list of WebDAV properties on a resource.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(String propertyName)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Vector property = new Vector();
           property.addElement(propertyName);
  @@ -2087,11 +2091,11 @@
        *
        * @param property the WebDAV property to find.
        * @return Enumeration list of WebDAV properties on a resource.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(String path, String propertyName)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           Vector property = new Vector();
           property.addElement(propertyName);
  @@ -2107,11 +2111,11 @@
        *
        * @param properties the WebDAV properties to find.
        * @return Enumeration list of WebDAV properties on a resource.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(Vector properties)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           thisResource = true;
           return propfindMethod(httpURL.getPath(), properties);
  @@ -2125,11 +2129,11 @@
        * @param path the path to request for propertis.
        * @param properties the WebDAV properties to find.
        * @return Enumeration list of WebDAV properties on a resource.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public Enumeration propfindMethod(String path, Vector properties)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Check the path alright.
           path = HttpURL.getPath(path);
  @@ -2178,11 +2182,11 @@
        * @param String propertyName
        * @param String propertyValue
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean proppatchMethod(String propertyName, String propertyValue)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = proppatchMethod
               (httpURL.getPath(), propertyName, propertyValue);
  @@ -2199,11 +2203,11 @@
        * @param propertyName the property name.
        * @param propertyValue the property value.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean proppatchMethod(String path, String propertyName,
  -        String propertyValue) throws WebdavException, IOException {
  +        String propertyValue) throws HttpException, IOException {
   
           Hashtable property = new Hashtable();
           property.put(propertyName, propertyValue);
  @@ -2217,11 +2221,11 @@
        *
        * @param property the property names.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean proppatchMethod(Hashtable property)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = proppatchMethod(httpURL.getPath(), property);
           if (result)
  @@ -2236,11 +2240,11 @@
        * @param path the path string.
        * @param property the property names.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean proppatchMethod(String path, Hashtable property)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           PropPatchMethod method = new PropPatchMethod(HttpURL.getPath(path));
           Enumeration names = property.keys();
  @@ -2275,11 +2279,11 @@
        * Execute the HEAD method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean headMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           return headMethod(httpURL.getPath());
       }
  @@ -2290,11 +2294,11 @@
        *
        * @param path the path to request.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean headMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           HeadMethod method = new HeadMethod(HttpURL.getPath(path));
           method.setDebug(debug);
  @@ -2311,11 +2315,11 @@
        * Execute the DELETE method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean deleteMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = deleteMethod(httpURL.getPath());
           if (result)
  @@ -2329,11 +2333,11 @@
        *
        * @param path the specified path.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean deleteMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           DeleteMethod method = new DeleteMethod(HttpURL.getPath(path));
           method.setDebug(debug);
  @@ -2351,11 +2355,11 @@
        *
        * @param destination the specified destination path to move.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean moveMethod(String destination)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = moveMethod(httpURL.getPath(),
                                       HttpURL.getPath(destination));
  @@ -2371,11 +2375,11 @@
        * @param source the specified destination as a relative HttpURL.
        * @param destination the specified destination as a relative HttpURL.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean moveMethod(String source, String destination)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           MoveMethod method = new MoveMethod(source, destination);
           method.setDebug(debug);
  @@ -2396,11 +2400,11 @@
        *
        * @param destination the specified destination as a relative HttpURL.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean copyMethod(String destination)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = copyMethod(httpURL.getPath(),
                                       HttpURL.getPath(destination));
  @@ -2416,11 +2420,11 @@
        * @param source the specified destination as a relative HttpURL.
        * @param destination the specified destination as a relative HttpURL.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean copyMethod(String source, String destination)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           CopyMethod method = new CopyMethod(source, destination);
           method.setDebug(debug);
  @@ -2440,11 +2444,11 @@
        * Execute the MKCOL method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean mkcolMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = mkcolMethod(httpURL.getPath());
           if (result)
  @@ -2458,11 +2462,11 @@
        *
        * @param path the specified path.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean mkcolMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           MkcolMethod method = new MkcolMethod(HttpURL.getPath(path));
           method.setDebug(debug);
  @@ -2483,11 +2487,11 @@
        * Execute the LOCK method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean lockMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           String owner = null;
           if (httpURL.getUserName() != null) {
  @@ -2510,11 +2514,11 @@
        * @param the owner string.
        * @param the timetout
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean lockMethod(String owner, short timeout)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = lockMethod(httpURL.getPath(), owner, (short) 120);
           if (result)
  @@ -2528,11 +2532,11 @@
        *
        * @param path the specified path.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean lockMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           String owner = null;
           if (httpURL.getUserName() != null) {
  @@ -2552,11 +2556,11 @@
        * @param owner The owner string.
        * @param timetout the timeout value.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean lockMethod(String path, String owner, short timeout)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // default lock type setting
           short lockType = LockMethod.SCOPE_EXCLUSIVE;
  @@ -2588,11 +2592,11 @@
        * Execute the Unlock method for this WebdavResource.
        *
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean unlockMethod()
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           boolean result = unlockMethod(httpURL.getPath());
           if (result)
  @@ -2606,11 +2610,11 @@
        *
        * @param path the specified path.
        * @return true if the method is succeeded.
  -     * @exception WebdavException
  +     * @exception HttpException
        * @exception IOException
        */
       public boolean unlockMethod(String path)
  -        throws WebdavException, IOException {
  +        throws HttpException, IOException {
   
           // Get the lock for the given path.
           State state = client.getState();