You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2009/03/18 17:45:06 UTC
svn commit: r755640 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/
components/jetspeed-portal/src/mai...
Author: ate
Date: Wed Mar 18 16:45:06 2009
New Revision: 755640
URL: http://svn.apache.org/viewvc?rev=755640&view=rev
Log:
JS2-871: Upgrade Pluto container
See: http://issues.apache.org/jira/browse/JS2-871
- first cut implementation of all Action/Event Request/Response*Context done
- still need to 'merge' response private/public parameters, cacheLevel, resourceID, actionScopeID to the request NavigationState
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletActionResponseContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletMimeResponseContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletResponseContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletStateAwareResponseContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletActionResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletActionResponseContextImpl.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletActionResponseContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletActionResponseContextImpl.java Wed Mar 18 16:45:06 2009
@@ -17,6 +17,9 @@
package org.apache.jetspeed.container.impl;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -47,9 +50,28 @@
{
close();
if (!redirect || renderURLParamName != null)
- {
- // TODO
- return null;
+ {
+ if (redirect)
+ {
+ String portalURL = getPortalURL().getPortalURL();
+ if (redirectLocation.indexOf("://") != -1 && portalURL.indexOf("://")==-1)
+ {
+ portalURL = getPortalURL().getBaseURL() + portalURL;
+ }
+ try
+ {
+ return redirectLocation + "?" + URLEncoder.encode(renderURLParamName, "UTF-8") + "=" + URLEncoder.encode(portalURL, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ // Cannot happen: UTF-8 is a buildin/required encoder
+ return null;
+ }
+ }
+ else
+ {
+ return getPortalURL().getPortalURL();
+ }
}
else
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletMimeResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletMimeResponseContextImpl.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletMimeResponseContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletMimeResponseContextImpl.java Wed Mar 18 16:45:06 2009
@@ -29,10 +29,8 @@
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletMimeResponseContext;
import org.apache.pluto.container.PortletURLProvider;
-import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.container.providers.PortletURLProviderImpl;
-import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.container.PortletURLProvider.TYPE;
/**
@@ -206,11 +204,7 @@
{
if (!isClosed())
{
- RequestContext rc = (RequestContext) getServletRequest().getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
- return new PortletURLProviderImpl(rc, (org.apache.jetspeed.container.PortletWindow)getPortletWindow()
- //TODO
- //, type
- );
+ return new PortletURLProviderImpl(getPortalURL(), getPortletWindow(), type);
}
return null;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletResponseContextImpl.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletResponseContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletResponseContextImpl.java Wed Mar 18 16:45:06 2009
@@ -26,6 +26,8 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.PortletWindow;
import org.apache.jetspeed.container.providers.ResourceURLProviderImpl;
+import org.apache.jetspeed.container.url.PortalURL;
+import org.apache.jetspeed.request.JetspeedRequestContext;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.container.ResourceURLProvider;
import org.w3c.dom.Element;
@@ -44,6 +46,7 @@
private PortletWindow window;
private boolean closed;
private boolean released;
+ private PortalURL portalURL;
public PortletResponseContextImpl(PortletContainer container, HttpServletRequest containerRequest,
HttpServletResponse containerResponse, PortletWindow window)
@@ -52,7 +55,13 @@
this.containerRequest = containerRequest;
this.containerResponse = containerResponse;
this.window = window;
- //TODO
+ JetspeedRequestContext rc = (JetspeedRequestContext)containerRequest.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ portalURL = rc.getPortalURL();
+ }
+
+ protected PortalURL getPortalURL()
+ {
+ return portalURL;
}
protected boolean isClosed()
@@ -75,23 +84,27 @@
{
if (!isClosed())
{
- //TODO
+ containerResponse.addCookie(cookie);
+ // TODO: consider if these should be "transported" from ActionResponse to EventRequest?
}
}
public void addProperty(String key, Element element)
{
- //TODO
+ // default no-op, see PortletRenderResponseContextImpl for MARKUP_HEAD_ELEMENT support
}
public void addProperty(String key, String value)
{
- //TODO
+ if (!isClosed())
+ {
+ containerResponse.addHeader(key, value);
+ // TODO: consider if these should be "transported" from ActionResponse to EventRequest?
+ }
}
public void close()
{
- //TODO
closed = true;
}
@@ -133,12 +146,15 @@
servletRequest = null;
servletResponse = null;
window = null;
- //TODO?
}
public void setProperty(String key, String value)
{
- //TODO
+ if (!isClosed())
+ {
+ containerResponse.setHeader(key, value);
+ // TODO: consider if these should be "transported" from ActionResponse to EventRequest?
+ }
}
public ResourceURLProvider getResourceURLProvider()
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletStateAwareResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletStateAwareResponseContextImpl.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletStateAwareResponseContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletStateAwareResponseContextImpl.java Wed Mar 18 16:45:06 2009
@@ -30,8 +30,13 @@
import org.apache.pluto.container.EventProvider;
import org.apache.pluto.container.PortletContainer;
import org.apache.pluto.container.PortletStateAwareResponseContext;
+import org.apache.pluto.container.PortletURLProvider;
+import org.apache.pluto.container.impl.PortletURLImpl;
+import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.container.providers.PortletURLProviderImpl;
import org.apache.jetspeed.events.JetspeedEventCoordinationService;
+import org.apache.jetspeed.request.JetspeedRequestContext;
/**
* @version $Id$
@@ -41,11 +46,14 @@
PortletStateAwareResponseContext
{
private List<Event> events;
+ private PortletURLProvider portletURLProvider;
public PortletStateAwareResponseContextImpl(PortletContainer container, HttpServletRequest containerRequest,
HttpServletResponse containerResponse, PortletWindow window)
{
super(container, containerRequest, containerResponse, window);
+ JetspeedRequestContext rc = (JetspeedRequestContext)containerRequest.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ this.portletURLProvider = new PortletURLProviderImpl(rc.getPortalURL(), window, PortletURLProvider.TYPE.RENDER);
}
@Override
@@ -54,7 +62,8 @@
if (!isClosed())
{
super.close();
- // TODO
+ new PortletURLImpl(this, portletURLProvider).filterURL();
+
}
}
@@ -62,7 +71,7 @@
public void release()
{
events = null;
- // TODO
+ portletURLProvider = null;
super.release();
}
@@ -81,29 +90,29 @@
public PortletMode getPortletMode()
{
- return isClosed() ? null : null; //TODO
+ return isClosed() ? null : portletURLProvider.getPortletMode();
}
public Map<String, String[]> getPublicRenderParameters()
{
- return isClosed() ? null : null; //TODO
+ return isClosed() ? null : portletURLProvider.getPublicRenderParameters();
}
public Map<String, String[]> getRenderParameters()
{
- return isClosed() ? null : null; //TODO
+ return isClosed() ? null : portletURLProvider.getRenderParameters();
}
public WindowState getWindowState()
{
- return isClosed() ? null : null; //TODO
+ return isClosed() ? null : portletURLProvider.getWindowState();
}
public void setPortletMode(PortletMode portletMode)
{
if (!isClosed())
{
- //TODO
+ portletURLProvider.setPortletMode(portletMode);
}
}
@@ -111,7 +120,7 @@
{
if (!isClosed())
{
- //TODO
+ portletURLProvider.setWindowState(windowState);
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java Wed Mar 18 16:45:06 2009
@@ -24,12 +24,12 @@
import javax.portlet.PortletMode;
import javax.portlet.PortletSecurityException;
+import javax.portlet.ResourceURL;
import javax.portlet.WindowState;
-import javax.servlet.http.HttpServletRequest;
import org.apache.jetspeed.container.PortletWindow;
+import org.apache.jetspeed.container.state.MutableNavigationalState;
import org.apache.jetspeed.container.url.PortalURL;
-import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.container.PortletURLProvider;
/**
@@ -41,187 +41,184 @@
*/
public class PortletURLProviderImpl implements PortletURLProvider
{
- private PortalURL.URLType urlType = PortalURL.URLType.RENDER;
- private PortletWindow portletWindow = null;
- private PortletMode mode = null;
- private WindowState state = null;
- private boolean secure = false;
- private Map<String, String[]> privateParameters = null;
- private Map<String, String[]> publicParameters = null;
- private Map<String, String[]> requestParameters = null;
+ private PortletWindow portletWindow;
+ private TYPE type;
+ private boolean secure;
+ private PortletMode portletMode;
+ private WindowState windowState;
+ private String cacheLevel;
+ private String resourceID;
+ private Map<String, String[]> renderParameters;
+ private Map<String, String[]> publicRenderParameters;
+ private Map<String, List<String>> properties;
private PortalURL url;
- public PortletURLProviderImpl(RequestContext context, PortletWindow portletWindow)
+ public PortletURLProviderImpl(PortalURL url, PortletWindow portletWindow, TYPE type)
{
+ this.url = url;
this.portletWindow = portletWindow;
-
- url = context.getPortalURL();
- privateParameters = url.getNavigationalState().getParameterMap(portletWindow);
- }
-
- public void setPortletMode(PortletMode mode)
- {
- this.mode = mode;
+ this.type = type;
}
- public void setWindowState(WindowState state)
- {
- this.state = state;
- }
-
- public void setSecure()
- {
- secure = true;
- }
-
- public void clearParameters()
- {
- // TODO: old comment "not used, handled by JetspeedNavigationalStateCodec itself" ???
- privateParameters = null;
- }
-
- public String toString()
+ public TYPE getType()
{
- // TODO: handle publicParameters, resource url, resourceID, cacheability (last two needs to be added to the PortletURLPRovider interface)
- return url.createPortletURL(portletWindow,privateParameters,mode,state,urlType,secure);
+ return type;
}
- public void setParameters(Map parameters)
- {
- this.privateParameters = parameters;
- }
-
- public String[] getPrivateRenderParameters(String name)
- {
- return privateParameters != null ? privateParameters.get(name) : null;
- }
-
- public String[] getPublicRenderParameters(String name)
- {
- // TODO
- return null;
- }
-
- public boolean isResourceServing()
- {
- return PortalURL.URLType.RESOURCE.equals(urlType);
- }
-
- public boolean isSecureSupported()
- {
- // TODO: review logic in Pluto PortletURLProviderImpl and PortletContainerImpl usage of this method (seems wrong...).
- return false;
- }
-
- public void savePortalURL(HttpServletRequest request)
+ public void setPortletMode(PortletMode mode)
{
- // TODO: what should be done here?
+ this.portletMode = mode;
}
-
- public void setAction(boolean isAction)
+
+ public PortletMode getPortletMode()
{
- urlType = isAction ? PortalURL.URLType.ACTION : PortalURL.URLType.RENDER;
+ return portletMode;
}
- public void setPublicRenderParameters(Map parameters)
+ public void setWindowState(WindowState state)
{
- // TODO
+ this.windowState = state;
}
- public void setResourceServing(boolean isResourceServing)
+ public WindowState getWindowState()
{
- urlType = isResourceServing ? PortalURL.URLType.RESOURCE : PortalURL.URLType.RENDER;
+ return windowState;
}
- public Map<String, String[]> getRenderParameters()
- {
- return this.requestParameters;
+ public void setSecure(boolean secure) throws PortletSecurityException {
+ this.secure = secure;
}
-
- public Map<String, String[]> parseRenderParameters(Map<String, String[]> parentMap, String queryString)
+
+ public boolean isSecure()
{
- return this.requestParameters = parentMap;
+ return secure;
}
-
- public Map<String, List<String>> getProperties()
+
+ public Map<String,String[]> getRenderParameters()
{
- return null;
+ if (renderParameters == null)
+ {
+ renderParameters = new HashMap<String,String[]>();
+ }
+ return renderParameters;
}
-
- public void setProperties(Map<String, List<String>> properties)
+
+ public Map<String,String[]> getPublicRenderParameters()
{
+ if (publicRenderParameters == null)
+ {
+ publicRenderParameters = new HashMap<String,String[]>();
+ }
+ return publicRenderParameters;
}
-
+
public String getCacheability()
{
- // TODO Auto-generated method stub
- return null;
- }
-
- public PortletMode getPortletMode()
- {
- // TODO Auto-generated method stub
- return null;
+ return cacheLevel;
}
- public Map<String, String[]> getPublicRenderParameters()
+ public void setCacheability(String cacheLevel)
{
- // TODO Auto-generated method stub
- return null;
+ this.cacheLevel = cacheLevel;
}
public String getResourceID()
{
- // TODO Auto-generated method stub
- return null;
+ return resourceID;
}
- public TYPE getType()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public WindowState getWindowState()
+ public void setResourceID(String resourceID)
{
- // TODO Auto-generated method stub
- return null;
+ this.resourceID = resourceID;
}
-
- public boolean isSecure()
+
+ public void apply()
{
- // TODO Auto-generated method stub
- return false;
+ apply(false);
}
- public void setCacheability(String cacheLevel)
+ public String toURL()
{
- // TODO Auto-generated method stub
-
+ return apply(true);
}
-
- public void setResourceID(String resourceID)
+
+ private String apply(boolean toURL)
{
- // TODO Auto-generated method stub
+ PortalURL.URLType urlType;
+ Map<String, String[]> privateRenderParms = null;
+ Map<String, String[]> renderParms = new HashMap<String, String[]>();
+ Map<String, String[]> publicRenderParms = new HashMap<String, String[]>();
+ if (TYPE.ACTION == type)
+ {
+ urlType = PortalURL.URLType.ACTION;
+ }
+ else if (TYPE.RENDER == type)
+ {
+ urlType = PortalURL.URLType.RENDER;
+ }
+ else
+ {
+ urlType = PortalURL.URLType.RESOURCE;
+ if (!ResourceURL.FULL.equals(cacheLevel))
+ {
+ privateRenderParms = url.getNavigationalState().getParameterMap(portletWindow);
+ }
+ }
+ if (renderParameters != null)
+ {
+ for (Map.Entry<String,String[]> entry : renderParameters.entrySet())
+ {
+ if (publicRenderParameters == null || !publicRenderParameters.containsKey(entry.getKey()))
+ {
+ renderParms.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ if (publicRenderParameters != null)
+ {
+ for (Map.Entry<String,String[]> entry : publicRenderParameters.entrySet())
+ {
+ publicRenderParms.put(entry.getKey(), entry.getValue() != null ? entry.getValue() : new String[]{null});
+ }
+ }
+ if (toURL)
+ {
+ // TODO: handle public and private render parameters, resourceID, cacheLevel, actionScopeID
+ return url.createPortletURL(portletWindow,renderParms,portletMode,windowState,urlType,secure);
+ }
+ else
+ {
+ MutableNavigationalState navState = (MutableNavigationalState)url.getNavigationalState();
+ navState.setMode(portletWindow, portletMode);
+ navState.setState(portletWindow, windowState);
+ navState.setParametersMap(portletWindow, renderParms);
+ // TODO: privateRenderParms, publicRenderParms, resourceID, cacheLevel, actionScopeID
+ return null;
+ }
}
- public void setSecure(boolean secure) throws PortletSecurityException
+ public void write(Writer out, boolean escapeXML) throws IOException
{
- // TODO Auto-generated method stub
-
+ String result = toURL();
+ if (escapeXML)
+ {
+ result = result.replaceAll("&", "&");
+ result = result.replaceAll("<", "<");
+ result = result.replaceAll(">", ">");
+ result = result.replaceAll("\'", "'");
+ result = result.replaceAll("\"", """);
+ }
+ out.write(result);
}
- public String toURL(boolean absolute)
+ public Map<String, List<String>> getProperties()
{
- // TODO Auto-generated method stub
- return null;
+ if (properties == null)
+ {
+ properties = new HashMap<String, List<String>>();
+ }
+ return properties;
}
-
- public void write(Writer out, boolean escapeXML) throws IOException
- {
- // TODO Auto-generated method stub
-
- }
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java Wed Mar 18 16:45:06 2009
@@ -369,4 +369,10 @@
{
requestStates.removePortletWindowNavigationalState(window.getId().toString());
}
+
+ public void setParametersMap(PortletWindow window, Map<String, String[]> parametersMap)
+ {
+ PortletWindowRequestNavigationalState state = requestStates.getPortletWindowNavigationalState(window.getId().toString());
+ state.setParametersMap(parametersMap);
+ }
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java?rev=755640&r1=755639&r2=755640&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/state/MutableNavigationalState.java Wed Mar 18 16:45:06 2009
@@ -16,6 +16,8 @@
*/
package org.apache.jetspeed.container.state;
+import java.util.Map;
+
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
@@ -78,4 +80,6 @@
* Remove state for the given (possibly invalid) portlet window
*/
void removeState(PortletWindow window);
+
+ void setParametersMap(PortletWindow window, Map<String, String[]> parametersMap);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org