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 ju...@apache.org on 2002/04/12 16:24:28 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method AbstractMultistatusResponseMethod.java WebdavMethod.java
juergen 02/04/12 07:24:28
Modified: src/webdav/server/org/apache/slide/webdav/method
AbstractMultistatusResponseMethod.java
WebdavMethod.java
Log:
Method getPreconditionViolationError() now takes the ViolatedPrecondition instead of the PreconditionViolationException.
(ralf)
Revision Changes Path
1.18 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java
Index: AbstractMultistatusResponseMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractMultistatusResponseMethod.java 8 Apr 2002 12:43:46 -0000 1.17
+++ AbstractMultistatusResponseMethod.java 12 Apr 2002 14:24:28 -0000 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.17 2002/04/08 12:43:46 juergen Exp $
- * $Revision: 1.17 $
- * $Date: 2002/04/08 12:43:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.18 2002/04/12 14:24:28 juergen Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/04/12 14:24:28 $
*
* ====================================================================
*
@@ -298,7 +298,7 @@
protected Element getPreconditionViolationResponseDescription(PreconditionViolationException pve) {
Element responseDescription = new Element(E_RESPONSEDESCRIPTION, Namespace.getNamespace(DEFAULT_NAMESPACE));
- responseDescription.addContent(getPreconditionViolationError(pve));
+ responseDescription.addContent(getPreconditionViolationError(pve.getViolatedPrecondition()));
return responseDescription;
}
1.49 +10 -10 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- WebdavMethod.java 12 Apr 2002 12:27:03 -0000 1.48
+++ WebdavMethod.java 12 Apr 2002 14:24:28 -0000 1.49
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.48 2002/04/12 12:27:03 juergen Exp $
- * $Revision: 1.48 $
- * $Date: 2002/04/12 12:27:03 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.49 2002/04/12 14:24:28 juergen Exp $
+ * $Revision: 1.49 $
+ * $Date: 2002/04/12 14:24:28 $
*
* ====================================================================
*
@@ -572,18 +572,18 @@
/**
* Generate <error> for the given precondition violation.
*
- * @param pve the ProconditionViolationException that describes the violated
- * precondition.
+ * @param violatedPrecondition the ViolatedPrecondition that describes
+ * the violated precondition.
*
* @return the <error> for the given precondition violation.
*/
- protected org.jdom.Element getPreconditionViolationError(PreconditionViolationException pve) {
+ protected org.jdom.Element getPreconditionViolationError(ViolatedPrecondition violatedPrecondition) {
org.jdom.Element error = new org.jdom.Element(WebdavConstants.E_ERROR,
org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_NAMESPACE));
- org.jdom.Element violatedPrecondition = new org.jdom.Element(pve.getViolatedPrecondition().getPrecondition(),
+ org.jdom.Element violatedPreconditionElement = new org.jdom.Element(violatedPrecondition.getPrecondition(),
org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_NAMESPACE));
- error.addContent(violatedPrecondition);
+ error.addContent(violatedPreconditionElement);
return error;
}
@@ -599,9 +599,9 @@
ViolatedPrecondition violatedPrecondition = pve.getViolatedPrecondition();
resp.setStatus(violatedPrecondition.getStatusCode());
- resp.setContentType(TEXT_XML);
+ resp.setContentType(TEXT_XML_UTF_8);
- new org.jdom.output.XMLOutputter().output(getPreconditionViolationError(pve), resp.getWriter());
+ new org.jdom.output.XMLOutputter().output(getPreconditionViolationError(pve.getViolatedPrecondition()), resp.getWriter());
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>