juergen 02/03/14 22:45:57
Modified: src/webdav/server/org/apache/slide/webdav/method
VersionControlMethod.java
Log:
Adapted to changes in VersioningHelper (takes request content as additional
parameter).
(ralf)
Revision Changes Path
1.5 +21 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java
Index: VersionControlMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionControlMethod.java 28 Feb 2002 12:36:36 -0000 1.4
+++ VersionControlMethod.java 15 Mar 2002 06:45:57 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v
1.4 2002/02/28 12:36:36 pnever Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/28 12:36:36 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v
1.5 2002/03/15 06:45:57 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/15 06:45:57 $
*
* ====================================================================
*
@@ -69,6 +69,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.ParserConfigurationException ;
+import org.xml.sax.SAXException;
+import org.jdom.Document;
+import org.jdom.input.DOMBuilder;
+
import org.apache.slide.common.Uri;
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
@@ -125,6 +130,18 @@
if (resourcePath == null) {
resourcePath = "/";
}
+ try{
+ retrieveRequestContent();
+ }
+ catch (IOException e){
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ }
+ catch (SAXException e){
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ }
+ catch (ParserConfigurationException e){
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ }
}
/**
@@ -139,7 +156,7 @@
try {
VersioningHelper vh = VersioningHelper.getVersioningHelper(
- slideToken, token, req, resp, getConfig() );
+ slideToken, token, req, resp, getRequestContent(), getConfig() );
vh.versionControl( resourcePath );
}
catch (Exception e) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
