Author: julien(a)jboss.com Date: 2008-01-25 07:53:59 -0500 (Fri, 25 Jan 2008) New Revision: 9605 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml Log: fix portlet caching test case Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -333,4 +333,23 @@ { return "StateString[" + parameters + "]"; } + + public boolean equals(Object obj) + { + if (obj == this) + { + return true; + } + if (obj instanceof ParametersStateString) + { + ParametersStateString that = (ParametersStateString)obj; + return parameters.equals(that.parameters); + } + return false; + } + + public int hashCode() + { + return parameters.hashCode(); + } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -33,6 +33,7 @@ import org.jboss.portal.portlet.invocation.ResourceInvocation; 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.portlet.container.PortletContainerInvoker; import org.jboss.portal.portlet.container.PortletContainer; import org.apache.log4j.Logger; @@ -83,7 +84,14 @@ fragmentResult.setExpirationSecs(cacheInfo.getExpirationSecs()); // Override with value provided by portlet if any - String portletValue = (String)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, "portlet.expiration-cache"); + String portletValue = null; + ResponseProperties props = fragmentResult.getProperties(); + if (props != null) + { + portletValue = props.getTransportHeaders().getValue("portlet.expiration-cache"); + } + + // if (portletValue != null) { try Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -86,7 +86,7 @@ } // - getProperties().getTransportHeaders().addProperty(key, value); + getProperties().getTransportHeaders().addValue(key, value); } public void setProperty(String key, String value) throws IllegalArgumentException @@ -101,7 +101,7 @@ } // - getProperties().getTransportHeaders().setProperty(key, value); + getProperties().getTransportHeaders().setValue(key, value); } public void addProperty(Cookie cookie) @@ -111,7 +111,7 @@ public void addProperty(String key, Element element) { - getProperties().getMarkupHeaders().addProperty(key, element); + getProperties().getMarkupHeaders().addValue(key, element); } public Element createElement(String tagName) throws DOMException Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -23,15 +23,12 @@ package org.jboss.portal.portlet.invocation.response; import org.jboss.portal.common.util.MultiValuedPropertyMap; +import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; import org.w3c.dom.Element; import javax.servlet.http.Cookie; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.LinkedList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -41,13 +38,13 @@ { /** . */ - private MultiValuedPropertyMap<String> transportHeaders; + private MultiValuedPropertyMap<String> transportHeaders = new SimpleMultiValuedPropertyMap<String>(); /** . */ - private MultiValuedPropertyMap<Element> markupHeaders; + private MultiValuedPropertyMap<Element> markupHeaders = new SimpleMultiValuedPropertyMap<Element>(); /** . */ - private List<Cookie> cookies; + private List<Cookie> cookies = new LinkedList<Cookie>(); public ResponseProperties() { @@ -55,43 +52,16 @@ public MultiValuedPropertyMap<String> getTransportHeaders() { - return getTransportHeaders(true); - } - - public MultiValuedPropertyMap<String> getTransportHeaders(boolean create) - { - if (transportHeaders == null && create) - { - transportHeaders = new MultiValuedPropertyMap<String>(); - } return transportHeaders; } public MultiValuedPropertyMap<Element> getMarkupHeaders() { - return getMarkupHeaders(true); - } - - public MultiValuedPropertyMap<Element> getMarkupHeaders(boolean create) - { - if (markupHeaders == null && create) - { - markupHeaders = new MultiValuedPropertyMap<Element>(); - } return markupHeaders; } public List<Cookie> getCookies() { - return getCookies(true); - } - - public List<Cookie> getCookies(boolean create) - { - if (cookies == null && create) - { - cookies = new ArrayList<Cookie>(); - } return cookies; } @@ -101,17 +71,10 @@ { throw new IllegalArgumentException(); } - if (appended.transportHeaders != null) - { - getTransportHeaders().append(appended.transportHeaders); - } - if (appended.markupHeaders != null) - { - getMarkupHeaders().append(appended.markupHeaders); - } - if (appended.cookies != null) - { - getCookies().addAll(appended.cookies); - } + + // + transportHeaders.append(appended.transportHeaders); + markupHeaders.append(appended.markupHeaders); + cookies.addAll(appended.cookies); } } \ No newline at end of file Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -52,7 +52,7 @@ public abstract class AbstractNoCacheTestCase { - final Set calls = new HashSet(); + final Set<String> calls = new HashSet<String>(); String url; public AbstractNoCacheTestCase( Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-25 12:53:59 UTC (rev 9605) @@ -718,10 +718,11 @@ // Render the head contributions writer.print("<head>"); - MultiValuedPropertyMap<Element> markupHeaders = pageProperties.getMarkupHeaders(false); - if (markupHeaders != null) + MultiValuedPropertyMap<Element> markupHeaders = pageProperties.getMarkupHeaders(); + List<Element> headElement = markupHeaders.getValues("javax.portlet.markup.head.element"); + if (headElement != null) { - for (Element headerValue : markupHeaders.getPropertyValues("javax.portlet.markup.head.element")) + for (Element headerValue : headElement) { try { @@ -750,27 +751,21 @@ private void renderCookies(ResponseProperties pageProperties, HttpServletResponse resp) { - List<Cookie> cookies = pageProperties.getCookies(false); - if (cookies != null) + List<Cookie> cookies = pageProperties.getCookies(); + for (Cookie cookie : cookies) { - for (Cookie cookie : cookies) - { - resp.addCookie(cookie); - } + resp.addCookie(cookie); } } private void renderTransportHeaders(ResponseProperties pageProperties, HttpServletResponse resp) { - MultiValuedPropertyMap<String> transportHeaders = pageProperties.getTransportHeaders(false); - if (transportHeaders != null) + MultiValuedPropertyMap<String> transportHeaders = pageProperties.getTransportHeaders(); + for (String headerName : transportHeaders.keySet()) { - for (String headerName : transportHeaders.getPropertyNames()) + for (String headerValue : transportHeaders.getValues(headerName)) { - for (String headerValue : transportHeaders.getPropertyValues(headerName)) - { - resp.addHeader(headerName, headerValue); - } + resp.addHeader(headerName, headerValue); } } } Modified: modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml 2008-01-25 12:46:46 UTC (rev 9604) +++ modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml 2008-01-25 12:53:59 UTC (rev 9605) @@ -133,7 +133,6 @@ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-ext-session.war"/> </generic> -<!-- <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-ext-expiringcache.war"/> @@ -146,7 +145,6 @@ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-ext-nocache.war"/> </generic> ---> <!--Spec TCK Assertions tests--> <generic>