cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method GetMethod.java

[juergen]

juergen     02/03/14 22:45:27

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        GetMethod.java
  Log:
  Adapted to changes in VersioningHelper (takes request content as additional 
parameter).
  (ralf)
  
  Revision  Changes    Path
  1.20      +20 -4     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java
  
  Index: GetMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- GetMethod.java    1 Mar 2002 16:45:59 -0000       1.19
  +++ GetMethod.java    15 Mar 2002 06:45:27 -0000      1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
 1.19 2002/03/01 16:45:59 pnever Exp $
  - * $Revision: 1.19 $
  - * $Date: 2002/03/01 16:45:59 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
 1.20 2002/03/15 06:45:27 juergen Exp $
  + * $Revision: 1.20 $
  + * $Date: 2002/03/15 06:45:27 $
    *
    * ====================================================================
    *
  @@ -70,6 +70,10 @@
   import java.text.ParseException;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import javax.xml.parsers.ParserConfigurationException ;
  +import org.xml.sax.SAXException;
  +import org.jdom.Document;
  +import org.jdom.input.DOMBuilder;
   
   import org.apache.util.WebdavStatus;
   import org.apache.slide.common.NamespaceAccessToken;
  @@ -172,6 +176,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);
  +        }
       }
       
       
  @@ -193,7 +209,7 @@
   //                content.retrieve(slideToken, resourcePath);
               NodeRevisionDescriptors revisionDescriptors;
               VersioningHelper vHelp =  VersioningHelper.getVersioningHelper(
  -                slideToken, token, req, resp, getConfig() );
  +                slideToken, token, req, resp, getRequestContent(), getConfig() );
               
               if( !Configuration.useVersionControl() ) {
                   revisionDescriptors =
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>