pnever      2003/08/17 23:58:06

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        LockMethod.java
  Log:
  Make use of constant S_LOCK_TOKEN
  
  Revision  Changes    Path
  1.48      +25 -24    
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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- LockMethod.java   5 Aug 2003 09:06:53 -0000       1.47
  +++ LockMethod.java   18 Aug 2003 06:58:06 -0000      1.48
  @@ -63,31 +63,31 @@
   
   package org.apache.slide.webdav.method;
   
  -import java.security.Principal;
  -import java.io.*;
  -import java.util.*;
  -import javax.servlet.*;
  -import javax.servlet.http.*;
  -
  -import org.apache.util.PropertyWriter;
  -import org.apache.util.WebdavStatus;
  -import org.apache.slide.common.*;
  -import org.apache.slide.webdav.*;
  -import org.apache.slide.macro.*;
  -import org.apache.slide.lock.*;
  -import org.apache.slide.content.*;
  +import java.io.IOException;
  +import java.io.StringWriter;
  +import java.io.Writer;
  +import java.util.Date;
  +import java.util.Enumeration;
  +import java.util.Iterator;
  +import java.util.List;
  +import org.apache.slide.common.NamespaceAccessToken;
  +import org.apache.slide.common.NamespaceConfig;
  +import org.apache.slide.common.SlideException;
   import org.apache.slide.content.NodeProperty.NamespaceCache;
  -import org.apache.slide.security.AccessDeniedException;
  -import org.apache.slide.structure.*;
  -
  +import org.apache.slide.content.NodeRevisionDescriptor;
  +import org.apache.slide.lock.NodeLock;
  +import org.apache.slide.lock.ObjectIsAlreadyLockedException;
  +import org.apache.slide.structure.ObjectNotFoundException;
  +import org.apache.slide.structure.SubjectNode;
  +import org.apache.slide.webdav.WebdavException;
  +import org.apache.slide.webdav.WebdavServletConfig;
   import org.apache.slide.webdav.util.AclConstants;
   import org.apache.slide.webdav.util.PropertyHelper;
  +import org.apache.slide.webdav.util.WebdavConstants;
   import org.apache.slide.webdav.util.XMLValue;
  -
  -import org.jdom.Document;
  +import org.apache.util.WebdavStatus;
   import org.jdom.Element;
   import org.jdom.JDOMException;
  -
   import org.jdom.output.XMLOutputter;
   
   /**
  @@ -95,7 +95,8 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
    */
  -public class LockMethod extends AbstractMultistatusResponseMethod {
  +public class LockMethod extends AbstractMultistatusResponseMethod
  +    implements WebdavConstants {
   
   
       // -------------------------------------------------------------- Constants
  @@ -560,7 +561,7 @@
                   // a result of a successful LOCK request to create a new
                   // lock."
                   resp.setHeader("Lock-Token",
  -                               "<opaquelocktoken:"+lockToken.getLockId()+">");
  +                               "<"+S_LOCK_TOKEN+lockToken.getLockId()+">");
   
                       resp.setStatus(WebdavStatus.SC_OK);
   
  
  
  

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

Reply via email to