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

[remm]

remm        01/06/12 21:33:28

  Modified:    src/webdav/server/org/apache/slide/webdav WebdavServlet.java
  Log:
  - Changed the way the namespace name is retrieved when initializing the
    servlet. Now, the context name will also be used.
  
  Revision  Changes    Path
  1.14      +18 -9     
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebdavServlet.java        2001/05/08 22:23:25     1.13
  +++ WebdavServlet.java        2001/06/13 04:33:27     1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 
1.13 2001/05/08 22:23:25 remm Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/05/08 22:23:25 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 
1.14 2001/06/13 04:33:27 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/06/13 04:33:27 $
    *
    * ====================================================================
    *
  @@ -190,8 +190,6 @@
           
           long startTime = System.currentTimeMillis();
           
  -        
  -        
           //  if logging for the request/response is required initialise the facades
           if 
(Domain.isEnabled("org.apache.slide.webdav.WebdavServlet.requestResponseLogger", 
Logger.DEBUG)) {
               if ( req != null )  req  = new XHttpServletRequestFacade(req);
  @@ -200,6 +198,16 @@
           
           resp.setStatus(WebdavStatus.SC_OK);
           
  +        if (token == null) {
  +            String namespaceName = req.getContextPath();
  +            if (namespaceName == null)
  +                namespaceName = "webdav";
  +            while (namespaceName.startsWith("/"))
  +                namespaceName = namespaceName.substring(1);
  +            token = Domain.accessNamespace
  +                (new SecurityToken(this), namespaceName);
  +        }
  +        
           WebdavMethod method = null;
           
           try {
  @@ -250,7 +258,7 @@
       public void init()
           throws ServletException {
           
  -        String namespaceName = "webdav";
  +        String namespaceName = null;
           String domainConfigFile = "/Domain.xml";
           String managerServletPath = "/manager/";
           int depthLimit = 3;
  @@ -297,9 +305,10 @@
               throw new ServletException(t.getMessage());
           }
           
  -        
  -        
  -        token = Domain.accessNamespace(new SecurityToken(this), namespaceName);
  +        if (namespaceName != null) {
  +            token = Domain.accessNamespace
  +                (new SecurityToken(this), namespaceName);
  +        }
           
       }