Author: thomas.heute(a)jboss.com Date: 2008-06-18 09:48:19 -0400 (Wed, 18 Jun 2008) New Revision: 11079 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java Log: Portlet 2.0 adaptation Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-06-18 13:21:20 UTC (rev 11078) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-06-18 13:48:19 UTC (rev 11079) @@ -25,6 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.info.CommandInfo; @@ -40,6 +41,7 @@ import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.PortalLayout; @@ -47,11 +49,15 @@ import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; +import org.w3c.dom.Element; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; +import javax.portlet.MimeResponse; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -84,12 +90,24 @@ String header = ""; if (response instanceof FragmentResponse) { - throw new NotYetImplemented("On the TODO List"); - /* FragmentResponse fragment = (FragmentResponse)response; content = fragment.getContent(); - header = fragment.getHeader(); - */ + ResponseProperties properties = fragment.getProperties(); + if (properties != null) + { + // header handling + MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders(); + List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); + if (headElements != null) + { + StringBuffer buffer = new StringBuffer(124 * headElements.size()); + for (Element element : headElements) + { + buffer.append(element); + } + header = buffer.toString(); + } + } } else if (response instanceof ErrorResponse) { Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-18 13:21:20 UTC (rev 11078) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-18 13:48:19 UTC (rev 11079) @@ -125,6 +125,8 @@ { if (interactionState instanceof ParametersStateString) { + // We don't encode navigational state in portlet URL we can interpret as we store the nav state in the portal session + /** if (navigationalState != null) { throw new IllegalArgumentException("Cannot handle case with both non opaque interaction and navigational state"); @@ -133,6 +135,7 @@ // Add the parameters Map<String, String[]> parameters = ((ParametersStateString)interactionState).getParameters(); configure(parameters); + */ } else {