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

ALF-1995: Removed remaining direct dependencies on portlet API from Alfresco Explorer classes

Browse Source 
- Moved into AlfrescoFacesPortlet
- portlet.jar was removed from alfresco.war for Liferay compatibility

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-03-09 14:34:39 +00:00
parent d3bd0ff2f0
commit 893cc14f16
5 changed files with 168 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
View File

@@ -20,17 +20,15 @@ package org.alfresco.web.ui.repo.tag;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
import java.util.ResourceBundle;
import javax.portlet.PortletSession;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.portlet.AlfrescoFacesPortlet;
import org.alfresco.web.app.servlet.ExternalAccessServlet;
import org.alfresco.web.bean.ErrorBean;
@@ -113,12 +111,9 @@ public class SystemErrorTag extends TagSupport
// get the error details from the bean, this may be in a portlet
// session or a normal servlet session.
ErrorBean errorBean = null;
RenderRequest renderReq = (RenderRequest)pageContext.getRequest().
getAttribute("javax.portlet.request");
if (renderReq != null)
if (Application.inPortalServer())
{
PortletSession session = renderReq.getPortletSession();
errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME);
errorBean = AlfrescoFacesPortlet.getErrorBean(pageContext.getRequest());
}
else
{
@@ -222,17 +217,13 @@ public class SystemErrorTag extends TagSupport
if (Application.inPortalServer())
{
RenderResponse renderResp = (RenderResponse)pageContext.getRequest().getAttribute(
"javax.portlet.response");
if (renderResp == null)
{
throw new IllegalStateException("RenderResponse object is null");
}
PortletURL url = renderResp.createRenderURL();
// NOTE: we don't have to specify the page for the portlet, just the VIEW_ID parameter
// being present will cause the current JSF view to be re-displayed
url.setParameter("org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID", "current-view");
String url = AlfrescoFacesPortlet.getRenderURL(pageContext.getRequest(), Collections.singletonMap(
"org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID", new String[]
{
"current-view"
}));
out.write(url.toString());
}
else

11
source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
View File

@@ -21,12 +21,12 @@ package org.alfresco.web.ui.repo.tag;
import java.io.IOException;
import java.io.Writer;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.portlet.AlfrescoFacesPortlet;
import org.alfresco.web.app.servlet.BaseServlet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,14 +56,7 @@ public class UploadFormTag extends TagSupport
if (Application.inPortalServer())
{
RenderResponse renderResp = (RenderResponse)pageContext.getRequest().
getAttribute("javax.portlet.response");
if (renderResp == null)
{
throw new IllegalStateException("RenderResponse object is null. The web application is not executing within a portal server!");
}
out.write(renderResp.createActionURL().toString());
out.write(AlfrescoFacesPortlet.getActionURL(pageContext.getRequest()));
out.write("'>");
}
else