juergen 02/03/14 22:47:20
Modified: src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
Log:
Adapted to changes in VersioningHelper (takes request content as additional
parameter).
Methods get/retrieveRequestContent() has been moved to super class WebdavMethod.
(ralf)
Revision Changes Path
1.52 +14 -25
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- PropFindMethod.java 15 Mar 2002 05:41:27 -0000 1.51
+++ PropFindMethod.java 15 Mar 2002 06:47:20 -0000 1.52
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.51 2002/03/15 05:41:27 juergen Exp $
- * $Revision: 1.51 $
- * $Date: 2002/03/15 05:41:27 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.52 2002/03/15 06:47:20 juergen Exp $
+ * $Revision: 1.52 $
+ * $Date: 2002/03/15 06:47:20 $
*
* ====================================================================
*
@@ -176,11 +176,6 @@
*/
protected RequestedProperties requestedProperties = null;
- /**
- * The request content (XML) Document.
- */
- protected Document requestContentDocument = null;
-
// ----------------------------------------------------------- Constructors
@@ -296,22 +291,6 @@
}
}
- /**
- * Returns the request content (XML) Document.
- *
- * @return the request content (XML) Document.
- */
- protected Document getRequestContent() {
- return requestContentDocument;
- }
-
- /**
- * Retrieves the request content (XML) Document.
- */
- protected void retrieveRequestContent() throws ParserConfigurationException,
IOException, SAXException{
- requestContentDocument = new DOMBuilder().build(parseRequestContent());
- }
-
/**
@@ -426,7 +405,7 @@
Element hrefElement = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
- slideToken, token, req, resp, getConfig() );
+ slideToken, token, req, resp, getRequestContent(), getConfig() );
String resourcePath = object.getUri();
if( !Configuration.useVersionControl() ) {
@@ -501,6 +480,16 @@
while (iterator.hasNext()) {
responseElement.addContent((Element)iterator.next());
}
+ } catch (AccessDeniedException ade) {
+ try {
+ resp.sendError(WebdavStatus.SC_FORBIDDEN,
WebdavStatus.getStatusText(WebdavStatus.SC_FORBIDDEN));
+ } catch(IOException ex) {}
+ throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
+ } catch (ServiceAccessException sae) {
+ try {
+ resp.sendError(WebdavStatus.SC_FORBIDDEN,
WebdavStatus.getStatusText(WebdavStatus.SC_FORBIDDEN));
+ } catch(IOException ex) {}
+ throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
} catch (Exception e) {
e.printStackTrace();
responseElement = getErrorResponse(object.getUri(),
getErrorCode(e), null);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
