cvs commit: jahia/metadata/war web.xml jahia/src/java/org/apache/slide/webdav JahiaWebdavServlet.java

[Serge Huber]

shuber      2005/10/13 11:35:18 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    metadata/war         web.xml 
    src/java/org/apache/slide/webdav JahiaWebdavServlet.java 
  Log:
  Fix initialization problem of WebDAV servlet.
  
  Revision       Changes    Path
  1.41.2.3.2.12  +0 -2      jahia/metadata/war/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/war/web.xml.diff?r1=1.41.2.3.2.11&r2=1.41.2.3.2.12&f=h
  1.6.4.1.2.7    +4 -8      
jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java.diff?r1=1.6.4.1.2.6&r2=1.6.4.1.2.7&f=h
  
  
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/repository/jahia/metadata/war/Attic/web.xml,v
  retrieving revision 1.41.2.3.2.11
  retrieving revision 1.41.2.3.2.12
  diff -u -r1.41.2.3.2.11 -r1.41.2.3.2.12
  --- web.xml   13 Oct 2005 08:55:55 -0000      1.41.2.3.2.11
  +++ web.xml   13 Oct 2005 09:35:17 -0000      1.41.2.3.2.12
  @@ -261,7 +261,6 @@
         <param-name>debug</param-name>
         <param-value>999</param-value>
       </init-param>
  -    <load-on-startup>100</load-on-startup>
     </servlet>
   
     <servlet>
  @@ -329,7 +328,6 @@
         <param-name>debug</param-name>
         <param-value>999</param-value>
       </init-param>
  -    <load-on-startup>100</load-on-startup>
     </servlet>
   
     <!-- XMLRPCServlet for the blogs -->
  
  
  
  Index: JahiaWebdavServlet.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
  retrieving revision 1.6.4.1.2.6
  retrieving revision 1.6.4.1.2.7
  diff -u -r1.6.4.1.2.6 -r1.6.4.1.2.7
  --- JahiaWebdavServlet.java   13 Oct 2005 08:55:55 -0000      1.6.4.1.2.6
  +++ JahiaWebdavServlet.java   13 Oct 2005 09:35:17 -0000      1.6.4.1.2.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
 1.6.4.1.2.6 2005/10/13 08:55:55 shuber Exp $
  - * $Revision: 1.6.4.1.2.6 $
  - * $Date: 2005/10/13 08:55:55 $
  + * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
 1.6.4.1.2.7 2005/10/13 09:35:17 shuber Exp $
  + * $Revision: 1.6.4.1.2.7 $
  + * $Date: 2005/10/13 09:35:17 $
    *
    * ====================================================================
    *
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
    * @author Dirk Verbeeck
    * @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
  - * @version $Revision: 1.6.4.1.2.6 $
  + * @version $Revision: 1.6.4.1.2.7 $
    */
   public class JahiaWebdavServlet
       extends HttpServlet {
  @@ -199,10 +199,6 @@
       public void init(ServletConfig config)
           throws ServletException {
   
  -        if (Jahia.getSettings() == null) {
  -            // Jahia has not yet been installed, we quit here.
  -            return;
  -        }
           JahiaWebdavServletConfig webdavServletConfig = new 
JahiaWebdavServletConfig(config);
           
webdavServletConfig.setTransformDirnames(Jahia.getSettings().isTransformDirnames());
           
webdavServletConfig.setTransformFilenames(Jahia.getSettings().isTransformFilenames());