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 re...@apache.org on 2001/03/23 06:08:33 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java DeleteMethod.java GetMethod.java HeadMethod.java LockMethod.java MkcolMethod.java MoveMethod.java OptionsMethod.java PostMethod.java PropFindMethod.java PropPatchMethod.java PutMethod.java UnlockMethod.java WebdavMethod.java

remm        01/03/22 21:08:33

  Modified:    src/webdav/server/org/apache/slide/webdav
                        WebdavException.java WebdavServlet.java
               src/webdav/server/org/apache/slide/webdav/method
                        CopyMethod.java DeleteMethod.java GetMethod.java
                        HeadMethod.java LockMethod.java MkcolMethod.java
                        MoveMethod.java OptionsMethod.java PostMethod.java
                        PropFindMethod.java PropPatchMethod.java
                        PutMethod.java UnlockMethod.java WebdavMethod.java
  Removed:     src/webdav/server/org/apache/slide/webdav/common
                        WebdavStatus.java
  Log:
  - Complete move of WebdavStatus.
  
  Revision  Changes    Path
  1.3       +5 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java
  
  Index: WebdavException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebdavException.java	2001/03/07 18:21:21	1.2
  +++ WebdavException.java	2001/03/23 05:08:27	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java,v 1.2 2001/03/07 18:21:21 juergen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/03/07 18:21:21 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java,v 1.3 2001/03/23 05:08:27 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/03/23 05:08:27 $
    *
    * ====================================================================
    *
  @@ -67,8 +67,9 @@
   import java.io.IOException;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.SlideException;
  -import org.apache.slide.webdav.common.WebdavStatus;
  +
   
   /**
    * Webdav exception class.
  
  
  
  1.9       +23 -14    jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebdavServlet.java	2001/03/23 04:35:56	1.8
  +++ WebdavServlet.java	2001/03/23 05:08:27	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 1.8 2001/03/23 04:35:56 remm Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/03/23 04:35:56 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 1.9 2001/03/23 05:08:27 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/03/23 05:08:27 $
    *
    * ====================================================================
    *
  @@ -74,10 +74,11 @@
   import javax.xml.parsers.SAXParserFactory;
   import org.xml.sax.*;
   import org.xml.sax.helpers.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.webdav.method.*;
  -import org.apache.slide.webdav.common.*;
  +import org.apache.slide.common.NamespaceAccessToken;
  +import org.apache.slide.common.Domain;
   import org.apache.slide.structure.*;
  -import org.apache.slide.common.*;
   import org.apache.slide.util.conf.*;
   import org.apache.slide.authenticate.SecurityToken;
   
  @@ -215,20 +216,28 @@
           
           
           //  if logging for the request/response is required perform the logging
  -        if (Domain.isEnabled("org.apache.slide.webdav.WebdavServlet.requestResponseLogger", Logger.DEBUG)) {
  -            XMLTestCaseGenerator xmlGen = new XMLTestCaseGenerator((XHttpServletRequestFacade)req,
  -                                                                   (XHttpServletResponseFacade)resp);
  +        if (Domain.isEnabled
  +            ("org.apache.slide.webdav.WebdavServlet.requestResponseLogger", 
  +             Logger.DEBUG)) {
  +            XMLTestCaseGenerator xmlGen = new XMLTestCaseGenerator
  +                ((XHttpServletRequestFacade)req,
  +                 (XHttpServletResponseFacade)resp);
               xmlGen.setThreadName(Thread.currentThread().getName());
  -            Domain.log(xmlGen.toString(), "org.apache.slide.webdav.WebdavServlet.requestResponseLogger" , Logger.DEBUG);
  +            Domain.log
  +                (xmlGen.toString(), 
  +                 "org.apache.slide.webdav.WebdavServlet.requestResponseLogger",
  +                 Logger.DEBUG);
           }
           
           Domain.info
               (req.getMethod()
  -                 + ( (resp instanceof XHttpServletResponseFacade) ? (" = " + ((XHttpServletResponseFacade)resp).getStatus()
  -                                                                     + " " + (org.apache.slide.webdav.common.WebdavStatus.getStatusText(((XHttpServletResponseFacade)resp).getStatus())))
  -                                                                  : ("") )
  -                 + " (time: " + (System.currentTimeMillis() - startTime) + " ms)"
  -                 + " URI = " + WebdavMethod.getRelativePath(req));
  +             + ( (resp instanceof XHttpServletResponseFacade) 
  +                 ? (" = " + ((XHttpServletResponseFacade)resp).getStatus()
  +                    + " " + (WebdavStatus.getStatusText
  +                             (((XHttpServletResponseFacade)resp).getStatus())))
  +                 : ("") )
  +             + " (time: " + (System.currentTimeMillis() - startTime) + " ms)"
  +             + " URI = " + WebdavMethod.getRelativePath(req));
           
       }
       
  
  
  
  1.8       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
  
  Index: CopyMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CopyMethod.java	2001/02/17 04:48:43	1.7
  +++ CopyMethod.java	2001/03/23 05:08:29	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.7 2001/02/17 04:48:43 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/02/17 04:48:43 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.8 2001/03/23 05:08:29 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/03/23 05:08:29 $
    *
    * ====================================================================
    *
  @@ -69,8 +69,8 @@
   import javax.servlet.*;
   import javax.servlet.http.*;
   import org.apache.util.XMLPrinter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.lock.*;
  
  
  
  1.7       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java
  
  Index: DeleteMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DeleteMethod.java	2001/02/15 17:43:57	1.6
  +++ DeleteMethod.java	2001/03/23 05:08:29	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.6 2001/02/15 17:43:57 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/02/15 17:43:57 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.7 2001/03/23 05:08:29 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/03/23 05:08:29 $
    *
    * ====================================================================
    *
  @@ -69,8 +69,8 @@
   import javax.servlet.*;
   import javax.servlet.http.*;
   import org.apache.util.XMLPrinter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.lock.*;
  
  
  
  1.7       +4 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GetMethod.java	2001/03/08 23:47:08	1.6
  +++ GetMethod.java	2001/03/23 05:08:29	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.6 2001/03/08 23:47:08 remm Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/03/08 23:47:08 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.7 2001/03/23 05:08:29 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/03/23 05:08:29 $
    *
    * ====================================================================
    *
  @@ -70,9 +70,9 @@
   import java.text.ParseException;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
   import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.util.Messages;
   import org.apache.slide.content.*;
  
  
  
  1.2       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java
  
  Index: HeadMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HeadMethod.java	2000/11/22 06:20:46	1.1
  +++ HeadMethod.java	2001/03/23 05:08:29	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/11/22 06:20:46 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java,v 1.2 2001/03/23 05:08:29 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/03/23 05:08:29 $
    *
    * ====================================================================
    *
  @@ -68,9 +68,9 @@
   import java.util.*;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
   import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.lock.*;
   import org.apache.slide.structure.*;
  
  
  
  1.9       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
  
  Index: LockMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LockMethod.java	2001/02/19 16:10:51	1.8
  +++ LockMethod.java	2001/03/23 05:08:30	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v 1.8 2001/02/19 16:10:51 juergen Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/02/19 16:10:51 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v 1.9 2001/03/23 05:08:30 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/03/23 05:08:30 $
    *
    * ====================================================================
    *
  @@ -72,8 +72,8 @@
   import org.xml.sax.InputSource;
   import org.apache.util.XMLPrinter;
   import org.apache.util.DOMWriter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.lock.*;
  
  
  
  1.8       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
  
  Index: MkcolMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MkcolMethod.java	2001/03/07 18:21:15	1.7
  +++ MkcolMethod.java	2001/03/23 05:08:30	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.7 2001/03/07 18:21:15 juergen Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/03/07 18:21:15 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.8 2001/03/23 05:08:30 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/03/23 05:08:30 $
    *
    * ====================================================================
    *
  @@ -70,8 +70,8 @@
   import java.text.SimpleDateFormat;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.structure.*;
   import org.apache.slide.content.*;
  
  
  
  1.8       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
  
  Index: MoveMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MoveMethod.java	2001/02/17 04:48:43	1.7
  +++ MoveMethod.java	2001/03/23 05:08:30	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.7 2001/02/17 04:48:43 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/02/17 04:48:43 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.8 2001/03/23 05:08:30 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/03/23 05:08:30 $
    *
    * ====================================================================
    *
  @@ -69,8 +69,8 @@
   import javax.servlet.*;
   import javax.servlet.http.*;
   import org.apache.util.XMLPrinter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.lock.*;
  
  
  
  1.5       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
  
  Index: OptionsMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OptionsMethod.java	2001/03/18 21:50:58	1.4
  +++ OptionsMethod.java	2001/03/23 05:08:30	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.4 2001/03/18 21:50:58 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/03/18 21:50:58 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.5 2001/03/23 05:08:30 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/03/23 05:08:30 $
    *
    * ====================================================================
    *
  @@ -68,10 +68,10 @@
   import java.util.*;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.authenticate.CredentialsToken;
   import org.apache.slide.common.*;
   import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.structure.*;
   import org.apache.slide.lock.*;
  
  
  
  1.2       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java
  
  Index: PostMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PostMethod.java	2000/11/22 06:20:46	1.1
  +++ PostMethod.java	2001/03/23 05:08:31	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/11/22 06:20:46 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java,v 1.2 2001/03/23 05:08:31 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/03/23 05:08:31 $
    *
    * ====================================================================
    *
  @@ -63,8 +63,8 @@
   
   package org.apache.slide.webdav.method;
   
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import java.security.Principal;
   import java.io.*;
  
  
  
  1.15      +4 -4      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PropFindMethod.java	2001/03/19 05:10:38	1.14
  +++ PropFindMethod.java	2001/03/23 05:08:31	1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.14 2001/03/19 05:10:38 remm Exp $
  - * $Revision: 1.14 $
  - * $Date: 2001/03/19 05:10:38 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.15 2001/03/23 05:08:31 remm Exp $
  + * $Revision: 1.15 $
  + * $Date: 2001/03/23 05:08:31 $
    *
    * ====================================================================
    *
  @@ -72,10 +72,10 @@
   import org.w3c.dom.*;
   import org.xml.sax.InputSource;
   import org.apache.util.XMLPrinter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.authenticate.CredentialsToken;
   import org.apache.slide.common.*;
   import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.structure.*;
   import org.apache.slide.lock.*;
  
  
  
  1.11      +4 -4      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PropPatchMethod.java	2001/02/15 17:44:02	1.10
  +++ PropPatchMethod.java	2001/03/23 05:08:31	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.10 2001/02/15 17:44:02 remm Exp $
  - * $Revision: 1.10 $
  - * $Date: 2001/02/15 17:44:02 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.11 2001/03/23 05:08:31 remm Exp $
  + * $Revision: 1.11 $
  + * $Date: 2001/03/23 05:08:31 $
    *
    * ====================================================================
    *
  @@ -72,10 +72,10 @@
   import org.xml.sax.InputSource;
   import org.apache.util.XMLPrinter;
   import org.apache.util.DOMWriter;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.authenticate.CredentialsToken;
   import org.apache.slide.common.*;
   import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.structure.*;
   import org.apache.slide.lock.*;
  
  
  
  1.8       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
  
  Index: PutMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PutMethod.java	2001/03/06 03:19:08	1.7
  +++ PutMethod.java	2001/03/23 05:08:31	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.7 2001/03/06 03:19:08 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/03/06 03:19:08 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.8 2001/03/23 05:08:31 remm Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/03/23 05:08:31 $
    *
    * ====================================================================
    *
  @@ -70,12 +70,12 @@
   import java.text.SimpleDateFormat;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
   import org.apache.slide.structure.*;
   import org.apache.slide.content.*;
   import org.apache.slide.security.*;
   import org.apache.slide.lock.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   
   /**
  
  
  
  1.6       +4 -4      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
  
  Index: UnlockMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UnlockMethod.java	2001/03/22 16:09:35	1.5
  +++ UnlockMethod.java	2001/03/23 05:08:32	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v 1.5 2001/03/22 16:09:35 juergen Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/03/22 16:09:35 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v 1.6 2001/03/23 05:08:32 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/03/23 05:08:32 $
    *
    * ====================================================================
    *
  @@ -68,8 +68,8 @@
   import java.util.*;
   import javax.servlet.*;
   import javax.servlet.http.*;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.lock.*;
  
  
  
  1.18      +4 -4      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- WebdavMethod.java	2001/03/22 17:34:55	1.17
  +++ WebdavMethod.java	2001/03/23 05:08:32	1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.17 2001/03/22 17:34:55 juergen Exp $
  - * $Revision: 1.17 $
  - * $Date: 2001/03/22 17:34:55 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.18 2001/03/23 05:08:32 remm Exp $
  + * $Revision: 1.18 $
  + * $Date: 2001/03/23 05:08:32 $
    *
    * ====================================================================
    *
  @@ -76,6 +76,7 @@
   import org.w3c.dom.*;
   import org.apache.util.URLUtil;
   import org.apache.util.MD5Encoder;
  +import org.apache.util.WebdavStatus;
   import org.apache.slide.common.*;
   import org.apache.slide.authenticate.*;
   import org.apache.slide.structure.*;
  @@ -83,7 +84,6 @@
   import org.apache.slide.lock.*;
   import org.apache.slide.macro.*;
   import org.apache.slide.security.*;
  -import org.apache.slide.webdav.common.*;
   import org.apache.slide.webdav.*;
   
   /**