Author: julien(a)jboss.com Date: 2008-02-27 18:33:14 -0500 (Wed, 27 Feb 2008) New Revision: 10143 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java Log: remove legacy request/response properties in PortletInvocation Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2008-02-27 23:27:11 UTC (rev 10142) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2008-02-27 23:33:14 UTC (rev 10143) @@ -186,7 +186,9 @@ resetBuffer(); // And properties - invocation.getContext().getAttributeResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE).getKeys().clear(); + getProperties().getTransportHeaders().clear(); + getProperties().getMarkupHeaders().clear(); + getProperties().getCookies().clear(); } public boolean isCommitted() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-02-27 23:27:11 UTC (rev 10142) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-02-27 23:33:14 UTC (rev 10143) @@ -60,12 +60,6 @@ /** The request scope. */ public static final Scope INVOCATION_SCOPE = Scope.INVOCATION_SCOPE; - /** The request properties . */ - public static final Scope REQUEST_PROPERTIES_SCOPE = new Scope("request_properties"); - - /** The response properties. */ - public static final Scope RESPONSE_PROPERTIES_SCOPE = new Scope("response_properties"); - /** . */ protected StateString navigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-27 23:27:11 UTC (rev 10142) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-27 23:33:14 UTC (rev 10143) @@ -75,8 +75,6 @@ // addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(clientRequest)); addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); - addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new MapAttributeResolver()); - addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(clientRequest)); }