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:05 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods XMLResponseMethodBase.java UnlockMethod.java SearchMethod.java PropPatchMethod.java PropFindMethod.java OptionsMethod.java MoveMethod.java MkcolMethod.java LockMethod.java DeleteMethod.java CopyMethod.java
remm 01/05/01 14:28:05
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
XMLResponseMethodBase.java UnlockMethod.java
SearchMethod.java PropPatchMethod.java
PropFindMethod.java OptionsMethod.java
MoveMethod.java MkcolMethod.java LockMethod.java
DeleteMethod.java CopyMethod.java
Log:
- Update some package names to org.apache.commons.httpclient.
- Rename some class names from WebdavXXX to HttpXXX.
Revision Changes Path
1.14 +14 -6 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java
Index: XMLResponseMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLResponseMethodBase.java 2001/03/23 05:06:39 1.13
+++ XMLResponseMethodBase.java 2001/05/01 21:28:00 1.14
@@ -79,9 +79,12 @@
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethodBase;
+
import org.apache.webdav.lib.Property;
import org.apache.webdav.lib.ResponseEntity;
-import org.apache.webdav.lib.WebdavException;
import org.apache.webdav.lib.properties.GetLastModifiedProperty;
import org.apache.webdav.lib.properties.ResourceTypeProperty;
@@ -105,7 +108,7 @@
* @author Remy Maucherat
*/
public class XMLResponseMethodBase
- extends WebdavMethodBase {
+ extends HttpMethodBase {
// ----------------------------------------------------------- Constructors
@@ -166,6 +169,11 @@
}
+ protected State getState() {
+ return state;
+ }
+
+
// --------------------------------------------------- WebdavMethod Methods
@@ -185,7 +193,7 @@
* @param input Input stream
*/
public void parseResponse(InputStream input)
- throws IOException, WebdavException {
+ throws IOException, HttpException {
if (getStatusCode() == WebdavStatus.SC_MULTI_STATUS) {
parseXMLResponse(input);
}
@@ -193,7 +201,7 @@
protected void parseXMLResponse(InputStream input)
- throws IOException, WebdavException {
+ throws IOException, HttpException {
if (builder == null) {
try {
@@ -202,7 +210,7 @@
factory.setNamespaceAware(true);
builder = factory.newDocumentBuilder();
} catch (ParserConfigurationException e) {
- throw new WebdavException
+ throw new HttpException
("XML Parser Configuration error: " + e.getMessage());
}
}
@@ -367,7 +375,7 @@
public String getHref() {
Element href = getFirstElement("DAV:", "href");
if (href != null) {
- return state.URLDecode(DOMUtils.getTextValue(href));
+ return getState().URLDecode(DOMUtils.getTextValue(href));
} else {
return "";
}
1.10 +9 -8 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UnlockMethod.java 2001/04/04 13:04:45 1.9
+++ UnlockMethod.java 2001/05/01 21:28:00 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v 1.9 2001/04/04 13:04:45 juergen Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/04 13:04:45 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v 1.10 2001/05/01 21:28:00 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/05/01 21:28:00 $
*
* ====================================================================
*
@@ -66,9 +66,10 @@
import java.io.InputStream;
import java.io.IOException;
-import org.apache.util.WebdavStatus;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpMethodBase;
/**
@@ -78,7 +79,7 @@
* @author <a href="mailto:bcholmes@interlog.com">B.C. Holmes</a>
*/
public class UnlockMethod
- extends WebdavMethodBase {
+ extends HttpMethodBase {
// ----------------------------------------------------- Instance Variables
@@ -172,7 +173,7 @@
*/
public void parseResponse(InputStream is)
throws IOException {
- if (getStatusCode() == WebdavStatus.SC_NO_CONTENT) {
+ if (getStatusCode() == HttpStatus.SC_NO_CONTENT) {
state.removeLock(getPath(), lockToken);
}
}
1.2 +6 -8 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/SearchMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchMethod.java 2001/04/28 02:23:59 1.1
+++ SearchMethod.java 2001/05/01 21:28:01 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/SearchMethod.java,v 1.1 2001/04/28 02:23:59 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2001/04/28 02:23:59 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/SearchMethod.java,v 1.2 2001/05/01 21:28:01 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/05/01 21:28:01 $
*
* ====================================================================
*
@@ -70,14 +70,12 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.util.WebdavStatus;
import org.apache.util.XMLPrinter;
-import org.apache.webdav.lib.Header;
-import org.apache.webdav.lib.Property;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.WebdavException;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.State;
+import org.apache.webdav.lib.Property;
import org.apache.webdav.lib.properties.GetLastModifiedProperty;
import org.apache.webdav.lib.properties.ResourceTypeProperty;
1.17 +8 -6 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PropPatchMethod.java 2001/04/04 13:04:45 1.16
+++ PropPatchMethod.java 2001/05/01 21:28:01 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.16 2001/04/04 13:04:45 juergen Exp $
- * $Revision: 1.16 $
- * $Date: 2001/04/04 13:04:45 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.17 2001/05/01 21:28:01 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/05/01 21:28:01 $
*
* ====================================================================
*
@@ -65,13 +65,15 @@
import java.io.*;
import java.util.*;
+
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.util.WebdavStatus;
+
import org.apache.util.XMLPrinter;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
/**
1.25 +6 -8 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PropFindMethod.java 2001/04/13 08:04:38 1.24
+++ PropFindMethod.java 2001/05/01 21:28:01 1.25
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.24 2001/04/13 08:04:38 remm Exp $
- * $Revision: 1.24 $
- * $Date: 2001/04/13 08:04:38 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.25 2001/05/01 21:28:01 remm Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/05/01 21:28:01 $
*
* ====================================================================
*
@@ -70,14 +70,12 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.util.WebdavStatus;
import org.apache.util.XMLPrinter;
-import org.apache.webdav.lib.Header;
-import org.apache.webdav.lib.Property;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.WebdavException;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.State;
+import org.apache.webdav.lib.Property;
import org.apache.webdav.lib.properties.GetLastModifiedProperty;
import org.apache.webdav.lib.properties.ResourceTypeProperty;
1.6 +15 -9 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OptionsMethod.java 2001/04/03 10:32:43 1.5
+++ OptionsMethod.java 2001/05/01 21:28:01 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v 1.5 2001/04/03 10:32:43 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2001/04/03 10:32:43 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v 1.6 2001/05/01 21:28:01 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/05/01 21:28:01 $
*
* ====================================================================
*
@@ -63,20 +63,26 @@
package org.apache.webdav.lib.methods;
-import java.io.*;
-import java.util.*;
-import org.apache.util.WebdavStatus;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Vector;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
+
+
/**
* OPTIONS Method.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
*/
public class OptionsMethod
- extends WebdavMethodBase {
+ extends HttpMethodBase {
// -------------------------------------------------------------- Constants
1.13 +6 -6 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MoveMethod.java 2001/04/30 16:46:15 1.12
+++ MoveMethod.java 2001/05/01 21:28:02 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v 1.12 2001/04/30 16:46:15 jericho Exp $
- * $Revision: 1.12 $
- * $Date: 2001/04/30 16:46:15 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v 1.13 2001/05/01 21:28:02 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/05/01 21:28:02 $
*
* ====================================================================
*
@@ -63,8 +63,8 @@
package org.apache.webdav.lib.methods;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
/**
@@ -220,7 +220,7 @@
super.generateHeaders(host, state);
String absoluteDestination = "http://" + host
- + state.URLEncodePath(destination);
+ + state.URLEncode(destination);
super.setHeader("Destination", absoluteDestination);
if (!isOverwrite())
1.5 +6 -4 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MkcolMethod.java 2001/04/03 10:32:42 1.4
+++ MkcolMethod.java 2001/05/01 21:28:02 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v 1.4 2001/04/03 10:32:42 juergen Exp $
- * $Revision: 1.4 $
- * $Date: 2001/04/03 10:32:42 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v 1.5 2001/05/01 21:28:02 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/05/01 21:28:02 $
*
* ====================================================================
*
@@ -66,6 +66,8 @@
import java.io.InputStream;
import java.io.IOException;
+import org.apache.commons.httpclient.HttpMethodBase;
+
/**
* The MKCOL method is used to create a new collection. All DAV compliant
* resources must support the MKCOL method. Collections are merely
@@ -103,7 +105,7 @@
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
*/
public class MkcolMethod
- extends WebdavMethodBase {
+ extends HttpMethodBase {
// ----------------------------------------------------------- Constructors
1.18 +11 -11 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LockMethod.java 2001/04/04 13:04:45 1.17
+++ LockMethod.java 2001/05/01 21:28:02 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.17 2001/04/04 13:04:45 juergen Exp $
- * $Revision: 1.17 $
- * $Date: 2001/04/04 13:04:45 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.18 2001/05/01 21:28:02 remm Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/05/01 21:28:02 $
*
* ====================================================================
*
@@ -72,12 +72,12 @@
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.WebdavException;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.webdav.lib.properties.LockEntryProperty;
-import org.apache.util.WebdavStatus;
import org.apache.util.DOMUtils;
import org.apache.util.DOMWriter;
@@ -487,15 +487,15 @@
* @param input Input stream
*/
public void parseResponse(InputStream input)
- throws IOException, WebdavException {
+ throws IOException, HttpException {
int status = getStatusCode();
- if (status == WebdavStatus.SC_OK ||
- status == WebdavStatus.SC_MULTI_STATUS ||
- status == WebdavStatus.SC_CONFLICT) {
+ if (status == HttpStatus.SC_OK ||
+ status == HttpStatus.SC_MULTI_STATUS ||
+ status == HttpStatus.SC_CONFLICT) {
parseXMLResponse(input);
- if (status == WebdavStatus.SC_OK) {
+ if (status == HttpStatus.SC_OK) {
String prefix = DOMUtils.findDavPrefix(
getResponseDocument());
NodeList list = getResponseDocument().getDocumentElement()
1.6 +5 -6 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java
Index: DeleteMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeleteMethod.java 2001/04/03 10:32:39 1.5
+++ DeleteMethod.java 2001/05/01 21:28:02 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v 1.5 2001/04/03 10:32:39 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2001/04/03 10:32:39 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v 1.6 2001/05/01 21:28:02 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/05/01 21:28:02 $
*
* ====================================================================
*
@@ -63,9 +63,8 @@
package org.apache.webdav.lib.methods;
-import org.apache.util.WebdavStatus;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
/**
1.13 +6 -6 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CopyMethod.java 2001/04/30 16:46:16 1.12
+++ CopyMethod.java 2001/05/01 21:28:02 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v 1.12 2001/04/30 16:46:16 jericho Exp $
- * $Revision: 1.12 $
- * $Date: 2001/04/30 16:46:16 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v 1.13 2001/05/01 21:28:02 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/05/01 21:28:02 $
*
* ====================================================================
*
@@ -63,8 +63,8 @@
package org.apache.webdav.lib.methods;
-import org.apache.webdav.lib.State;
-import org.apache.webdav.lib.Header;
+import org.apache.commons.httpclient.State;
+import org.apache.commons.httpclient.Header;
/**
@@ -221,7 +221,7 @@
super.generateHeaders(host, state);
String absoluteDestination = "http://" + host
- + state.URLEncodePath(destination);
+ + state.URLEncode(destination);
super.setHeader("Destination", absoluteDestination);
if (!isOverwrite())