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

[remm]

remm        01/09/08 13:05:11

  Modified:    src/webdav/server/org/apache/slide/webdav WebdavServlet.java
  Log:
  - Lookup the NAT in the servlet context first.
  
  Revision  Changes    Path
  1.27      +20 -4     
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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- WebdavServlet.java        2001/09/07 16:13:45     1.26
  +++ WebdavServlet.java        2001/09/08 20:05:11     1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 
1.26 2001/09/07 16:13:45 juergen Exp $
  - * $Revision: 1.26 $
  - * $Date: 2001/09/07 16:13:45 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 
1.27 2001/09/08 20:05:11 remm Exp $
  + * $Revision: 1.27 $
  + * $Date: 2001/09/08 20:05:11 $
    *
    * ====================================================================
    *
  @@ -109,7 +109,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
    * @author Dirk Verbeeck
  - * @version $Revision: 1.26 $
  + * @version $Revision: 1.27 $
    */
   public class WebdavServlet extends HttpServlet {
       
  @@ -118,6 +118,7 @@
       
       private static final String LOG_CHANNEL = WebdavServlet.class.getName();
       
  +    
       /**
        * HTTP Date format pattern (RFC 2068, 822, 1123).
        */
  @@ -131,6 +132,10 @@
           new SimpleDateFormat(DATE_FORMAT);
       
       
  +    public static final String ATTRIBUTE_NAME = 
  +        "org.apache.slide.NamespaceAccessToken";
  +    
  +    
       // ----------------------------------------------------- Instance Variables
       
       
  @@ -339,6 +344,17 @@
               log("======================================================");
               throw new ServletException("Invalid XML parser");
           }
  +        
  +        // Lookup for the NAT using JNDI
  +        // FIXME
  +
  +        // Lookup for the NAT using the servlet context
  +        token = (NamespaceAccessToken) 
  +            getServletContext().getAttribute(ATTRIBUTE_NAME);
  +        if (token != null)
  +            return;
  +        
  +        // Dafault initialization
           
           String namespaceName = null;
           String domainConfigFile = null;