diff --git a/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java index 32ecfa8889..8d371a74f0 100644 --- a/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java +++ b/source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java @@ -18,7 +18,7 @@ * As a special exception to the terms and conditions of version 2.0 of * the GPL, you may redistribute this Program in connection with Free/Libre * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing + * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" */ @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -79,13 +80,13 @@ public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilt /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseKerberosAuthenticationFilter#afterPropertiesSet() + * @see org.alfresco.repo.webdav.auth.BaseKerberosAuthenticationFilter#init() */ @Override - public void afterPropertiesSet() throws Exception + protected void init() throws ServletException { // Call the base Kerberos filter initialization - super.afterPropertiesSet(); + super.init(); // Get a list of the available locales LanguagesConfigElement config = (LanguagesConfigElement) m_configService.getConfig("Languages") diff --git a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java index 697e5b5030..f102bc97b0 100644 --- a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java +++ b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2007 Alfresco Software Limited. + * Copyright (C) 2005-2009 Alfresco Software Limited. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,7 +18,7 @@ * As a special exception to the terms and conditions of version 2.0 of * the GPL, you may redistribute this Program in connection with Free/Libre * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing + * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" */ @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -40,7 +41,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.User; import org.alfresco.web.config.ClientConfigElement; -import org.alfresco.web.config.LanguagesConfigElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,18 +71,15 @@ public class NTLMAuthenticationFilter extends BaseNTLMAuthenticationFilter m_configService = configService; } + /* (non-Javadoc) - * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#afterPropertiesSet() - */ - @Override - public void afterPropertiesSet() throws Exception + * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#init() + */ + @Override + protected void init() throws ServletException { // Call the base NTLM filter initialization - super.afterPropertiesSet(); - - // Get a list of the available locales - LanguagesConfigElement config = (LanguagesConfigElement) m_configService.getConfig("Languages") - .getConfigElement(LanguagesConfigElement.CONFIG_ELEMENT_ID); + super.init(); m_languages = config.getLanguages(); ClientConfigElement clientConfig = (ClientConfigElement) m_configService.getGlobalConfig().getConfigElement(