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 2001/02/14 13:30:53 UTC

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

juergen     01/02/14 04:30:52

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        PropPatchMethod.java
  Log:
  minor layout changes.
  
  Revision  Changes    Path
  1.7       +25 -19    jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
  
  Index: PropPatchMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropPatchMethod.java	2001/02/11 20:39:25	1.6
  +++ PropPatchMethod.java	2001/02/14 12:30:50	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.6 2001/02/11 20:39:25 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/02/11 20:39:25 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.7 2001/02/14 12:30:50 juergen Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/02/14 12:30:50 $
    *
    * ====================================================================
    *
  @@ -297,39 +297,39 @@
               
               // TEMP !!!! We should do a store instead !!
               content.create(slideToken, resourcePath, revisionDescriptor, null);
  -            
  +              
           } catch(RevisionAlreadyExistException e) {
  -        // 500 - Internal server error
  +            // 500 - Internal server error
               System.out.println(e.getMessage());
               resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -        throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +            throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
           } catch (LinkedObjectNotFoundException e) {
               // 404 - Not found
               System.out.println(e.getMessage());
  -            resp.setStatus(WebdavStatus.SC_NOT_FOUND);
  -    } catch (ObjectNotFoundException e) {
  -            // 404 - Not found
  -            System.out.println(e.getMessage());
               resp.setStatus(WebdavStatus.SC_NOT_FOUND);
  +        } catch (ObjectNotFoundException e) {
  +                // 404 - Not found
  +                System.out.println(e.getMessage());
  +                resp.setStatus(WebdavStatus.SC_NOT_FOUND);
           } catch (AccessDeniedException e) {
               // 403 - Forbidden
               System.out.println(e.getMessage());
               resp.setStatus(WebdavStatus.SC_FORBIDDEN);
  -    } catch (ObjectLockedException e) {
  -            // Locked
  -            System.out.println(e.getMessage());
  -            resp.setStatus(WebdavStatus.SC_LOCKED);
  +        } catch (ObjectLockedException e) {
  +                // Locked
  +                System.out.println(e.getMessage());
  +                resp.setStatus(WebdavStatus.SC_LOCKED);
           } catch (ServiceAccessException e) {
           // 500 - Internal server error
               System.out.println(e.getMessage());
               resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -        throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -    } catch (RuntimeException e) {
  -        // 500 - Internal server error
  +            throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +        } catch (RuntimeException e) {
  +            // 500 - Internal server error
               e.printStackTrace();
               resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -        throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -    }
  +            throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +        }
           
           // No serious errors. Printing the XML report.
           resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
  @@ -548,6 +548,12 @@
           
       try {
               Writer writer = resp.getWriter();
  +        
  +//System.out.println();
  +//System.out.println("PropPatch XML = " + generatedXML.toString());
  +//System.out.println();
  +        
  +        
               writer.write(generatedXML.toString());
           writer.flush();
       } catch (Exception e) {