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:29:13 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd Slide.java
remm 01/05/01 14:29:13
Modified: src/webdav/client/src/org/apache/webdav/cmd Slide.java
Log:
- Rename WebdavStatus to HttpStatus.
- Rename WebdavException to HttpException.
Revision Changes Path
1.25 +33 -30 jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java
Index: Slide.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Slide.java 2001/04/30 16:46:23 1.24
+++ Slide.java 2001/05/01 21:29:13 1.25
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.24 2001/04/30 16:46:23 jericho Exp $
- * $Revision: 1.24 $
- * $Date: 2001/04/30 16:46:23 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.25 2001/05/01 21:29:13 remm Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/05/01 21:29:13 $
*
* ====================================================================
*
@@ -78,10 +78,13 @@
import java.text.SimpleDateFormat;
import java.net.URL;
import java.net.MalformedURLException;
-import org.apache.util.WebdavStatus;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.HttpException;
+
import org.apache.util.HttpURL;
+
import org.apache.webdav.lib.WebdavResource;
-import org.apache.webdav.lib.WebdavException;
import org.apache.webdav.lib.methods.*;
/**
@@ -219,10 +222,10 @@
if (debugMode)
webdavResource.setDebug(10000);
setPath(webdavResource.getPath());
- } catch (WebdavException we) {
+ } catch (HttpException we) {
// Check authorization and try it again.
if (we.getStatusCode() ==
- WebdavStatus.SC_UNAUTHORIZED) {
+ HttpStatus.SC_UNAUTHORIZED) {
System.out.print("UserName: ");
String userName = in.readLine();
@@ -243,7 +246,7 @@
webdavResource.setDebug(10000);
}
setPath(webdavResource.getPath());
- } catch (WebdavException e) {
+ } catch (HttpException e) {
System.err.println("Warning: "
+ e.getMessage());
httpURL = null;
@@ -324,9 +327,9 @@
webdavResource.setHttpURL(inputUrl);
}
setPath(webdavResource.getPath());
- } catch (WebdavException we) {
+ } catch (HttpException we) {
if (we.getStatusCode() ==
- WebdavStatus.SC_UNAUTHORIZED) {
+ HttpStatus.SC_UNAUTHORIZED) {
System.out.print("UserName: ");
String userName = in.readLine();
@@ -356,7 +359,7 @@
webdavResource.setDebug(10000);
}
setPath(webdavResource.getPath());
- } catch (WebdavException e) {
+ } catch (HttpException e) {
System.err.println("Warning: "
+ e.getMessage());
httpURL = null;
@@ -517,9 +520,9 @@
System.out.println();
}
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
if (we.getStatusCode() ==
- WebdavStatus.SC_UNAUTHORIZED) {
+ HttpStatus.SC_UNAUTHORIZED) {
System.out.print("UserName: ");
String userName = in.readLine();
@@ -599,7 +602,7 @@
}
System.out.println();
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " + e.getMessage());
@@ -656,9 +659,9 @@
System.err.println
("Warning: Not found the path");
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
if (we.getStatusCode() ==
- WebdavStatus.SC_UNAUTHORIZED) {
+ HttpStatus.SC_UNAUTHORIZED) {
System.out.print("UserName: ");
String userName = in.readLine();
@@ -678,7 +681,7 @@
if (debugMode)
webdavResource.setDebug(10000);
setPath(webdavResource.getPath());
- } catch (WebdavException e) {
+ } catch (HttpException e) {
System.err.println("Warning: "
+ e.getMessage());
httpURL = null;
@@ -730,9 +733,9 @@
path = checkUri("./");
webdavResource.setPath(path);
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
if (webdavResource.getStatusCode() ==
- WebdavStatus.SC_METHOD_NOT_ALLOWED) {
+ HttpStatus.SC_METHOD_NOT_ALLOWED) {
System.err.println
("Warning: Not WebDAV-enabled?");
} else {
@@ -784,7 +787,7 @@
// Start with a new line.
System.out.println();
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: "
+ we.getMessage());
} catch (IOException e) {
@@ -839,7 +842,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -864,7 +867,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -912,7 +915,7 @@
("Warning: File not exists");
} catch (MalformedURLException mue) {
System.err.println("Warning: " + mue.getMessage());
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -957,7 +960,7 @@
webdavResource.getStatusMessage());
}
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -980,7 +983,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -1003,7 +1006,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -1026,7 +1029,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -1049,7 +1052,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -1069,7 +1072,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +
@@ -1089,7 +1092,7 @@
System.err.println(
webdavResource.getStatusMessage());
}
- } catch (WebdavException we) {
+ } catch (HttpException we) {
System.err.println("Warning: " + we.getMessage());
} catch (IOException e) {
System.err.println("Error: Check! " +