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...@locus.apache.org on 2000/11/30 20:46:39 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods LockMethod.java PropFindMethod.java PropPatchMethod.java
remm 00/11/30 11:46:39
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
LockMethod.java PropFindMethod.java
PropPatchMethod.java
Log:
- Fix compliance problems : the methods which send an XML body must set
content-type to text/xml (and indicate the charset)
Revision Changes Path
1.4 +5 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockMethod.java 2000/11/30 02:23:03 1.3
+++ LockMethod.java 2000/11/30 19:46:34 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.3 2000/11/30 02:23:03 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/11/30 02:23:03 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.4 2000/11/30 19:46:34 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/11/30 19:46:34 $
*
* ====================================================================
*
@@ -340,6 +340,8 @@
if (isRefresh()) {
setHeader("If", "(<" + refreshOpaqueToken + ">)");
}
+
+ setHeader("Content-Type", "text/xml; charset=\"utf-8\"");
this.state = state;
}
1.6 +10 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropFindMethod.java 2000/11/30 03:14:45 1.5
+++ PropFindMethod.java 2000/11/30 19:46:35 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.5 2000/11/30 03:14:45 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2000/11/30 03:14:45 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.6 2000/11/30 19:46:35 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/11/30 19:46:35 $
*
* ====================================================================
*
@@ -119,6 +119,7 @@
* </PRE>
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+ * @author B.C. Holmes
*/
public class PropFindMethod extends XMLResponseMethodBase
implements DepthMethod {
@@ -266,6 +267,8 @@
super.generateHeaders(host, state);
+ setHeader("Content-Type", "text/xml; charset=\"utf-8\"");
+
switch (depth) {
case DEPTH_0:
setHeader("Depth", "0");
@@ -312,6 +315,10 @@
}
printer.writeElement("D", "DAV", "propfind", WebdavXMLPrinter.CLOSING);
+ if (debug > 1) {
+ System.out.println("Request body:");
+ System.out.println(printer.toString());
+ }
return printer.toString();
}
1.4 +18 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchMethod.java 2000/11/30 02:23:04 1.3
+++ PropPatchMethod.java 2000/11/30 19:46:36 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.3 2000/11/30 02:23:04 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/11/30 02:23:04 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.4 2000/11/30 19:46:36 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/11/30 19:46:36 $
*
* ====================================================================
*
@@ -195,6 +195,21 @@
// --------------------------------------------------- WebdavMethod Methods
+
+
+ /**
+ * Generate additional headers needed by the request.
+ *
+ * @param host the host
+ * @param state State token
+ */
+ public void generateHeaders(String host, State state) {
+
+ super.generateHeaders(host, state);
+
+ setHeader("Content-Type", "text/xml; charset=\"utf-8\"");
+
+ }
/**