inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

. Fix for AWC-472

Browse Source 
- External access URL bug fix for browsing to spaces when the client is already open (for CIFS usage)
. Refactoring of ServletHelper methods into a BaseServlet class

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-02-06 14:42:39 +00:00
parent 0b9ddda3ca
commit ce283a2f01
9 changed files with 98 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.StringTokenizer;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -68,7 +67,7 @@ import org.apache.commons.logging.LogFactory;
*
* @author Kevin Roast
*/
public class TemplateContentServlet extends HttpServlet
public class TemplateContentServlet extends BaseServlet
{
private static final String MIMETYPE_HTML = "text/html";
@@ -94,7 +93,7 @@ public class TemplateContentServlet extends HttpServlet
if (logger.isDebugEnabled())
logger.debug("Processing URL: " + uri + (req.getQueryString() != null ? ("?" + req.getQueryString()) : ""));
AuthenticationStatus status = ServletHelper.servletAuthenticate(req, res, getServletContext());
AuthenticationStatus status = servletAuthenticate(req, res);
if (status == AuthenticationStatus.Failure)
{
return;
@@ -123,7 +122,7 @@ public class TemplateContentServlet extends HttpServlet
}
// get the services we need to retrieve the content
ServiceRegistry serviceRegistry = ServletHelper.getServiceRegistry(getServletContext());
ServiceRegistry serviceRegistry = getServiceRegistry(getServletContext());
NodeService nodeService = serviceRegistry.getNodeService();
TemplateService templateService = serviceRegistry.getTemplateService();
PermissionService permissionService = serviceRegistry.getPermissionService();
@@ -132,7 +131,7 @@ public class TemplateContentServlet extends HttpServlet
if (permissionService.hasPermission(nodeRef, PermissionService.READ) == AccessStatus.DENIED ||
(templateRef != null && permissionService.hasPermission(templateRef, PermissionService.READ) == AccessStatus.DENIED))
{
ServletHelper.redirectToLoginPage(req, res, getServletContext());
redirectToLoginPage(req, res);
return;
}