shuber 2005/06/01 14:05:11 CEST
Modified files:
core/src/java/org/apache/slide/webdav JahiaWebdavServlet.java
core/src/java/org/jahia/bin JahiaWebAppListener.java
core/src/webapp/WEB-INF web.xml
Log:
Improved initial startup before configuration, to eliminate all the errors
that were due to service trying to start when Jahia hadn't yet been configured.
Revision Changes Path
1.5 +8 -4
jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java.diff?r1=1.4&r2=1.5&f=h
1.3 +4 -0
jahia/core/src/java/org/jahia/bin/JahiaWebAppListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaWebAppListener.java.diff?r1=1.2&r2=1.3&f=h
1.13 +0 -14 jahia/core/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/web.xml.diff?r1=1.12&r2=1.13&f=h
Index: JahiaWebdavServlet.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaWebdavServlet.java 11 Nov 2004 15:56:11 -0000 1.4
+++ JahiaWebdavServlet.java 1 Jun 2005 12:05:10 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
1.4 2004/11/11 15:56:11 tdraier Exp $
- * $Revision: 1.4 $
- * $Date: 2004/11/11 15:56:11 $
+ * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
1.5 2005/06/01 12:05:10 shuber Exp $
+ * $Revision: 1.5 $
+ * $Date: 2005/06/01 12:05:10 $
*
* ====================================================================
*
@@ -67,7 +67,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.4 $
+ * @version $Revision: 1.5 $
*/
public class JahiaWebdavServlet
extends HttpServlet {
@@ -199,6 +199,10 @@
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());
Index: JahiaWebAppListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaWebAppListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaWebAppListener.java 8 Jul 2004 14:03:34 -0000 1.2
+++ JahiaWebAppListener.java 1 Jun 2005 12:05:11 -0000 1.3
@@ -42,6 +42,10 @@
public void sessionDestroyed (HttpSessionEvent se) {
logger.debug("Session " + se.getSession().getId() +
" was just destroyed... purging session related data...
");
+ if (Jahia.getSettings() == null) {
+ // Jahia was not yet installed, let's exit now.
+ return;
+ }
ServicesRegistry servReg = ServicesRegistry.getInstance();
if (servReg != null) {
ServletDispatchingProvider.getInstance().flushAllSessionsCaches(se.
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web.xml 17 May 2005 12:41:38 -0000 1.12
+++ web.xml 1 Jun 2005 12:05:11 -0000 1.13
@@ -160,20 +160,6 @@
<load-on-startup>5</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>TilesServet</servlet-name>
- <servlet-class>org.apache.struts.tiles.TilesServlet</servlet-class>
- <init-param>
- <param-name>definitions-config</param-name>
- <param-value>/WEB-INF/etc/struts/jahia-tiles-defs.xml</param-value>
- </init-param>
- <init-param>
- <param-name>definitions-parser-validate</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>6</load-on-startup>
- </servlet>
-
<servlet>
<servlet-name>
Jahia
