ozeigermann 2004/04/19 00:59:11
Modified: webdavclient/clientlib/src/java/org/apache/webdav/lib/methods
ReportMethod.java PropFindMethod.java
UpdateMethod.java XMLResponseMethodBase.java
VersionControlMethod.java PropPatchMethod.java
AclMethod.java LabelMethod.java
AclReportMethod.java OptionsMethod.java
webdavclient/clientlib/src/java/org/apache/util
XMLPrinter.java
Log:
Applied augmented second patch by Thomas Bernert described in #28379
Revision Changes Path
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/ReportMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReportMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ ReportMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -355,6 +355,8 @@
return preloadedQuery;
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
if (type!= LOCATE_HISTORY)
printer.writeElement("D", "DAV:", "version-tree",
1.3 +6 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/PropFindMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropFindMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ PropFindMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -353,9 +353,12 @@
protected String generateRequestBody() {
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "propfind",
XMLPrinter.OPENING);
+
+
switch (type) {
case ALL:
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/UpdateMethod.java
Index: UpdateMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/UpdateMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UpdateMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ UpdateMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -95,6 +95,8 @@
protected String generateRequestBody() {
if (target != null) {
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "update", XMLPrinter.OPENING);
printer.writeElement("D", "version", XMLPrinter.OPENING);
1.7 +45 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/XMLResponseMethodBase.java
Index: XMLResponseMethodBase.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/XMLResponseMethodBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLResponseMethodBase.java 14 Apr 2004 14:36:46 -0000 1.6
+++ XMLResponseMethodBase.java 19 Apr 2004 07:59:10 -0000 1.7
@@ -33,10 +33,14 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HeaderElement;
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpState;
import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NameValuePair;
import org.apache.util.DOMUtils;
import org.apache.util.DOMWriter;
import org.apache.util.WebdavStatus;
@@ -164,6 +168,14 @@
public void setDebug(int debug) {
this.debug = debug;
}
+
+ /**
+ * Debug property getter.
+ *
+ */
+ public int getDebug() {
+ return this.debug;
+ }
@@ -213,8 +225,23 @@
setRequestBody(contents);
+
if (debug > 0) {
System.out.println("\n>>>>>>> to server
---------------------------------------------------");
+ System.out.println(getName() + " " +
+ getPath() + (getQueryString() != null ? "?" +
getQueryString() : "") + " " + "HTTP/1.1");
+
+ Header[] headers = getRequestHeaders();
+ for (int i = 0; i < headers.length; i++) {
+ Header header = headers[i];
+ System.out.print(header.toString());
+ }
+ System.out.println("Content-Length:
"+super.getRequestContentLength());
+
+ if (this instanceof DepthSupport) {
+ System.out.println("Depth:
"+((DepthSupport)this).getDepth());
+ }
+
System.out.println(contents);
System.out.println("------------------------------------------------------------------------");
}
@@ -224,6 +251,9 @@
return super.getRequestContentLength();
}
+
+
+
/**
* DAV requests that contain a body must override this function to
* generate that body.
@@ -302,6 +332,18 @@
if (debug > 0) {
System.out.println("\n<<<<<<< from server
---------------------------------------------------");
+
+
+ System.out.println(getStatusLine());
+
+ Header[] headers = getResponseHeaders();
+ for (int i = 0; i < headers.length; i++) {
+ Header header = headers[i];
+ System.out.print(header.toString());
+ }
+
+
+
System.out.println(responseDocument.getDocumentElement().toString());
System.out.println("------------------------------------------------------------------------");
}
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/VersionControlMethod.java
Index: VersionControlMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/VersionControlMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VersionControlMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ VersionControlMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -117,6 +117,8 @@
if (sTarget != null){
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "version-control",
XMLPrinter.OPENING);
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/PropPatchMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropPatchMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ PropPatchMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -192,6 +192,8 @@
*/
protected String generateRequestBody() {
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "propertyupdate",
XMLPrinter.OPENING);
1.4 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/AclMethod.java
Index: AclMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/AclMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AclMethod.java 22 Mar 2004 16:24:48 -0000 1.3
+++ AclMethod.java 19 Apr 2004 07:59:10 -0000 1.4
@@ -118,6 +118,8 @@
protected String generateRequestBody() {
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "acl",
XMLPrinter.OPENING);
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/LabelMethod.java
Index: LabelMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/LabelMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LabelMethod.java 11 Feb 2004 11:30:51 -0000 1.2
+++ LabelMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -181,6 +181,8 @@
"calling this function");
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
printer.writeElement("D", "DAV:", "label", XMLPrinter.OPENING);
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/AclReportMethod.java
Index: AclReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/AclReportMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AclReportMethod.java 11 Feb 2004 11:30:51 -0000 1.2
+++ AclReportMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -144,6 +144,8 @@
*/
protected String generateRequestBody() {
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug()!= 0);
+
printer.writeXMLHeader();
switch (reportType) {
1.3 +5 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/methods/OptionsMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OptionsMethod.java 11 Feb 2004 11:30:52 -0000 1.2
+++ OptionsMethod.java 19 Apr 2004 07:59:10 -0000 1.3
@@ -264,6 +264,8 @@
if (type != 0){
XMLPrinter printer = new XMLPrinter();
+ printer.setDebug(getDebug() != 0);
+
printer.writeXMLHeader();
//System.out.println(printer.toString());
printer.writeElement("D", "DAV:", "options",
1.4 +18 -5
jakarta-slide/webdavclient/clientlib/src/java/org/apache/util/XMLPrinter.java
Index: XMLPrinter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/util/XMLPrinter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLPrinter.java 14 Apr 2004 14:36:46 -0000 1.3
+++ XMLPrinter.java 19 Apr 2004 07:59:11 -0000 1.4
@@ -37,7 +37,10 @@
// -------------------------------------------------------------- Constants
- private int indentLevel = 0; // indentlevel of XML formating
+ private int indentLevel = 0; // indentlevel of XML formating
+ private boolean debugMode = false;
+
+
/**
@@ -171,6 +174,16 @@
writeElement(namespace, null, name, type);
}
+ /**
+ * set debug mode
+ * @param debug
+ */
+ public void setDebug(boolean debug) {
+ debugMode = debug;
+ }
+
+
+
/**
* Make a formatstring for debuging output of XML data
*
@@ -199,7 +212,7 @@
public void writeElement(String namespace, String namespaceInfo,
String name, int type) {
- boolean debugMode = true;
+
if ((namespace != null) && (namespace.length() > 0)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
