April 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r10587 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-04-15 07:41:55 -0400 (Tue, 15 Apr 2008) New Revision: 10587 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: Some 'boug', not sure when in which use case it happens though... Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-04-15 11:23:59 UTC (rev 10586) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-04-15 11:41:55 UTC (rev 10587) @@ -124,7 +124,8 @@ // If we don't have the old ns then we try the store if (oldNS == null) { - oldNS = (WindowNavigationalState)store.getAttribute(wantedKey); + PortalObjectId id = (PortalObjectId)wantedKey.getId(); + oldNS = (WindowNavigationalState)store.getAttribute(id.toString()); } //

18 years

1
0
0 / 0

JBoss Portal SVN: r10586 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/impl and 9 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-15 07:23:59 -0400 (Tue, 15 Apr 2008) New Revision: 10586 Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 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/spi/UserContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java Log: remove usage of scopes in portlet container Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java =================================================================== --- modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -122,7 +122,7 @@ public BridgeInfo(PortletInvocation invocation) { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); // this.invocation = invocation; Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -75,11 +75,6 @@ this.clientResponse = clientResponse; this.windowId = windowId; this.urlRenderer = new PortletURLRenderer(pageNavigationalState, clientRequest, clientResponse, serialization); - - // - addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(clientRequest)); - addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); - addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(clientRequest)); } public String getWindowId() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -34,6 +34,8 @@ import javax.ccpp.ComponentDescription; import java.util.Set; import java.util.Collections; +import java.util.Map; +import java.util.HashMap; /** * A simple implementation of CC/PP feature of JSR286. @@ -45,17 +47,20 @@ { protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - try - { - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, "javax.portlet.ccpp", SIMPLE_PROFILE); + Map<String, Object> requestAttributes = invocation.getRequestAttributes(); - // - return invocation.invokeNext(); - } - finally + // + if (requestAttributes == null) { - invocation.removeAttribute(PortletInvocation.REQUEST_SCOPE, "javax.portlet.ccpp"); + requestAttributes = new HashMap<String, Object>(); + invocation.setRequestAttributes(requestAttributes); } + + // + requestAttributes.put("javax.portlet.ccpp", SIMPLE_PROFILE); + + // + return invocation.invokeNext(); } /** Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -32,9 +32,9 @@ import org.jboss.portal.portlet.invocation.response.ContentResponse; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.cache.CacheControl; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; @@ -58,7 +58,7 @@ // We use the principal scope to avoid security issues like a user loggedout seeing a cached entry // by a previous logged in user - AttributeResolver resolver = invocation.getContext().getAttributeResolver(PortletInvocation.PRINCIPAL_SCOPE); + UserContext userContext = invocation.getUserContext(); // if (invocation instanceof RenderInvocation) @@ -72,7 +72,7 @@ Mode mode = renderInvocation.getMode(); // - CacheEntry cachedEntry = (CacheEntry)resolver.getAttribute(scopeKey); + CacheEntry cachedEntry = (CacheEntry)userContext.getAttribute(scopeKey); // if (cachedEntry != null) @@ -143,7 +143,7 @@ if (!useEntry) { cachedEntry = null; - resolver.setAttribute(scopeKey, null); + userContext.setAttribute(scopeKey, null); } } @@ -208,7 +208,7 @@ fragment, expirationTimeMillis, validationToken); - resolver.setAttribute(scopeKey, cacheEntry); + userContext.setAttribute(scopeKey, cacheEntry); } // @@ -223,7 +223,7 @@ else { // Invalidate - resolver.setAttribute(scopeKey, null); + userContext.setAttribute(scopeKey, null); // Invoke return invocation.invokeNext(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -66,7 +66,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); PortletApplication portletApplication = container.getPortletApplication(); ServerContext reqCtx = invocation.getServerContext(); ServletContext targetCtx = portletApplication.getContext().getServletContext(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -69,7 +69,7 @@ Serializable dstPayload = null; if (srcPayload != null) { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); // PortletApplication application = container.getPortletApplication(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -27,11 +27,11 @@ import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.state.AccessMode; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.invocation.AttributeResolver; /** * This interceptor takes in charge the management of portlet customization when the invocation carries @@ -53,8 +53,8 @@ PortletContext oldTarget = invocation.getTarget(); try { - AttributeResolver resolver = invocation.getContext().getAttributeResolver(PortletInvocation.PRINCIPAL_SCOPE); - PortletInstanceContext newContext = new PortletInstanceContext(resolver, oldTarget); + UserContext userContext = invocation.getUserContext(); + PortletInstanceContext newContext = new PortletInstanceContext(userContext, oldTarget); // invocation.setInstanceContext(newContext); @@ -79,7 +79,7 @@ { /** . */ - private AttributeResolver resolver; + private UserContext userContext; /** . */ private PortletContext target; @@ -91,13 +91,13 @@ private String id; public PortletInstanceContext( - AttributeResolver resolver, + UserContext userContext, PortletContext portletContext) { String id = portletContext.getId(); PortletContext target = portletContext; boolean useClone = false; - PortletContext clone = (PortletContext)resolver.getAttribute("clone." + id); + PortletContext clone = (PortletContext)userContext.getAttribute("clone." + id); if (clone != null) { target = clone; @@ -105,7 +105,7 @@ } // - this.resolver = resolver; + this.userContext = userContext; this.useClone = useClone; this.target = target; this.id = id; @@ -130,7 +130,7 @@ { target = event.getPortletContext(); useClone = true; - resolver.setAttribute("clone." + id, target); + userContext.setAttribute("clone." + id, target); } } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -61,7 +61,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); ContainerPortletInfo containerInfo = (ContainerPortletInfo)container.getInfo(); // Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -44,7 +44,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); PortletInfo containerInfo = container.getInfo(); SecurityInfo securityInfo = containerInfo.getSecurity(); SecurityContext securityContext = invocation.getSecurityContext(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -61,7 +61,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainerImpl container = (PortletContainerImpl)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainerImpl container = (PortletContainerImpl)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); // Valve valve = container.getValve(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -79,7 +79,7 @@ portletInvocation.setHandler(null); // - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)portletInvocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); return container.dispatch(portletInvocation); } finally @@ -160,7 +160,7 @@ { invocation.setHandler(handler); - invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER, container); + invocation.setAttribute(ContainerPortletInvoker.PORTLET_CONTAINER, container); return (PortletInvocationResponse)invocation.invoke(stackFactory.getInterceptorStack()); } catch (Exception e) @@ -181,7 +181,7 @@ finally { invocation.setHandler(prevHandler); - invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + invocation.removeAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -140,7 +140,7 @@ public PortletRequestImpl(PortletContainerImpl container, PortletInvocation invocation) { int mode = this instanceof RenderRequest ? PortletPreferencesImpl.RENDER : PortletPreferencesImpl.ACTION; - PropertyContext prefs = (PropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + PropertyContext prefs = (PropertyContext)invocation.getAttribute(PropertyContext.PREFERENCES_ATTRIBUTE); PreferencesValidator validator = container.getPreferencesValidator(); ContainerPortletInfo info = container.getInfo(); ContainerPreferencesInfo containerPrefs = info.getPreferences(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -23,6 +23,9 @@ package org.jboss.portal.portlet.impl.spi; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.portlet.spi.UserContext; import javax.servlet.http.HttpServletRequest; @@ -51,6 +54,9 @@ /** . */ private final HttpServletRequest clientRequest; + /** . */ + private final AttributeResolver attributeResolver; + public AbstractUserContext(HttpServletRequest clientRequest) throws IllegalArgumentException { if (clientRequest == null) @@ -59,6 +65,7 @@ } this.id = clientRequest.getRemoteUser(); this.clientRequest = clientRequest; + this.attributeResolver = new PrincipalAttributeResolver(clientRequest); } public AbstractUserContext(String id) throws IllegalArgumentException @@ -69,12 +76,14 @@ } this.id = id; this.clientRequest = null; + this.attributeResolver = new MapAttributeResolver(); } public AbstractUserContext() { this.id = null; this.clientRequest = null; + this.attributeResolver = new MapAttributeResolver(); } /** @@ -116,4 +125,14 @@ return Tools.toList((Enumeration<Locale>)clientRequest.getLocales()); } } + + public void setAttribute(String attrKey, Object attrValue) + { + attributeResolver.setAttribute(attrKey, attrValue); + } + + public Object getAttribute(String attrKey) + { + return attributeResolver.getAttribute(attrKey); + } } 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-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -23,7 +23,8 @@ package org.jboss.portal.portlet.invocation; import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.Scope; +import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.PortalContext; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -49,15 +50,9 @@ public abstract class PortletInvocation extends Invocation { - /** The portal principal scope. */ - public static final Scope PRINCIPAL_SCOPE = Scope.PRINCIPAL_SCOPE; + /** . */ + protected final AttributeResolver attributes; - /** The request scope. */ - public static final Scope REQUEST_SCOPE = Scope.REQUEST_SCOPE; - - /** The request scope. */ - public static final Scope INVOCATION_SCOPE = Scope.INVOCATION_SCOPE; - /** . */ protected StateString navigationalState; @@ -121,6 +116,7 @@ // this.ctx = ctx; + this.attributes = new MapAttributeResolver(); } public PortletInvocationContext getContext() @@ -297,4 +293,19 @@ { this.requestAttributes = requestAttributes; } + + public void setAttribute(String attrKey, Object attrValue) + { + attributes.setAttribute(attrKey, attrValue); + } + + public Object getAttribute(String attrKey) + { + return attributes.getAttribute(attrKey); + } + + public void removeAttribute(Object attrKey) throws IllegalArgumentException + { + attributes.setAttribute(attrKey, null); + } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -63,4 +63,20 @@ * @return the locales ordered according to user preference (preferred first). */ List<Locale> getLocales(); + + /** + * Set an attribute related to the user identity. + * + * @param attrKey the attribute key + * @param attrValue the attribute value + */ + void setAttribute(String attrKey, Object attrValue); + + /** + * Returns an attribute related to the user identity. + * + * @param attrKey the attribute key + * @return the attribute value + */ + Object getAttribute(String attrKey); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -231,7 +231,7 @@ try { invocation.setTarget(context.getPortletContext()); - invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE, prefs); + invocation.setAttribute(PropertyContext.PREFERENCES_ATTRIBUTE, prefs); // Invoke response = portletInvoker.invoke(invocation); @@ -239,7 +239,7 @@ finally { invocation.setTarget(portletContext); - invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + invocation.removeAttribute(PropertyContext.PREFERENCES_ATTRIBUTE); } // Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -27,7 +27,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -55,4 +54,14 @@ { throw new UnsupportedOperationException(); } + + public void setAttribute(String attrKey, Object attrValue) + { + throw new UnsupportedOperationException(); + } + + public Object getAttribute(String attrKey) + { + throw new UnsupportedOperationException(); + } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -796,7 +796,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } @@ -855,7 +855,7 @@ { try { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } @@ -891,7 +891,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2008-04-15 10:02:42 UTC (rev 10585) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2008-04-15 11:23:59 UTC (rev 10586) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; -import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.support.spi.PortletInvocationContextSupport; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -35,7 +33,5 @@ { public ActionContextImpl() { - addResolver(PortletInvocation.REQUEST_SCOPE, new MapAttributeResolver()); - addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10585 - branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-04-15 06:02:42 -0400 (Tue, 15 Apr 2008) New Revision: 10585 Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQuery.java Log: Should be serializable Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQuery.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQuery.java 2008-04-15 00:21:17 UTC (rev 10584) +++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQuery.java 2008-04-15 10:02:42 UTC (rev 10585) @@ -22,13 +22,15 @@ ******************************************************************************/ package org.jboss.portal.search.impl.jcr; +import java.io.Serializable; + import org.jboss.portal.search.Query; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ -public class JCRQuery implements Query +public class JCRQuery implements Query, Serializable { private String jcrQuery;

18 years

1
0
0 / 0

JBoss Portal SVN: r10584 - in modules/portlet/trunk/portlet/src: main/java/org/jboss/portal/portlet/impl/jsr168/api and 7 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 20:21:17 -0400 (Mon, 14 Apr 2008) New Revision: 10584 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java Log: remove usage of org.jboss.portal.common.value.* and use instead List<String> type Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -30,8 +30,6 @@ import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.reflect.NoSuchClassException; import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; @@ -911,7 +909,7 @@ // for (PortletPreferenceMetaData portletPreferenceMD : preferencesMD.getPortletPreferences().values()) { - Value value = new StringValue(portletPreferenceMD.getValue()); + List<String> value = portletPreferenceMD.getValue(); LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.preference.name." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); LocalizedString description = bundleMgr.getLocalizedValue("javax.portlet.preference.description." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); containerPreferences.addContainerPreference(portletPreferenceMD.getName(), value, portletPreferenceMD.isReadOnly(), displayName, description); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,9 +23,10 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; +import java.util.List; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6818 $ @@ -37,9 +38,9 @@ private LocalizedString displayName; private LocalizedString description; private Boolean readOnly; - private Value value; + private List<String> value; - public ContainerPreferenceInfo(String key, LocalizedString displayName, LocalizedString description, boolean readOnly, Value value) + public ContainerPreferenceInfo(String key, LocalizedString displayName, LocalizedString description, boolean readOnly, List<String> value) { this.key = key; this.displayName = displayName; @@ -73,7 +74,7 @@ * * @return the preference value associated with this preference meta data */ - public Value getDefaultValue() + public List<String> getDefaultValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; import org.jboss.portal.portlet.info.PreferencesInfo; @@ -31,6 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -72,7 +72,7 @@ public void addContainerPreference( String name, - Value value, + List<String> value, boolean readOnly, LocalizedString displayName, LocalizedString description) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,8 +23,6 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.apache.log4j.Logger; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.info.PreferenceInfo; @@ -44,6 +42,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -119,9 +118,9 @@ return Collections.enumeration(names); } - private Value getValue(String key) + private List<String> getValue(String key) { - Value value = null; + List<String> value = null; PropertyChange change = updates.get(key); if (change != null) { @@ -180,14 +179,14 @@ { throw new IllegalArgumentException("key must not be null"); } - Value value = getValue(key); + List<String> value = getValue(key); if (value == null || value.isEmpty()) { return def; } else { - return value.asString(); + return value.get(0); } } @@ -197,22 +196,14 @@ { throw new IllegalArgumentException("key must not be null"); } - Value value = getValue(key); -// if (value != null) -// { -// return value.asStringArray(); -// } -// else -// { -// return def; -// } + List<String> value = getValue(key); if (value == null || value.isEmpty()) { return def; } else { - return value.asStringArray(); + return value.toArray(new String[value.size()]); } } @@ -258,8 +249,7 @@ { throw new ReadOnlyException("Key " + key + " cannot be written"); } - Value value_ = new StringValue(value); - updates.put(key, PropertyChange.newUpdate(key, value_)); + updates.put(key, PropertyChange.newUpdate(key, value)); } public void setValues(String key, String[] values) throws IllegalArgumentException, ReadOnlyException @@ -276,8 +266,7 @@ { values = new String[1]; } - Value value_ = new StringValue(values); - updates.put(key, PropertyChange.newUpdate(key, value_)); + updates.put(key, PropertyChange.newUpdate(key, values)); } public void store() throws IOException, ValidatorException @@ -301,7 +290,7 @@ } // - PropertyChange[] changes = (PropertyChange[])updates.values().toArray(new PropertyChange[updates.size()]); + PropertyChange[] changes = updates.values().toArray(new PropertyChange[updates.size()]); prefs.update(changes); // Clear the updates @@ -321,19 +310,17 @@ // for (String key : containerPrefs.getKeys()) { - String[] value = containerPrefs.getContainerPreference(key).getDefaultValue().asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> defaultValue = containerPrefs.getContainerPreference(key).getDefaultValue(); + String[] value = defaultValue.toArray(new String[defaultValue.size()]); + super.put(key, value); } // for (String key : prefs.getKeys()) { - String[] value = prefs.getValue(key).asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> persistentValue = prefs.getValue(key); + String[] value = persistentValue.toArray(new String[persistentValue.size()]); + super.put(key, value); } // @@ -347,10 +334,9 @@ } else { - String[] value = change.getValue().asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> updatedValue = change.getValue(); + String[] value = updatedValue.toArray(new String[updatedValue.size()]); + super.put(key, value); } } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.state; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; @@ -35,8 +33,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.Iterator; import java.util.Map; +import java.util.List; +import java.util.Arrays; /** * An implementation that relies on the <code>DataInputStream</code> and <code>DataOutputStream</code> to marshall @@ -75,17 +74,15 @@ dos.writeUTF(state.getPortletId()); PropertyMap map = state.getProperties(); dos.writeInt(map.size()); - for (Iterator<Map.Entry<String, Value>> i = map.entrySet().iterator(); i.hasNext();) + for (Map.Entry<String, List<String>> entry : map.entrySet()) { - Map.Entry<String, Value> entry = (Map.Entry<String, Value>)i.next(); - String key = (String)entry.getKey(); - StringValue value = (StringValue)entry.getValue(); - String[] strings = (String[])value.asObjectArray(); + String key = entry.getKey(); + List<String> value = entry.getValue(); + String[] strings = value.toArray(new String[value.size()]); dos.writeUTF(key); dos.writeInt(strings.length); - for (int j = 0; j < strings.length; j++) + for (String string : strings) { - String string = strings[j]; if (string == null) { dos.writeBoolean(true); @@ -143,7 +140,7 @@ strings[i] = string; } } - StringValue value = new StringValue(strings); + List<String> value = Arrays.asList(strings.clone()); properties.setProperty(key, value); } return new PortletState(portletId, properties); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,10 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Collections; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -115,7 +114,7 @@ return prefs.keySet(); } - public Value getValue(String key) throws IllegalArgumentException + public List<String> getValue(String key) throws IllegalArgumentException { if (prefs == null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,23 +23,23 @@ package org.jboss.portal.portlet.state; import org.jboss.portal.common.util.TypedMap; -import org.jboss.portal.common.value.Value; import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public class AbstractPropertyMap<IK, IV> extends TypedMap<String, Value, IK, IV> implements PropertyMap +public class AbstractPropertyMap<IK, IV> extends TypedMap<String, List<String>, IK, IV> implements PropertyMap { - public AbstractPropertyMap(Map<IK, IV> map, Converter<String, IK> keyConverter, Converter<Value, IV> valueConverter) + public AbstractPropertyMap(Map<IK, IV> map, Converter<String, IK> keyConverter, Converter<List<String>, IV> valueConverter) { super(map, keyConverter, valueConverter); } - public Value getProperty(String key) throws IllegalArgumentException + public List<String> getProperty(String key) throws IllegalArgumentException { if (key == null) { @@ -48,7 +48,7 @@ return get(key); } - public void setProperty(String key, Value value) throws IllegalArgumentException + public void setProperty(String key, List<String> value) throws IllegalArgumentException { if (key == null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -35,9 +35,9 @@ protected String name; /** The property value. */ - protected Value value; + protected List<String> value; - public Property(String name, Value value) + public Property(String name, List<String> value) { this.name = name; this.value = value; @@ -48,7 +48,7 @@ return name; } - public Value getValue() + public List<String> getValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; +import java.util.List; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Arrays; /** * A property change. The class is immutable @@ -42,26 +45,54 @@ /** The key. */ private final String key; - /** The value. */ - private final Value value; + /** The immutable value. */ + private final List<String> value; /** - * Create a new property update. + * Create a new property update, the list of values will be clone for safety. * * @param key the property key * @param value the property value * @return an instance representing a property update */ - public static PropertyChange newUpdate(String key, Value value) + public static PropertyChange newUpdate(String key, String value) { + return new PropertyChange(key, Collections.singletonList(value)); + } + + /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, String[] value) + { if (value == null) { throw new IllegalArgumentException("No value provided"); } - return new PropertyChange(key, value); + return new PropertyChange(key, Collections.unmodifiableList(Arrays.asList(value.clone()))); } /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, List<String> value) + { + if (value == null) + { + throw new IllegalArgumentException("No value provided"); + } + return new PropertyChange(key, Collections.unmodifiableList(new ArrayList<String>(value))); + } + + /** * Create a new property reset. * * @param key the property key @@ -72,7 +103,7 @@ return new PropertyChange(key, null); } - private PropertyChange(String key, Value value) + private PropertyChange(String key, List<String> value) { if (key == null) { @@ -85,7 +116,7 @@ /** * Return the property change type. * - * @return the proeprty change type + * @return the property change type */ public int getType() { @@ -107,7 +138,7 @@ * * @return the property value */ - public Value getValue() + public List<String> getValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,9 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Set; +import java.util.List; /** * Exposes to the portlet the interface to deal with the personalization state. @@ -34,29 +33,29 @@ */ public interface PropertyContext { + /** The attribute name under which the preferences can be accessed. */ String PREFERENCES_ATTRIBUTE = "preferences"; /** - * Return the key set. + * Return an immutable set of keys. * * @return the set of keys */ Set<String> getKeys(); /** - * Return for a specified key its value or null if the value does not exist. + * Return for a specified key an immutable list of its values or null if the value does not exist. * * @param key the lookup key * @return the key value or null if it does not exist * @throws IllegalArgumentException if the key is null */ - Value getValue(String key) throws IllegalArgumentException; + List<String> getValue(String key) throws IllegalArgumentException; /** - * Return true if the preferences are globally read only. The value returned by - * this method is valid only during the action request. Any call to this method - * during the render request will produce a non accurate value. + * Return true if the preferences are globally read only. The value returned by this method is valid only during + * the action request. Any call to this method during the render request will produce a non accurate value. * * @return true if the preferences are read only * @throws IllegalStateException if this is called during render phase @@ -66,6 +65,7 @@ /** * Update the preferences. * + * @param changes the list of changes * @throws IllegalStateException if the preferences is not writable * @throws IllegalArgumentException if any change is not valid */ Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,15 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public interface PropertyMap extends Map<String, Value> +public interface PropertyMap extends Map<String, List<String>> { /** * Return the value for the given key or null if it does not exist. @@ -39,7 +38,7 @@ * @return the requested value or null if it does not exist * @throws IllegalArgumentException if the key is null */ - Value getProperty(String key) throws IllegalArgumentException; + List<String> getProperty(String key) throws IllegalArgumentException; /** * Update the value of the given key. If the value object is null it means that the entry must be removed. @@ -50,5 +49,5 @@ * @throws UnsupportedOperationException if the operation is not supported * @throws IllegalArgumentException if the key is null */ - void setProperty(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException; + void setProperty(String key, List<String> value) throws IllegalArgumentException, UnsupportedOperationException; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,16 +22,15 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.HashMap; import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public class SimplePropertyMap extends AbstractPropertyMap<String, Value> +public class SimplePropertyMap extends AbstractPropertyMap<String, List<String>> { private static final Converter<String, String> KEY_CONVERTER = new Converter<String, String>() @@ -50,17 +49,17 @@ } }; - private static Converter<Value, Value> VALUE_CONVERTER = new Converter<Value, Value>() + private static Converter<List<String>, List<String>> VALUE_CONVERTER = new Converter<List<String>, List<String>>() { - protected Value getInternal(Value value) throws IllegalArgumentException, ClassCastException + protected List<String> getInternal(List<String> value) throws IllegalArgumentException, ClassCastException { return value; } - protected Value getExternal(Value value) + protected List<String> getExternal(List<String> value) { return value; } - protected boolean equals(Value value, Value value1) + protected boolean equals(List<String> value, List<String> value1) { return value.equals(value1); } @@ -68,17 +67,17 @@ public SimplePropertyMap() { - this(new HashMap<String, Value>()); + this(new HashMap<String, List<String>>()); } public SimplePropertyMap(int size) { - this(new HashMap<String, Value>(size)); + this(new HashMap<String, List<String>>(size)); } public SimplePropertyMap(PropertyMap that) { - this(new HashMap<String, Value>()); + this(new HashMap<String, List<String>>()); // if (that == null) @@ -90,7 +89,7 @@ putAll(that); } - public SimplePropertyMap(Map<String, Value> map) + public SimplePropertyMap(Map<String, List<String>> map) { super(map, KEY_CONVERTER, VALUE_CONVERTER); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.state.producer; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -659,11 +658,11 @@ // Get the missing or read only properties from the referenced portlet properties // and add them to the actual state PropertyMap refPreferencesInfo = portletInvoker.getProperties(portletContext, keys); - for (Map.Entry<String, Value> entry : refPreferencesInfo.entrySet()) + for (Map.Entry<String, List<String>> entry : refPreferencesInfo.entrySet()) { String key = entry.getKey(); - Value value = entry.getValue(); - props.setProperty(key, value.clone()); + List<String> value = entry.getValue(); + props.setProperty(key, new ArrayList<String>(value)); } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -35,13 +35,13 @@ import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.common.value.Value; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -173,10 +173,10 @@ PropertyMap props = new SimplePropertyMap(); for (String key : keys) { - Value value = internalPortlet.state.get(key); + List<String> value = internalPortlet.state.get(key); if (value != null) { - props.put(key, value.clone()); + props.put(key, new ArrayList<String>(value)); } } return props; @@ -188,10 +188,10 @@ PropertyMap props = new SimplePropertyMap(); for (String key: internalPortlet.state.keySet()) { - Value value = internalPortlet.state.get(key); + List<String> value = internalPortlet.state.get(key); if (value != null) { - props.put(key, value.clone()); + props.put(key, new ArrayList<String>(value)); } } return props; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -32,12 +32,12 @@ import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -53,7 +53,7 @@ boolean valid; /** . */ - final Map<String, Value> state; + final Map<String, List<String>> state; /** . */ private int invocationCount; @@ -78,17 +78,17 @@ // this.portletContext = PortletContext.createPortletContext(portletId); this.valid = true; - this.state = new HashMap<String, Value>(); + this.state = new HashMap<String, List<String>>(); this.info = info; } - public void addPreference(String key, Value value) + public void addPreference(String key, List<String> value) { info.getPreferences().addPreference(key); state.put(key, value); } - public void addPreference(String key, Value value, Boolean readOnly) + public void addPreference(String key, List<String> value, Boolean readOnly) { info.getPreferences().addPreference(key, readOnly); state.put(key, value); Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; import org.jboss.portal.portlet.info.PreferencesInfo; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -31,6 +31,8 @@ import java.util.Locale; import java.util.Set; +import java.util.List; +import java.util.Arrays; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -71,29 +73,29 @@ // prefInfo = prefsInfo.getContainerPreference("single_pref"); assertEquals("single_pref", prefInfo.getKey()); - String[] values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"single_pref_value"}, values); + List<String> values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("single_pref_value"), values); assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref"); assertEquals("multi_pref", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("multi_pref_value_1", "multi_pref_value_2"), values); assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("single_pref_bis"); assertEquals("single_pref_bis", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"single_pref_value"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("single_pref_value"), values); assertTrue(prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref_bis"); assertEquals("multi_pref_bis", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("multi_pref_value_1", "multi_pref_value_2"), values); assertTrue(prefInfo.isReadOnly().booleanValue()); } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -24,8 +24,6 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -163,12 +161,12 @@ /** * */ - protected abstract void addPreference(PortletContext popRef, String key, Value defaultValue); + protected abstract void addPreference(PortletContext popRef, String key, List<String> defaultValue); /** * */ - protected abstract void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly); + protected abstract void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly); /** * @@ -314,7 +312,7 @@ PortletInfoSupport info = new PortletInfoSupport(); info.getMeta().setDisplayName("MyPortlet"); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // PortletContext ccp1Ctx = createClone(popCtx); @@ -322,7 +320,7 @@ // Check state PropertyMap expected = new SimplePropertyMap(); - expected.setProperty("abc", new StringValue("def")); + expected.setProperty("abc", Arrays.asList("def")); PropertyMap ccp1Props = getProperties(ccp1Ctx); ValueMapAssert.assertEquals(expected, ccp1Props); @@ -333,7 +331,7 @@ _assertEquals(ccp1Ctx, ccp1.getContext()); // Update state - PropertyChange[] changes = new PropertyChange[]{PropertyChange.newUpdate("ghi", new StringValue("jkl"))}; + PropertyChange[] changes = new PropertyChange[]{PropertyChange.newUpdate("ghi", Arrays.asList("jkl"))}; ccp1Ctx = setProperties(ccp1Ctx, changes); // Clone a CCP @@ -341,8 +339,8 @@ // Check state expected = new SimplePropertyMap(); - expected.setProperty("abc", new StringValue("def")); - expected.setProperty("ghi", new StringValue("jkl")); + expected.setProperty("abc", Arrays.asList("def")); + expected.setProperty("ghi", Arrays.asList("jkl")); PropertyMap ccp2Props = getProperties(ccp2Ctx); ValueMapAssert.assertEquals(expected, ccp2Props); @@ -616,20 +614,20 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); - addPreference(popCtx, "ghi", new StringValue("jkl"), Boolean.TRUE); + addPreference(popCtx, "abc", Arrays.asList("def")); + addPreference(popCtx, "ghi", Arrays.asList("jkl"), Boolean.TRUE); // PropertyMap props = getProperties(popCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("def")); - expectedProps.setProperty("ghi", new StringValue("jkl")); + expectedProps.setProperty("abc", Arrays.asList("def")); + expectedProps.setProperty("ghi", Arrays.asList("jkl")); ValueMapAssert.assertEquals(expectedProps, props); // props = getProperties(popCtx, Tools.toSet("abc", "mno")); expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("def")); + expectedProps.setProperty("abc", Arrays.asList("def")); ValueMapAssert.assertEquals(expectedProps, props); } @@ -638,33 +636,33 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); - addPreference(popCtx, "ghi", new StringValue("jkl")); - addPreference(popCtx, "mno", new StringValue("pqr"), Boolean.TRUE); - addPreference(popCtx, "stu", new StringValue("vwx"), Boolean.TRUE); + addPreference(popCtx, "abc", Arrays.asList("def")); + addPreference(popCtx, "ghi", Arrays.asList("jkl")); + addPreference(popCtx, "mno", Arrays.asList("pqr"), Boolean.TRUE); + addPreference(popCtx, "stu", Arrays.asList("vwx"), Boolean.TRUE); // PortletContext ccpCtx = createClone(popCtx); ccpCtx = setProperties(ccpCtx, new PropertyChange[]{ - PropertyChange.newUpdate("abc", new StringValue("_def")), + PropertyChange.newUpdate("abc", Arrays.asList("_def")), PropertyChange.newReset("gho"), - PropertyChange.newUpdate("mno", new StringValue("_pqr")), + PropertyChange.newUpdate("mno", Arrays.asList("_pqr")), PropertyChange.newReset("stu")}); // PropertyMap props = getProperties(ccpCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); - expectedProps.setProperty("ghi", new StringValue("jkl")); - expectedProps.setProperty("mno", new StringValue("pqr")); - expectedProps.setProperty("stu", new StringValue("vwx")); + expectedProps.setProperty("abc", Arrays.asList("_def")); + expectedProps.setProperty("ghi", Arrays.asList("jkl")); + expectedProps.setProperty("mno", Arrays.asList("pqr")); + expectedProps.setProperty("stu", Arrays.asList("vwx")); ValueMapAssert.assertEquals(expectedProps, props); // props = getProperties(ccpCtx, Tools.toSet("abc", "mno", "yz")); expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); - expectedProps.setProperty("mno", new StringValue("pqr")); + expectedProps.setProperty("abc", Arrays.asList("_def")); + expectedProps.setProperty("mno", Arrays.asList("pqr")); ValueMapAssert.assertEquals(expectedProps, props); } @@ -728,52 +726,52 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "override_update", new StringValue("override_update_portlet_value")); - addPreference(popCtx, "override_reset", new StringValue("override_reset_portlet_value")); - addPreference(popCtx, "override_create", new StringValue("override_create_portlet_value")); - addPreference(popCtx, "readonly_create", new StringValue("readonly_create_portlet_value"), Boolean.TRUE); + addPreference(popCtx, "override_update", Arrays.asList("override_update_portlet_value")); + addPreference(popCtx, "override_reset", Arrays.asList("override_reset_portlet_value")); + addPreference(popCtx, "override_create", Arrays.asList("override_create_portlet_value")); + addPreference(popCtx, "readonly_create", Arrays.asList("readonly_create_portlet_value"), Boolean.TRUE); // PortletContext ccpCtx = createClone(popCtx); ccpCtx = setProperties(ccpCtx, new PropertyChange[]{ - PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value")), - PropertyChange.newUpdate("override_reset", new StringValue("override_reset_clone_value")), - PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value")), - PropertyChange.newUpdate("dynamic_reset", new StringValue("dynamic_reset_clone_value")), + PropertyChange.newUpdate("override_update", Arrays.asList("override_update_clone_value")), + PropertyChange.newUpdate("override_reset", Arrays.asList("override_reset_clone_value")), + PropertyChange.newUpdate("dynamic_update", Arrays.asList("dynamic_update_clone_value")), + PropertyChange.newUpdate("dynamic_reset", Arrays.asList("dynamic_reset_clone_value")), }); // PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("override_update", new StringValue("override_update_clone_value")); - expectedProps.setProperty("override_reset", new StringValue("override_reset_clone_value")); - expectedProps.setProperty("override_create", new StringValue("override_create_portlet_value")); - expectedProps.setProperty("readonly_create", new StringValue("readonly_create_portlet_value")); - expectedProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value")); - expectedProps.setProperty("dynamic_reset", new StringValue("dynamic_reset_clone_value")); + expectedProps.setProperty("override_update", Arrays.asList("override_update_clone_value")); + expectedProps.setProperty("override_reset", Arrays.asList("override_reset_clone_value")); + expectedProps.setProperty("override_create", Arrays.asList("override_create_portlet_value")); + expectedProps.setProperty("readonly_create", Arrays.asList("readonly_create_portlet_value")); + expectedProps.setProperty("dynamic_update", Arrays.asList("dynamic_update_clone_value")); + expectedProps.setProperty("dynamic_reset", Arrays.asList("dynamic_reset_clone_value")); PropertyMap ccpProps = getProperties(ccpCtx); ValueMapAssert.assertEquals(expectedProps, ccpProps); // PropertyChange[] changes = new PropertyChange[] { - PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value_2")), + PropertyChange.newUpdate("override_update", Arrays.asList("override_update_clone_value_2")), PropertyChange.newReset("override_reset"), - PropertyChange.newUpdate("override_create", new StringValue("override_create_clone_value_2")), - PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value_2")), + PropertyChange.newUpdate("override_create", Arrays.asList("override_create_clone_value_2")), + PropertyChange.newUpdate("dynamic_update", Arrays.asList("dynamic_update_clone_value_2")), PropertyChange.newReset("dynamic_reset"), - PropertyChange.newUpdate("dynamic_create", new StringValue("dynamic_create_clone_value_2")), - PropertyChange.newUpdate("readonly_create", new StringValue("readonly_create_clone_value_2")), + PropertyChange.newUpdate("dynamic_create", Arrays.asList("dynamic_create_clone_value_2")), + PropertyChange.newUpdate("readonly_create", Arrays.asList("readonly_create_clone_value_2")), }; ccpCtx = setProperties(ccpCtx, changes); // expectedProps.clear(); - expectedProps.setProperty("override_update", new StringValue("override_update_clone_value_2")); - expectedProps.setProperty("override_create", new StringValue("override_create_clone_value_2")); - expectedProps.setProperty("override_reset", new StringValue("override_reset_portlet_value")); - expectedProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value_2")); - expectedProps.setProperty("dynamic_create", new StringValue("dynamic_create_clone_value_2")); - expectedProps.setProperty("readonly_create", new StringValue("readonly_create_portlet_value")); + expectedProps.setProperty("override_update", Arrays.asList("override_update_clone_value_2")); + expectedProps.setProperty("override_create", Arrays.asList("override_create_clone_value_2")); + expectedProps.setProperty("override_reset", Arrays.asList("override_reset_portlet_value")); + expectedProps.setProperty("dynamic_update", Arrays.asList("dynamic_update_clone_value_2")); + expectedProps.setProperty("dynamic_create", Arrays.asList("dynamic_create_clone_value_2")); + expectedProps.setProperty("readonly_create", Arrays.asList("readonly_create_portlet_value")); ccpProps = getProperties(ccpCtx); ValueMapAssert.assertEquals(expectedProps, ccpProps); } @@ -799,7 +797,7 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } }; @@ -810,7 +808,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); ctx = popCtx; } else @@ -818,7 +816,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); PortletContext ccpCtx = createClone(popCtx); ctx = ccpCtx; } @@ -834,7 +832,7 @@ // PropertyMap blah = getProperties(cloneRef); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); + expectedProps.setProperty("abc", Arrays.asList("_def")); ValueMapAssert.assertEquals(expectedProps, blah); // Now we test the clone destruction @@ -858,7 +856,7 @@ try { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } catch (IllegalStateException e) @@ -873,7 +871,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // ActionInvocation invocation = createAction(popCtx, AccessMode.READ_ONLY); @@ -894,14 +892,14 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } }; PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // PortletContext ccpCtx = createClone(popCtx); @@ -917,7 +915,7 @@ // PropertyMap blah = getProperties(ccpCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); + expectedProps.setProperty("abc", Arrays.asList("_def")); ValueMapAssert.assertEquals(expectedProps, blah); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -43,7 +43,6 @@ import org.jboss.portal.portlet.state.consumer.ConsumerPortlet; import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.portlet.state.producer.ProducerPortlet; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Create; @@ -166,12 +165,12 @@ return cloneRef; } - protected void addPreference(PortletContext popRef, String key, Value defaultValue) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue); } - protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -40,7 +40,6 @@ import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Create; @@ -131,12 +130,12 @@ return cloneContext; } - protected void addPreference(PortletContext popRef, String key, Value defaultValue) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue); } - protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.value.StringValue; import org.jboss.portal.portlet.impl.state.StateConverterV0; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; @@ -33,6 +32,9 @@ import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Test; +import java.util.Arrays; +import java.util.ArrayList; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -104,13 +106,13 @@ // PropertyMap props = new SimplePropertyMap(); - props.setProperty("ab", new StringValue("cd")); - props.setProperty("ef", new StringValue(new String[0])); - props.setProperty("gh", new StringValue(new String[]{""})); - props.setProperty("ij", new StringValue(new String[]{"kl"})); - props.setProperty("mn", new StringValue(new String[]{"op", null})); - props.setProperty("qr", new StringValue(new String[]{null, "st"})); - props.setProperty("uv", new StringValue(new String[]{"wx", null, "yz"})); + props.setProperty("ab", Arrays.asList("cd")); + props.setProperty("ef", new ArrayList<String>()); + props.setProperty("gh", Arrays.asList("")); + props.setProperty("ij", Arrays.asList("kl")); + props.setProperty("mn", Arrays.asList("op", null)); + props.setProperty("qr", Arrays.asList(null, "st")); + props.setProperty("uv", Arrays.asList("wx", null, "yz")); assertWorks(new PortletState("bar", props)); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import java.util.HashSet; -import java.util.Iterator; +import java.util.List; import org.jboss.unit.api.Assert; @@ -51,12 +50,11 @@ { Assert.fail("Value map should not be null"); } - Assert.assertEquals("Value maps don't have the same keys", new HashSet(vm1.keySet()), new HashSet(vm2.keySet())); - for (Iterator i = vm1.keySet().iterator(); i.hasNext();) + Assert.assertEquals("Value maps don't have the same keys", new HashSet<String>(vm1.keySet()), new HashSet<String>(vm2.keySet())); + for (String key : vm1.keySet()) { - String key = (String)i.next(); - Value v1 = vm1.getProperty(key); - Value v2 = vm2.getProperty(key); + List<String> v1 = vm1.getProperty(key); + List<String> v2 = vm2.getProperty(key); Assert.assertEquals("Values for key " + key + " are not equals", v1, v2); } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10583 - modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 13:51:29 -0400 (Mon, 14 Apr 2008) New Revision: 10583 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java Log: update javadoc Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 16:33:27 UTC (rev 10582) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 17:51:29 UTC (rev 10583) @@ -43,6 +43,10 @@ import java.util.Map; /** + * A factory that provides a way to create ControllerRequest. This factory is just a default implementation + * and is not an authority which means that any client of the controller framework is free to determine how + * a controller request is created. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ @@ -57,6 +61,9 @@ this.serialization = serialization; } + /** + * Replace web rquest with a query parameter map and a form parameter map. + */ public ControllerRequest createRequest(WebRequest req) {

18 years

1
0
0 / 0

JBoss Portal SVN: r10582 - in modules/portlet/trunk/portlet/src: test/java/org/jboss/portal/test/portlet and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 12:33:27 -0400 (Mon, 14 Apr 2008) New Revision: 10582 Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java Modified: modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml Log: remove PortletRequestDecoder and PortletRequestEncoder Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-04-14 13:48:45 UTC (rev 10581) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-04-14 16:33:27 UTC (rev 10582) @@ -1,324 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.OpaqueStateString; - -import java.util.Iterator; -import java.util.Map; - -/** - * This class is a possible implementation for the behavior of a request made to a portlet. Which means that this - * implementation does not preclude other implementations. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6549 $ - */ -public class PortletRequestDecoder -{ - - /** The mask for action. */ - public static final int ACTION_MASK = 0x00000001; - - /** The mask for render. */ - public static final int RENDER_MASK = 0x00000002; - - /** The mask for mode. */ - public static final int MODE_MASK = 0x00000004; - - /** The mask for window state. */ - public static final int WINDOW_STATE_MASK = 0x00000008; - - /** The mask for opacity. */ - public static final int OPAQUE_MASK = 0x00000010; - - /** The name of the URL parameter containing the mode. */ - public static final String MODE_PARAMETER = "mode"; - - /** The name of the URL parameter containing the window state. */ - public static final String WINDOW_STATE_PARAMETER = "windowstate"; - - /** The name of the URL parameter containing the interaction state. */ - public static final String INTERACTION_STATE_PARAMETER = "is"; - - /** The name of the URL parameter containing the navigational state. */ - public static final String NAVIGATIONAL_STATE_PARAMETER = "ns"; - - /** The name of the URL parameter containing the meta information. */ - public static final String META_PARAMETER = "action"; - - /** . */ - public static final int ACTION_TYPE = 0; - - /** . */ - public static final int RENDER_TYPE = 1; - - /** . */ - public static final int NAV_TYPE = 2; - - /** . */ - private Mode mode; - - /** . */ - private WindowState windowState; - - /** . */ - private StateString navigationalstate; - - /** . */ - private StateString interactionState; - - /** . */ - private ParameterMap form; - - /** . */ - private int type; - - public void decode(Map queryParams, Map bodyParams) throws IllegalArgumentException - { - // The meta info from the URL - int meta = 0; - String[] metaParam = (String[])queryParams.get(META_PARAMETER); - if (metaParam != null) - { - try - { - meta = Integer.parseInt(metaParam[0], 16); - } - catch (NumberFormatException ignore) - { - // If mask is not present then we assume that it can only be a navigation URL (NAV_TYPE) - } - } - - // - if ((meta & (ACTION_MASK | RENDER_MASK)) != 0) - { - // Check validity - if ((meta & (ACTION_MASK | RENDER_MASK)) == (ACTION_MASK | RENDER_MASK)) - { - throw new IllegalArgumentException("Cannot have both action and render in the mask at the same time"); - } - - // - if ((meta & ACTION_MASK) != 0) - { - type = ACTION_TYPE; - } - else - { - type = RENDER_TYPE; - } - - // Get the mode from the parameters if it exists - if ((meta & MODE_MASK) != 0) - { - String[] modeParam = (String[])queryParams.get(MODE_PARAMETER); - if (modeParam == null) - { - throw new IllegalArgumentException(); - } - mode = Mode.create(modeParam[0]); - } - else - { - mode = null; - } - - // Get the window state from the parameters if it exists - if ((meta & WINDOW_STATE_MASK) != 0) - { - String[] windowStateParam = (String[])queryParams.get(WINDOW_STATE_PARAMETER); - if (windowStateParam == null) - { - throw new IllegalArgumentException(); - } - windowState = WindowState.create(windowStateParam[0]); - } - else - { - windowState = null; - } - - // - boolean opaque = (meta & OPAQUE_MASK) != 0; - if (!opaque) - { - // Compute the parameters skipping the portlet navigational state that may be encoded as well - ParametersStateString query = ParametersStateString.create(); - for (Iterator i = queryParams.entrySet().iterator(); i.hasNext();) - { - Map.Entry entry = (Map.Entry)i.next(); - int index = 0; - String name = (String)entry.getKey(); - String[] queryValues = (String[])entry.getValue(); - - // - if (META_PARAMETER.equals(name)) - { - index = 1; - } - else if ((meta & MODE_MASK) != 0 && MODE_PARAMETER.equals(name)) - { - index = 1; - } - else if ((meta & WINDOW_STATE_MASK) != 0 && WINDOW_STATE_PARAMETER.equals(name)) - { - index = 1; - } - - // We have interaction param(s) in the query string - if (index < queryValues.length) - { - String[] values = new String[queryValues.length - index]; - System.arraycopy(queryValues, index, values, 0, values.length); - query.setValues(name, values); - } - } - - // Julien : - ParameterMap form = new ParameterMap(); - if (bodyParams != null) - { - form.putAll(bodyParams); - } - - // - if (type == ACTION_TYPE) - { - this.navigationalstate = null; - this.interactionState = query; - this.form = form; - } - else - { - this.navigationalstate = query; - this.interactionState = null; - this.form = null; - } - } - else - { - // Decode the navigational state - String[] ns = (String[])queryParams.get(NAVIGATIONAL_STATE_PARAMETER); - if (ns != null) - { - navigationalstate = new OpaqueStateString(ns[0]); - } - else - { - navigationalstate = null; - } - - // Decode more if we have an action - if (type == ACTION_TYPE) - { - // Decode the interaction state - String[] is = (String[])queryParams.get(INTERACTION_STATE_PARAMETER); - if (is != null) - { - interactionState = new OpaqueStateString(is[0]); - } - else - { - interactionState = null; - } - - // - form = new ParameterMap(); - if (bodyParams != null) - { - form.putAll(bodyParams); - } - } - else - { - interactionState = null; - form = null; - } - } - } - else - { - // Set to nav type - type = NAV_TYPE; - - // Get the mode from the parameters if it exists - String[] modeParam = (String[])queryParams.get(MODE_PARAMETER); - if (modeParam != null) - { - mode = Mode.create(modeParam[0]); - } - else - { - mode = null; - } - - // Get the window state from the parameters if it exists - String[] windowStateParam = (String[])queryParams.get(WINDOW_STATE_PARAMETER); - if (windowStateParam != null) - { - windowState = WindowState.create(windowStateParam[0]); - } - else - { - windowState = null; - } - } - } - - public Mode getMode() - { - return mode; - } - - public WindowState getWindowState() - { - return windowState; - } - - public StateString getNavigationalState() - { - return navigationalstate; - } - - public StateString getInteractionState() - { - return interactionState; - } - - public ParameterMap getForm() - { - return form; - } - - public int getType() - { - return type; - } -} Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-04-14 13:48:45 UTC (rev 10581) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-04-14 16:33:27 UTC (rev 10582) @@ -1,207 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.ActionURL; - -import java.util.Iterator; -import java.util.Map; - -/** - * This class is designed to provide the encoding in the query string of a URL of the following state : - * <ul> - * <li>A set of parameters</li> - * <li>A mode value</li> - * <li>A window state value</li> - * <li>A invocation type (action or render)</li> - * </ul> - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PortletRequestEncoder -{ - - /** . */ - private ParameterMap queryParameters; - - public PortletRequestEncoder(ParameterMap queryParameters) - { - if (queryParameters == null) - { - throw new IllegalArgumentException(); - } - - // - this.queryParameters = queryParameters; - } - - public PortletRequestEncoder() - { - this(new ParameterMap()); - } - - public void encodeAction( - StateString navigationalState, - StateString interactionState, - Mode mode, - WindowState windowState) throws IllegalArgumentException - { - queryParameters.clear(); - - // - int meta = PortletRequestDecoder.ACTION_MASK; - - // - if (interactionState != null) - { - if (interactionState instanceof ParametersStateString) - { - if (navigationalState != null) - { - throw new IllegalArgumentException("Cannot handle case with both non opaque interaction and navigational state"); - } - - // Add the parameters - Map<String, String[]> parameters = ((ParametersStateString)interactionState).getParameters(); - configure(parameters); - } - else - { - meta |= PortletRequestDecoder.OPAQUE_MASK; - - // Set interaction state - queryParameters.setValue(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, interactionState.getStringValue()); - - // We may have navigational state - if (navigationalState != null) - { - queryParameters.setValue(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, navigationalState.getStringValue()); - } - } - } - - // - configure(meta, mode, windowState); - } - - public void encodeRender( - StateString navigationalState, - Mode mode, - WindowState windowState) - { - queryParameters.clear(); - - // - if (navigationalState != null) - { - int meta = PortletRequestDecoder.RENDER_MASK; - - // - if (navigationalState instanceof ParametersStateString) - { - // Add the parameters - Map<String, String[]> parameters = ((ParametersStateString)navigationalState).getParameters(); - configure(parameters); - } - else - { - meta |= PortletRequestDecoder.OPAQUE_MASK; - - // - queryParameters.setValue(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, navigationalState.getStringValue()); - } - - // - configure(meta, mode, windowState); - } - else - { - if (mode != null) - { - queryParameters.setValue(PortletRequestDecoder.MODE_PARAMETER, mode.toString()); - } - - // - if (windowState != null) - { - queryParameters.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, windowState.toString()); - } - } - } - - public ParameterMap getQueryParameters() - { - return queryParameters; - } - - private void configure(Map<String, String[]> parameters) - { - for (Iterator i = parameters.entrySet().iterator(); i.hasNext();) - { - Map.Entry entry = (Map.Entry)i.next(); - String name = (String)entry.getKey(); - String[] values = (String[])entry.getValue(); - queryParameters.setValues(name, values); - } - } - - private void configure(int meta, Mode mode, WindowState windowState) - { - if (mode != null) - { - meta |= PortletRequestDecoder.MODE_MASK; - setMetaParameter(PortletRequestDecoder.MODE_PARAMETER, mode.toString()); - } - if (windowState != null) - { - meta |= PortletRequestDecoder.WINDOW_STATE_MASK; - setMetaParameter(PortletRequestDecoder.WINDOW_STATE_PARAMETER, windowState.toString()); - } - setMetaParameter(PortletRequestDecoder.META_PARAMETER, Integer.toHexString(meta)); - } - - private void setMetaParameter(String name, String value) - { - String[] values = queryParameters.getValues(name); - if (values == null) - { - values = new String[]{value}; - } - else - { - String[] tmp = new String[values.length + 1]; - System.arraycopy(values, 0, tmp, 1, values.length); - tmp[0] = value; - values = tmp; - } - queryParameters.setValues(name, values); - } -} Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-04-14 13:48:45 UTC (rev 10581) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-04-14 16:33:27 UTC (rev 10582) @@ -1,680 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.portlet; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.impl.PortletRequestDecoder; -import org.jboss.unit.api.pojo.annotations.Test; - -import static org.jboss.unit.api.Assert.*; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6549 $ - */ -@Test -public class PortletRequestDecoderTestCase -{ - - public PortletRequestDecoderTestCase() - { - } - - private String[] asStringArray(String s) - { - return new String[]{s}; - } - - @Test - public void testCorruped() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Action + Render - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.ACTION_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - - // Action + Mode - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.ACTION_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.ACTION_MASK))); - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } - - // Action + WindowState - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.WINDOW_STATE_MASK | PortletRequestDecoder.ACTION_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.WINDOW_STATE_MASK | PortletRequestDecoder.ACTION_MASK))); - bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } - - // Render + Mode - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.RENDER_MASK))); - o.decode(queryParams, null); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.ACTION_MASK))); - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } - - // Render + WindowState - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.WINDOW_STATE_MASK | PortletRequestDecoder.RENDER_MASK))); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - } - try - { - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.WINDOW_STATE_MASK | PortletRequestDecoder.ACTION_MASK))); - bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, bodyParams); - fail(); - } - catch (IllegalArgumentException expected) - { - queryParams.clear(); - bodyParams.clear(); - } - } - - @Test - public void testNav() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Empty - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query mode - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query mode two values - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), Mode.EDIT.toString()}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Body mode - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - bodyParams.clear(); - - // Query mode + Body mode - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString()}); - bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.EDIT.toString()}); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - bodyParams.clear(); - - // Query window state - queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); - queryParams.clear(); - - // Body window state - bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.NAV_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - bodyParams.clear(); - } - - @Test - public void testRender() - { - Map queryParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Empty - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query mode - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.MODE_MASK))); - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query window state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK))); - queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(ParametersStateString.create(), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); - queryParams.clear(); - } - - @Test - public void testRenderNonOpaque() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - ParametersStateString navState = ParametersStateString.create(); - - // Query parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); - queryParams.put("foo", asStringArray("bar")); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue("foo", "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query meta parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK), "bar"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue(PortletRequestDecoder.META_PARAMETER, "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query window state parameter + window state meta parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)}); - queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(), "bar"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query window state parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK)}); - queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{"bar"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query mode parameter + mode meta parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.MODE_MASK)}); - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), "bar"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue(PortletRequestDecoder.MODE_PARAMETER, "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query mode parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK)}); - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{"bar"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue(PortletRequestDecoder.MODE_PARAMETER, "bar"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Body parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); - bodyParams.put("foo", asStringArray("bar2")); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - bodyParams.clear(); - - // Query multivalued parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); - queryParams.put("foo", new String[]{"bar1", "bar2"}); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - - // Query + Body parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK))); - queryParams.put("foo", new String[]{"bar1"}); - bodyParams.put("foo", new String[]{"bar2"}); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - navState.setValue("foo", "bar1"); - assertEquals(navState, o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - navState.clear(); - queryParams.clear(); - bodyParams.clear(); - } - - @Test - public void testRenderOpaque() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Empty - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK))); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query nav state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK))); - queryParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(new OpaqueStateString("navstatevalue"), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Body nav state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK))); - bodyParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - bodyParams.clear(); - - // Query int state is ignored - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK))); - queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); - o.decode(queryParams, null); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Body int state is ignored - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK))); - bodyParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); - o.decode(queryParams, bodyParams); - assertNull(o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - bodyParams.clear(); - } - - @Test - public void testAction() - { - Map queryParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Empty - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query mode - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.MODE_MASK))); - queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertEquals(Mode.VIEW, o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query window state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.WINDOW_STATE_MASK))); - queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(ParametersStateString.create(), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertEquals(WindowState.NORMAL, o.getWindowState()); - queryParams.clear(); - } - - @Test - public void testActionNonOpaque() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - ParametersStateString intState = ParametersStateString.create(); - ParameterMap form = new ParameterMap(); - - // Query parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); - queryParams.put("foo", asStringArray("bar")); - o.decode(queryParams, null); - assertEquals(form, o.getForm()); - intState.setValue("foo", "bar"); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - intState.clear(); - queryParams.clear(); - form.clear(); - - // Query multivalued parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); - queryParams.put("foo", new String[]{"bar1", "bar2"}); - o.decode(queryParams, null); - assertEquals(form, o.getForm()); - intState.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - intState.clear(); - queryParams.clear(); - form.clear(); - - // Body parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); - bodyParams.put("foo", asStringArray("bar")); - o.decode(queryParams, bodyParams); - form.setValue("foo", "bar"); - assertEquals(form, o.getForm()); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - form.clear(); - queryParams.clear(); - bodyParams.clear(); - form.clear(); - - // Body multivalued parameter - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); - bodyParams.put("foo", new String[]{"bar1", "bar2"}); - o.decode(queryParams, bodyParams); - form.setValues("foo", new String[]{"bar1", "bar2"}); - assertEquals(form, o.getForm()); - assertEquals(intState, o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - form.clear(); - queryParams.clear(); - bodyParams.clear(); - form.clear(); - } - - @Test - public void testActionOpaque() - { - Map queryParams = new HashMap(); - Map bodyParams = new HashMap(); - PortletRequestDecoder o = new PortletRequestDecoder(); - - // Empty - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query nav state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); - queryParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertNull(o.getInteractionState()); - assertEquals(new OpaqueStateString("navstatevalue"), o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Query int state - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); - queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); - o.decode(queryParams, null); - assertEquals(new ParameterMap(), o.getForm()); - assertEquals(new OpaqueStateString("intstatevalue"), o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - - // Body parameters - queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); - bodyParams.put("foo1", asStringArray("bar1")); - bodyParams.put("foo2", new String[]{"bar2", "bar3"}); - queryParams.put("foo3", new String[]{"bar4"}); - bodyParams.put("foo3", new String[]{"bar5"}); - o.decode(queryParams, bodyParams); - ParameterMap form = new ParameterMap(); - form.setValue("foo1", "bar1"); - form.setValues("foo2", new String[]{"bar2", "bar3"}); - form.setValues("foo3", new String[]{"bar5"}); - assertEquals(form, o.getForm()); - assertNull(o.getInteractionState()); - assertNull(o.getNavigationalState()); - assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); - assertNull(o.getMode()); - assertNull(o.getWindowState()); - queryParams.clear(); - bodyParams.clear(); - } -} Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-04-14 13:48:45 UTC (rev 10581) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-04-14 16:33:27 UTC (rev 10582) @@ -1,224 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.portlet; - -import org.jboss.portal.portlet.impl.PortletRequestEncoder; -import org.jboss.portal.portlet.impl.PortletRequestDecoder; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; - -import static org.jboss.unit.api.Assert.*; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PortletRequestEncoderTestCase -{ - - /** . */ - public static final int RENDER = 0; - - /** . */ - public static final int ACTION = 1; - - /** . */ - private ParameterMap params; - - /** . */ - private PortletRequestEncoder encoder; - - @Create - public void setUp() throws Exception - { - params = new ParameterMap(); - encoder = new PortletRequestEncoder(params); - } - - @Destroy - public void tearDown() throws Exception - { - params = null; - encoder = null; - } - - @Test - public void testEncodeRender() - { - _testEncodeRender(RENDER, PortletRequestDecoder.RENDER_MASK); - } - - @Test - public void testEncodeAction() - { - _testEncodeRender(ACTION, PortletRequestDecoder.ACTION_MASK); - } - - public void _testEncodeRender(int lifecycle, int lifecycleMask) - { - ParametersStateString pp = ParametersStateString.create(); - encode(pp, null, null, lifecycle); - assertEquals(1, params.size()); - _assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue(PortletRequestDecoder.META_PARAMETER, "foo"); - encode(pp, null, null, lifecycle); - assertEquals(1, params.size()); - _assertEquals(new String[]{Integer.toHexString(lifecycleMask),"foo"}, params.getValues(PortletRequestDecoder.META_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue("foo", "bar"); - encode(pp, null, null, lifecycle); - assertEquals(2, params.size()); - _assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals("bar", params.getValues("foo")); - - // - pp = ParametersStateString.create(); - encode(pp, Mode.VIEW, null, lifecycle); - assertEquals(2, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue(PortletRequestDecoder.MODE_PARAMETER, "foo"); - encode(pp, Mode.VIEW, null, lifecycle); - assertEquals(2, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(new String[]{Mode.VIEW.toString(),"foo"}, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue("foo", "bar"); - encode(pp, Mode.VIEW, null, lifecycle); - assertEquals(3, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - _assertEquals("bar", params.getValues("foo")); - - // - pp = ParametersStateString.create(); - encode(pp, null, WindowState.NORMAL, lifecycle); - assertEquals(2, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "foo"); - encode(pp, null, WindowState.NORMAL, lifecycle); - assertEquals(2, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(new String[]{WindowState.NORMAL.toString(),"foo"}, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue("foo", "bar"); - encode(pp, null, WindowState.NORMAL, lifecycle); - assertEquals(3, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - _assertEquals("bar", params.getValues("foo")); - - // - pp = ParametersStateString.create(); - encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); - assertEquals(3, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - - // - pp = ParametersStateString.create(); - pp.setValue("foo", "bar"); - encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); - assertEquals(4, params.size()); - _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - _assertEquals("bar", params.getValues("foo")); - } - - @Test - public void testEncodeNav() - { - encode(null, null, null, RENDER); - assertEquals(0, params.size()); - - // - encode(null, Mode.VIEW, null, RENDER); - assertEquals(1, params.size()); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - - // - encode(null, null, WindowState.NORMAL, RENDER); - assertEquals(1, params.size()); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - - // - encode(null, Mode.VIEW, WindowState.NORMAL, RENDER); - assertEquals(2, params.size()); - _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - } - - private void encode(ParametersStateString params, Mode view, WindowState normal, int lifecycle) - { - if (lifecycle == RENDER) - { - encoder.encodeRender(params, view, normal); - } - else if (lifecycle == ACTION) - { - encoder.encodeAction(null, params, view, normal); - } - else - { - fail(); - } - } - - void _assertEquals(int expected, String[] actual) - { - _assertEquals(new String[]{Integer.toHexString(expected)}, actual); - } - - void _assertEquals(Object expected, String[] actual) - { - _assertEquals(new String[]{"" + expected}, actual); - } - - void _assertEquals(String[] expected, String[] actual) - { - assertEquals(expected, actual); - } -} Modified: modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml =================================================================== --- modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml 2008-04-14 13:48:45 UTC (rev 10581) +++ modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml 2008-04-14 16:33:27 UTC (rev 10582) @@ -20,12 +20,6 @@ <class name="org.jboss.portal.test.portlet.state.StateConverterV0TestCase"/> </test> <test> - <class name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/> - </test> - <test> - <class name="org.jboss.portal.test.portlet.PortletRequestEncoderTestCase"/> - </test> - <test> <class name="org.jboss.portal.test.portlet.ParametersTestCase"/> </test> <test>

18 years

1
0
0 / 0

JBoss Portal SVN: r10581 - in modules/web/trunk/web/src/main/java/org/jboss/portal/web: impl and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 09:48:45 -0400 (Mon, 14 Apr 2008) New Revision: 10581 Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/Body.java modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/AbstractWebRequest.java Log: avoid to use ParameterMap when it is not useful Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/Body.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/Body.java 2008-04-14 13:44:29 UTC (rev 10580) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/Body.java 2008-04-14 13:48:45 UTC (rev 10581) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.web; -import org.jboss.portal.common.util.ParameterMap; - import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.io.BufferedReader; @@ -56,9 +54,9 @@ { /** . */ - private final ParameterMap parameters; + private final Map<String, String[]> parameters; - public Form(String characterEncoding, ParameterMap parameters) + public Form(String characterEncoding, Map<String, String[]> parameters) { super(characterEncoding); Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/AbstractWebRequest.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/AbstractWebRequest.java 2008-04-14 13:44:29 UTC (rev 10580) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/AbstractWebRequest.java 2008-04-14 13:48:45 UTC (rev 10581) @@ -23,7 +23,6 @@ package org.jboss.portal.web.impl; import org.jboss.portal.common.http.QueryStringParser; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.net.media.ContentType; import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.web.Body; @@ -34,6 +33,7 @@ import javax.servlet.http.HttpServletRequestWrapper; import java.util.Map; import java.util.Collections; +import java.util.HashMap; import java.nio.charset.Charset; import java.io.UnsupportedEncodingException; @@ -130,7 +130,7 @@ } // - ParameterMap bodyParameterMap = new ParameterMap(); + Map<String, String[]> bodyParameterMap = new HashMap<String, String[]>(); for (Map.Entry<String, String[]> entry : ((Map<String, String[]>)req.getParameterMap()).entrySet()) { // Get param name

18 years

1
0
0 / 0

JBoss Portal SVN: r10580 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/impl/state and 7 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 09:44:29 -0400 (Mon, 14 Apr 2008) New Revision: 10580 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.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/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java Log: avoid to use ParameterMap in interfaces as it is really the implementation of a Map<String, String[]> that is very convenient. the framework should not force the client of the framework to use that type Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -311,7 +311,7 @@ } // - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; if (pageNavigationalState != null) { publicNS = pageNavigationalState.getPortletPublicNavigationalState(portletRequest.getWindowId()); @@ -347,7 +347,7 @@ } // - ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(event.getWindowId()); + Map<String, String[]> publicNS = pageNavigationalState.getPortletPublicNavigationalState(event.getWindowId()); // PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(event.getWindowId(), pageNavigationalState); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -38,6 +38,8 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import java.util.Map; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -62,7 +64,7 @@ Mode mode = null; WindowState windowState = null; PortletPageNavigationalState pageNavigationalState = null; - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; StateString portletNS = null; CacheLevel cacheability; Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -80,7 +80,7 @@ return windows.get(portletWindowId); } - public ParameterMap getPortletPublicNavigationalState(String portletWindowId) + public Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) { PortletInfo info = context.portletControllerContext.getPortletInfo(portletWindowId); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.state; -import org.jboss.portal.common.util.ParameterMap; - import javax.xml.namespace.QName; import java.util.Map; import java.util.Set; @@ -74,7 +72,7 @@ * @return the portlet public navigational state * @throws IllegalArgumentException if an argument is not valid */ - ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException; + Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException; /** * Update the public navigational state of a portlet window. The interpretation of what should be updated is left up Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -39,7 +39,6 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; -import org.jboss.portal.common.util.ParameterMap; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; @@ -135,7 +134,7 @@ } // - ParameterMap publicNS = null; + Map<String, String[]> publicNS = null; if (pageNavigationalState != null) { publicNS = pageNavigationalState.getPortletPublicNavigationalState(windowId); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -40,6 +40,7 @@ import org.jboss.portal.Mode; import java.io.Serializable; +import java.util.Map; /** * Cache markup on the portal. @@ -66,7 +67,7 @@ // StateString navigationalState = renderInvocation.getNavigationalState(); - ParameterMap publicNavigationalState = renderInvocation.getPublicNavigationalState(); + Map<String, String[]> publicNavigationalState = renderInvocation.getPublicNavigationalState(); WindowState windowState = renderInvocation.getWindowState(); Mode mode = renderInvocation.getMode(); @@ -79,7 +80,7 @@ // Check time validity for fragment boolean useEntry = false; StateString entryNavigationalState = cachedEntry.navigationalState; - ParameterMap entryPublicNavigationalState = cachedEntry.publicNavigationalState; + Map<String, String[]> entryPublicNavigationalState = cachedEntry.publicNavigationalState; // Then check nav state equality if (navigationalState == null) @@ -126,7 +127,9 @@ } else { - useEntry = publicNavigationalState.equals(entryPublicNavigationalState); + ParameterMap publicPM = ParameterMap.wrap(publicNavigationalState); + ParameterMap entryPM = ParameterMap.wrap(entryPublicNavigationalState); + useEntry = publicPM.equals(entryPM); } } @@ -243,7 +246,7 @@ private final Mode mode; /** . */ - private final ParameterMap publicNavigationalState; + private final Map<String, String[]> publicNavigationalState; /** The timed content. */ private final ContentRef contentRef; @@ -256,7 +259,7 @@ public CacheEntry( StateString navigationalState, - ParameterMap publicNavigationalState, + Map<String, String[]> publicNavigationalState, WindowState windowState, Mode mode, ContentResponse content, Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -196,7 +196,7 @@ return publicParameters; } - protected static ParameterMap safeBuildPublicParameters(NavigationInfo navigationInfo, ParameterMap publicNavigationalParameters) + protected static ParameterMap safeBuildPublicParameters(NavigationInfo navigationInfo, Map<String, String[]> publicNavigationalParameters) { if (publicNavigationalParameters != null) { 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-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -24,7 +24,6 @@ import org.jboss.portal.common.invocation.Invocation; import org.jboss.portal.common.invocation.Scope; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.PortalContext; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -63,7 +62,7 @@ protected StateString navigationalState; /** . */ - protected ParameterMap publicNavigationalState; + protected Map<String, String[]> publicNavigationalState; /** . */ protected Mode mode; @@ -189,12 +188,12 @@ this.navigationalState = navigationalState; } - public ParameterMap getPublicNavigationalState() + public Map<String, String[]> getPublicNavigationalState() { return publicNavigationalState; } - public void setPublicNavigationalState(ParameterMap publicNavigationalState) + public void setPublicNavigationalState(Map<String, String[]> publicNavigationalState) { this.publicNavigationalState = publicNavigationalState; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -26,7 +26,6 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MultiValuedPropertyMap; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -55,6 +54,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -168,7 +168,7 @@ } // - ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); + Map<String, String[]> publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); RenderInvocation render = createRenderInvocation(context, properties, pageNavigationalState, portlet, windowNS, mode, windowState, portletNS, publicNS); @@ -216,7 +216,7 @@ Mode mode, WindowState windowState, StateString portletNS, - ParameterMap publicNS) + Map<String, String[]> publicNS) { HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java 2008-04-14 13:22:19 UTC (rev 10579) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java 2008-04-14 13:44:29 UTC (rev 10580) @@ -24,7 +24,6 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; -import org.jboss.portal.common.util.ParameterMap; import javax.xml.namespace.QName; import java.util.Map; @@ -69,7 +68,7 @@ defaultState.setPortletWindowNavigationalState(portletWindowId, portletWindowState); } - public ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException + public Map<String, String[]> getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException { return defaultState.getPortletPublicNavigationalState(portletWindowId); }

18 years

1
0
0 / 0

JBoss Portal SVN: r10579 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/request and 3 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 09:22:19 -0400 (Mon, 14 Apr 2008) New Revision: 10579 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java Log: avoid to use ParameterMap in interfaces as it is really the implementation of a Map<String, String[]> that is very convenient. the framework should not force the client of the framework to use that type Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -32,7 +32,6 @@ import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.common.util.Base64; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.io.SerializationFilter; import org.jboss.portal.common.io.Serialization; @@ -107,7 +106,7 @@ String resourceId = req.getParameter(ControllerRequestParameterNames.RESOURCE_ID); // - ParameterMap formParameters = null; + Map<String, String[]> formParameters = null; if (req.getBody() instanceof Body.Form) { formParameters = ((Body.Form)req.getBody()).getParameters(); @@ -145,7 +144,7 @@ { if (ControllerRequestParameterNames.ACTION_PHASE.equals(phase)) { - ParameterMap formParameters = null; + Map<String, String[]> formParameters = null; if (req.getBody() instanceof Body.Form) { formParameters = ((Body.Form)req.getBody()).getParameters(); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -22,11 +22,12 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ @@ -38,7 +39,7 @@ private final StateString interactionState; /** . */ - private final ParameterMap bodyParameters; + private final Map<String, String[]> bodyParameters; /** * Build a new portlet action request. @@ -53,7 +54,7 @@ public PortletActionRequest( String windowId, StateString interactionState, - ParameterMap bodyParameters, + Map<String, String[]> bodyParameters, PortletWindowNavigationalState windowNavigationalState, PortletPageNavigationalState pageNavigationalState) throws IllegalArgumentException { @@ -75,7 +76,7 @@ return interactionState; } - public ParameterMap getBodyParameters() + public Map<String, String[]> getBodyParameters() { return bodyParameters; } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -22,12 +22,13 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.cache.CacheLevel; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ @@ -42,7 +43,7 @@ private final StateString resourceState; /** . */ - private final ParameterMap bodyParameters; + private final Map<String, String[]> bodyParameters; /** . */ private final Scope scope; @@ -61,7 +62,7 @@ String windowId, String resourceId, StateString resourceState, - ParameterMap bodyParameters, + Map<String, String[]> bodyParameters, Scope scope) throws IllegalArgumentException { super(windowId); @@ -103,7 +104,7 @@ return resourceState; } - public ParameterMap getBodyParameters() + public Map<String, String[]> getBodyParameters() { return bodyParameters; } 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-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -33,7 +33,6 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.io.DataOutputStream; -import java.io.InputStream; import java.io.DataInputStream; import java.util.HashMap; import java.util.Map; @@ -323,7 +322,7 @@ * * @return the parameter object */ - public ParameterMap getParameters() + public Map<String, String[]> getParameters() { return parameters; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -33,6 +33,7 @@ import org.jboss.portal.portlet.info.NavigationInfo; import java.util.Iterator; +import java.util.Map; /** * The main responsibility of this class is to combine the different parameter sources (private navigational state, @@ -76,13 +77,16 @@ ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo, invocation.getPublicNavigationalState()); // Get render parameters - ParameterMap privateParameters = safeBuildParameters(invocation.getNavigationalState()); + Map<String, String[]> privateParameters = safeBuildParameters(invocation.getNavigationalState()); // Build combined map - ParameterMap parameters = safeCombine(privateParameters, publicParameters); + Map<String, String[]> parameters = safeCombine(privateParameters, publicParameters); // - return new PortletRequestParameterMap(parameters, privateParameters, publicParameters); + return new PortletRequestParameterMap( + parameters, + privateParameters, + publicParameters); } public static PortletRequestParameterMap create(NavigationInfo navigationInfo, RenderInvocation context) @@ -91,13 +95,16 @@ ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo, context.getPublicNavigationalState()); // Get render parameters - ParameterMap privateParameters = safeBuildParameters(context.getNavigationalState()); + Map<String, String[]> privateParameters = safeBuildParameters(context.getNavigationalState()); // Build combined map - ParameterMap parameters = safeCombine(privateParameters, publicParameters); + Map<String, String[]> parameters = safeCombine(privateParameters, publicParameters); // - return new PortletRequestParameterMap(parameters, privateParameters, publicParameters); + return new PortletRequestParameterMap( + parameters, + privateParameters, + publicParameters); } /** @@ -115,16 +122,19 @@ ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo, invocation.getPublicNavigationalState()); // The private parameters - ParameterMap privateParameters = safeBuildParameters(invocation.getInteractionState()); + Map<String, String[]> privateParameters = safeBuildParameters(invocation.getInteractionState()); // Combine form if we have one privateParameters = safeCombine(privateParameters, invocation.getForm()); // Combine to get shared map - ParameterMap parameters = safeCombine(privateParameters, publicParameters); + Map<String, String[]> parameters = safeCombine(privateParameters, publicParameters); // - return new PortletRequestParameterMap(parameters, privateParameters, publicParameters); + return new PortletRequestParameterMap( + parameters, + privateParameters, + publicParameters); } /** . */ @@ -137,27 +147,38 @@ protected final ParameterMap publicParameters; protected PortletRequestParameterMap( - ParameterMap parameters, - ParameterMap privateParameters, - ParameterMap publicParameters) + Map<String, String[]> parameters, + Map<String, String[]> privateParameters, + Map<String, String[]> publicParameters) { if (privateParameters != null) { - privateParameters = privateParameters.as(COPY_MODE); + this.privateParameters = ParameterMap.wrap(privateParameters, COPY_MODE); } + else + { + this.privateParameters = null; + } + + // if (publicParameters != null) { - publicParameters = publicParameters.as(COPY_MODE); + this.publicParameters = ParameterMap.wrap(publicParameters, COPY_MODE); } - if (parameters != null) + else { - parameters = parameters.as(COPY_MODE); + this.publicParameters = null; } // - this.parameters = parameters; - this.privateParameters = privateParameters; - this.publicParameters = publicParameters; + if (parameters != null) + { + this.parameters = ParameterMap.wrap(parameters, COPY_MODE); + } + else + { + this.parameters = null; + } } public ParameterMap getParameters() @@ -201,7 +222,7 @@ } } - protected static ParameterMap safeBuildParameters(StateString stateString) + protected static Map<String, String[]> safeBuildParameters(StateString stateString) { if (stateString != null) { @@ -213,7 +234,7 @@ } } - protected static ParameterMap safeCombine(ParameterMap privateParameters, ParameterMap publicParameters) + protected static Map<String, String[]> safeCombine(Map<String, String[]> privateParameters, Map<String, String[]> publicParameters) { if (publicParameters != null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -26,6 +26,8 @@ import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.invocation.ResourceInvocation; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ @@ -37,21 +39,22 @@ protected final ParameterMap privateRenderParameters; protected ResourceRequestParameterMap( - ParameterMap parameters, - ParameterMap privateParameters, - ParameterMap publicParameters, - ParameterMap privateRenderParameters) + Map<String, String[]> parameters, + Map<String, String[]> privateParameters, + Map<String, String[]> publicParameters, + Map<String, String[]> privateRenderParameters) { super(parameters, privateParameters, publicParameters); // if (privateRenderParameters != null) { - privateRenderParameters = privateRenderParameters.as(COPY_MODE); + this.privateRenderParameters = ParameterMap.wrap(privateRenderParameters, COPY_MODE); } - - // - this.privateRenderParameters = privateRenderParameters; + else + { + this.privateRenderParameters = null; + } } public ParameterMap getPrivateRenderParameters() @@ -76,10 +79,10 @@ ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo, invocation.getPublicNavigationalState()); // Combine private render parameters if any - ParameterMap privateRenderParameters = safeBuildParameters(invocation.getNavigationalState()); + Map<String, String[]> privateRenderParameters = safeBuildParameters(invocation.getNavigationalState()); // The private parameters - ParameterMap privateParameters = safeBuildParameters(invocation.getResourceState()); + Map<String, String[]> privateParameters = safeBuildParameters(invocation.getResourceState()); // Combine form if we have one privateParameters = safeCombine(privateParameters, invocation.getForm()); @@ -88,9 +91,13 @@ privateParameters = safeCombine(privateParameters, privateRenderParameters); // Combine to get shared map - ParameterMap parameters = safeCombine(privateParameters, publicParameters); + Map<String, String[]> parameters = safeCombine(privateParameters, publicParameters); // - return new ResourceRequestParameterMap(parameters, privateParameters, publicParameters, privateRenderParameters); + return new ResourceRequestParameterMap( + parameters, + privateParameters, + publicParameters, + privateRenderParameters); } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -25,8 +25,9 @@ import org.jboss.portal.portlet.spi.RequestContext; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.common.util.ParameterMap; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5448 $ @@ -41,7 +42,7 @@ protected StateString interactionState; /** . */ - protected ParameterMap form; + protected Map<String, String[]> form; public ActionInvocation(PortletInvocationContext ctx) throws IllegalArgumentException { @@ -58,12 +59,12 @@ this.interactionState = interactionState; } - public ParameterMap getForm() + public Map<String, String[]> getForm() { return form; } - public void setForm(ParameterMap form) + public void setForm(Map<String, String[]> form) { this.form = form; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2008-04-14 12:39:36 UTC (rev 10578) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2008-04-14 13:22:19 UTC (rev 10579) @@ -26,8 +26,9 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.common.util.ParameterMap; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ @@ -48,7 +49,7 @@ private StateString resourceState; /** . */ - private ParameterMap form; + private Map<String, String[]> form; /** . */ private CacheLevel cacheLevel; @@ -88,12 +89,12 @@ this.resourceState = resourceState; } - public ParameterMap getForm() + public Map<String, String[]> getForm() { return form; } - public void setForm(ParameterMap form) + public void setForm(Map<String, String[]> form) { this.form = form; }

18 years

1
0
0 / 0

JBoss Portal SVN: r10578 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/event and 14 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-14 08:39:36 -0400 (Mon, 14 Apr 2008) New Revision: 10578 Added: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/PortletWindowEvent.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java Removed: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalStateSerialization.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalState.java Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventPhaseContextImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventProduction.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventPhaseContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterMapFactory.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletEventRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalStateSerialization.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKStateControllerContext.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java Log: renamed Window terms to PortletWindow to be more precise in the portlet controller module Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.apache.log4j.Logger; @@ -40,7 +40,7 @@ /** . */ private final Logger log = Logger.getLogger(EventControllerContextSafeInvoker.class); - public boolean eventProduced(EventControllerContext controllerContext, EventPhaseContext phaseContext, Event sourceEvent, Event producedEvent) + public boolean eventProduced(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent sourceEvent, PortletWindowEvent producedEvent) { try { @@ -59,7 +59,7 @@ } } - public boolean eventConsumed(EventControllerContext controllerContext, EventPhaseContext phaseContext, Event consumedEvent, PortletInvocationResponse consumerResponse) + public boolean eventConsumed(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { try { @@ -77,7 +77,7 @@ } } - public boolean eventFailed(EventControllerContext controllerContext, EventPhaseContext phaseContext, Event failedEvent, Throwable throwable) + public boolean eventFailed(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent failedEvent, Throwable throwable) { try { @@ -95,7 +95,7 @@ } } - public boolean eventDiscarded(EventControllerContext controllerContext, EventPhaseContext phaseContext, Event discardedEvent, int cause) + public boolean eventDiscarded(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent discardedEvent, int cause) { try { Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventPhaseContextImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventPhaseContextImpl.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventPhaseContextImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.controller; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.apache.log4j.Logger; import java.util.LinkedList; @@ -51,7 +51,7 @@ LinkedList<EventProduction> producedEvents; /** . */ - LinkedList<Event> toConsumeEvents; + LinkedList<PortletWindowEvent> toConsumeEvents; /** . */ int consumedEventSize; @@ -66,13 +66,13 @@ { this.log = log; this.producedEvents = new LinkedList<EventProduction>(); - this.toConsumeEvents = new LinkedList<Event>(); + this.toConsumeEvents = new LinkedList<PortletWindowEvent>(); this.consumedEventSize = 0; this.producedEventSize = 0; this.mode = READ_MODE; } - public void queueEvent(Event event) + public void queueEvent(PortletWindowEvent event) { if (mode == INTERRUPTED_MODE) { Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventProduction.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventProduction.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventProduction.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -32,23 +32,23 @@ { /** . */ - private final Event consumedEvent; + private final PortletWindowEvent consumedEvent; /** . */ - private final Event producedEvent; + private final PortletWindowEvent producedEvent; - EventProduction(Event consumedEvent, Event producedEvent) + EventProduction(PortletWindowEvent consumedEvent, PortletWindowEvent producedEvent) { this.consumedEvent = consumedEvent; this.producedEvent = producedEvent; } - public Event getConsumedEvent() + public PortletWindowEvent getConsumedEvent() { return consumedEvent; } - public Event getProducedEvent() + public PortletWindowEvent getProducedEvent() { return producedEvent; } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; @@ -33,10 +33,7 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import javax.servlet.ServletContext; import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -63,7 +60,7 @@ * @param pageNavigationalState * @return */ - PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState); + PortletInvocationContext createPortletInvocationContext(String windowId, PortletPageNavigationalState pageNavigationalState); PortletInvocationResponse invoke( ActionInvocation actionInvocation) throws PortletInvokerException; Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -29,7 +29,7 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; @@ -37,9 +37,9 @@ import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -76,14 +76,14 @@ // The page navigational state we will operate on during the request // Either we have nothing in the request so we create a new one // Or we have one but we copy it as we should not modify the input state provided - PageNavigationalState pageNavigationalState = portletRequest.getPageNavigationalState(); + PortletPageNavigationalState pageNavigationalState = portletRequest.getPageNavigationalState(); if (pageNavigationalState == null) { - pageNavigationalState = stateContext.createPageNavigationalState(true); + pageNavigationalState = stateContext.createPortletPageNavigationalState(true); } else { - pageNavigationalState = stateContext.clonePageNavigationalState(pageNavigationalState, true); + pageNavigationalState = stateContext.clonePortletPageNavigationalState(pageNavigationalState, true); } // @@ -113,7 +113,7 @@ // Feed session it with the events that may have been produced for (UpdateNavigationalStateResponse.Event portletEvent : stateResponse.getEvents()) { - Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletRequest.getWindowId()); + PortletWindowEvent producedEvent = new PortletWindowEvent(portletEvent.getName(), portletEvent.getPayload(), portletRequest.getWindowId()); phaseContext.producedEvents.add(new EventProduction(null, producedEvent)); } @@ -124,7 +124,7 @@ while (phaseContext.producedEvents.size() > 0) { EventProduction eventProduction = phaseContext.producedEvents.removeFirst(); - Event producedEvent = eventProduction.getProducedEvent(); + PortletWindowEvent producedEvent = eventProduction.getProducedEvent(); // String producerId = producedEvent.getWindowId(); @@ -180,7 +180,7 @@ // while (phaseContext.toConsumeEvents.size() > 0) { - Event toConsumeEvent = phaseContext.toConsumeEvents.removeFirst(); + PortletWindowEvent toConsumeEvent = phaseContext.toConsumeEvents.removeFirst(); String consumedId = toConsumeEvent.getWindowId(); // @@ -243,7 +243,7 @@ // Add events to source event queue for (UpdateNavigationalStateResponse.Event portletEvent : eventStateResponse.getEvents()) { - Event toRouteEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), toConsumeEvent.getWindowId()); + PortletWindowEvent toRouteEvent = new PortletWindowEvent(portletEvent.getName(), portletEvent.getPayload(), toConsumeEvent.getWindowId()); phaseContext.producedEvents.add(new EventProduction(toConsumeEvent, toRouteEvent)); } @@ -294,7 +294,7 @@ PortletActionRequest portletActionRequest = (PortletActionRequest)portletRequest; // - PageNavigationalState pageNavigationalState = portletActionRequest.getPageNavigationalState(); + PortletPageNavigationalState pageNavigationalState = portletActionRequest.getPageNavigationalState(); // Mode mode = portletActionRequest.getWindowNavigationalState().getMode(); @@ -314,7 +314,7 @@ ParameterMap publicNS = null; if (pageNavigationalState != null) { - publicNS = pageNavigationalState.getPublicNavigationalState(portletRequest.getWindowId()); + publicNS = pageNavigationalState.getPortletPublicNavigationalState(portletRequest.getWindowId()); } PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(portletRequest.getWindowId(), pageNavigationalState); @@ -334,20 +334,20 @@ } private PortletInvocationResponse deliverEvent( - PortletControllerContext context, Event event, - PageNavigationalState pageNavigationalState, + PortletControllerContext context, PortletWindowEvent event, + PortletPageNavigationalState pageNavigationalState, List<Cookie> requestCookies) throws PortletInvokerException { - WindowNavigationalState windowNS = pageNavigationalState.getWindowNavigationalState(event.getWindowId()); + PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(event.getWindowId()); // if (windowNS == null) { - windowNS = new WindowNavigationalState(); + windowNS = new PortletWindowNavigationalState(); } // - ParameterMap publicNS = pageNavigationalState.getPublicNavigationalState(event.getWindowId()); + ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(event.getWindowId()); // PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(event.getWindowId(), pageNavigationalState); @@ -369,15 +369,15 @@ PortletControllerContext context, String windowId, UpdateNavigationalStateResponse update, - PageNavigationalState pageNavigationalState) + PortletPageNavigationalState pageNavigationalState) throws PortletInvokerException { - WindowNavigationalState windowNS = pageNavigationalState.getWindowNavigationalState(windowId); + PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); // if (windowNS == null) { - windowNS = new WindowNavigationalState(); + windowNS = new PortletWindowNavigationalState(); } // @@ -396,14 +396,14 @@ { portletNS = update.getNavigationalState(); } - windowNS = new WindowNavigationalState(portletNS, mode, windowState); - pageNavigationalState.setWindowNavigationalState(windowId, windowNS); + windowNS = new PortletWindowNavigationalState(portletNS, mode, windowState); + pageNavigationalState.setPortletWindowNavigationalState(windowId, windowNS); // Now update shared state scoped at page Map<String, String[]> publicNS = update.getPublicNavigationalStateUpdates(); if (publicNS != null) { - pageNavigationalState.setPublicNavigationalState(windowId, publicNS); + pageNavigationalState.setPortletPublicNavigationalState(windowId, publicNS); } } } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -35,8 +35,8 @@ import org.jboss.portal.portlet.controller.request.PortletResourceRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -61,7 +61,7 @@ // Mode mode = null; WindowState windowState = null; - PageNavigationalState pageNavigationalState = null; + PortletPageNavigationalState pageNavigationalState = null; ParameterMap publicNS = null; StateString portletNS = null; CacheLevel cacheability; @@ -72,7 +72,7 @@ if (scope instanceof PortletResourceRequest.PortletScope) { PortletResourceRequest.PortletScope portletScope = (PortletResourceRequest.PortletScope)scope; - WindowNavigationalState navigationalState = portletScope.getWindowNavigationalState(); + PortletWindowNavigationalState navigationalState = portletScope.getWindowNavigationalState(); // if (navigationalState != null) @@ -92,7 +92,7 @@ // if (pageNavigationalState != null) { - publicNS = pageNavigationalState.getPublicNavigationalState(portletResourceRequest.getWindowId()); + publicNS = pageNavigationalState.getPortletPublicNavigationalState(portletResourceRequest.getWindowId()); } } else Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -32,19 +32,19 @@ */ public class AbstractEventControllerContext implements EventControllerContext { - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { } - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { } - public void eventFailed(EventPhaseContext context, Event consumedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent consumedEvent, Throwable throwable) { } - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { } } Deleted: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,91 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.controller.event; - -import javax.xml.namespace.QName; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; - -/** - * An event associated with a portlet window. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class Event -{ - - private static final AtomicLong generator = new AtomicLong(); - - /** . */ - private final QName name; - - /** . */ - private final Serializable payload; - - /** . */ - private final String windowId; - - /** . */ - private final long serialNumber = generator.incrementAndGet(); - - public Event(QName name, Serializable payload, String windowId) - { - if (name == null) - { - throw new IllegalArgumentException(); - } - if (windowId == null) - { - throw new IllegalArgumentException(); - } - this.name = name; - this.payload = payload; - this.windowId = windowId; - } - - public QName getName() - { - return name; - } - - public Serializable getPayload() - { - return payload; - } - - public String getWindowId() - { - return windowId; - } - - public long getSerialNumber() - { - return serialNumber; - } - - public String toString() - { - return "Event[name=" + name + ",windowId=" + windowId + ",payload=" + payload + ",serialNumber=" + serialNumber + "]"; - } -} Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -70,7 +70,7 @@ * @param producedEvent the produced event * @param sourceEvent the source event */ - void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent); + void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent); /** * Context call back when an event is consumed by a portlet. The session argument @@ -87,7 +87,7 @@ * @param consumedEvent the consumed event * @param consumerResponse the consumer response */ - void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse); + void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse); /** * Context call back when an event failed to be delivered because the invoker threw an exception. @@ -104,7 +104,7 @@ * @param failedEvent the failed event * @param throwable the throwable */ - void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable); + void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable); /** * Context call back when an event is discarded by the controller for a specific reason. @@ -132,6 +132,6 @@ * @param discardedEvent the discarded event * @param cause the cause */ - void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause); + void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause); } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventPhaseContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventPhaseContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventPhaseContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -36,7 +36,7 @@ * @throws IllegalArgumentException if the event is null * @throws IllegalStateException if an event cannot be published */ - void queueEvent(Event event) throws IllegalArgumentException, IllegalStateException; + void queueEvent(PortletWindowEvent event) throws IllegalArgumentException, IllegalStateException; /** * Stop processing of all events and returns from the controller. Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/PortletWindowEvent.java (from rev 10533, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/PortletWindowEvent.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/PortletWindowEvent.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,91 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.event; + +import javax.xml.namespace.QName; +import java.io.Serializable; +import java.util.concurrent.atomic.AtomicLong; + +/** + * An event associated with a portlet window. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PortletWindowEvent +{ + + private static final AtomicLong generator = new AtomicLong(); + + /** . */ + private final QName name; + + /** . */ + private final Serializable payload; + + /** . */ + private final String windowId; + + /** . */ + private final long serialNumber = generator.incrementAndGet(); + + public PortletWindowEvent(QName name, Serializable payload, String windowId) + { + if (name == null) + { + throw new IllegalArgumentException(); + } + if (windowId == null) + { + throw new IllegalArgumentException(); + } + this.name = name; + this.payload = payload; + this.windowId = windowId; + } + + public QName getName() + { + return name; + } + + public Serializable getPayload() + { + return payload; + } + + public String getWindowId() + { + return windowId; + } + + public long getSerialNumber() + { + return serialNumber; + } + + public String toString() + { + return "Event[name=" + name + ",windowId=" + windowId + ",payload=" + payload + ",serialNumber=" + serialNumber + "]"; + } +} Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -29,7 +29,7 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; @@ -121,7 +121,7 @@ protected abstract PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException; - protected abstract Serialization<PageNavigationalState> getPageNavigationalStateSerialization(); + protected abstract Serialization<PortletPageNavigationalState> getPageNavigationalStateSerialization(); public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException { @@ -193,7 +193,7 @@ public PortletInvocationContext createPortletInvocationContext( String windowId, - PageNavigationalState pageNavigationalState) + PortletPageNavigationalState pageNavigationalState) { return new ControllerPortletInvocationContext(getPageNavigationalStateSerialization(), req, resp, windowId, pageNavigationalState, MARKUP_INFO); } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -30,7 +30,7 @@ import org.jboss.portal.common.io.Serialization; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -61,11 +61,11 @@ private final HttpServletResponse clientResponse; public ControllerPortletInvocationContext( - Serialization<PageNavigationalState> serialization, + Serialization<PortletPageNavigationalState> serialization, HttpServletRequest clientRequest, HttpServletResponse clientResponse, String windowId, - PageNavigationalState pageNavigationalState, + PortletPageNavigationalState pageNavigationalState, MarkupInfo markupInfo) { super(markupInfo); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -31,7 +31,7 @@ import org.jboss.portal.common.util.Base64; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterNames; import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterMapFactory; import static org.jboss.portal.portlet.controller.impl.URLParameterConstants.*; @@ -51,7 +51,7 @@ { /** . */ - final Serialization<PageNavigationalState> serialization; + final Serialization<PortletPageNavigationalState> serialization; /** . */ final HttpServletRequest clientReq; @@ -60,13 +60,13 @@ final HttpServletResponse clientResp; /** . */ - final PageNavigationalState pageNS; + final PortletPageNavigationalState pageNS; public PortletURLRenderer( - PageNavigationalState pageNS, + PortletPageNavigationalState pageNS, HttpServletRequest clientReq, HttpServletResponse clientResp, - Serialization<PageNavigationalState> serialization) + Serialization<PortletPageNavigationalState> serialization) { this.pageNS = pageNS; this.clientReq = clientReq; Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.info.PortletInfo; @@ -46,7 +46,7 @@ this.invoker = invoker; } - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { try { @@ -55,7 +55,7 @@ PortletInfo portletInfo = portlet.getInfo(); if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) { - Event distributedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext().getId()); + PortletWindowEvent distributedEvent = new PortletWindowEvent(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext().getId()); context.queueEvent(distributedEvent); } } @@ -67,15 +67,15 @@ } } - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { } - public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable) { } - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { } } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.impl.request; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; @@ -51,9 +51,9 @@ { /** . */ - private final Serialization<PageNavigationalState> serialization; + private final Serialization<PortletPageNavigationalState> serialization; - public ControllerRequestFactory(Serialization<PageNavigationalState> serialization) + public ControllerRequestFactory(Serialization<PortletPageNavigationalState> serialization) { this.serialization = serialization; } @@ -63,7 +63,7 @@ // The nav state provided with the request // Unmarshall portal navigational state if it is provided - PageNavigationalState pageNavigationalState = null; + PortletPageNavigationalState pageNavigationalState = null; String context = req.getParameter(ControllerRequestParameterNames.PAGE_NAVIGATIONAL_STATE); if (context != null) { @@ -97,7 +97,7 @@ } // - WindowNavigationalState windowNavigationalState = new WindowNavigationalState(navigationalState, mode, windowState); + PortletWindowNavigationalState windowNavigationalState = new PortletWindowNavigationalState(navigationalState, mode, windowState); // String phase = req.getParameter(ControllerRequestParameterNames.LIFECYCLE_PHASE); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterMapFactory.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterMapFactory.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterMapFactory.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.impl.request; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.RenderURL; @@ -46,14 +46,14 @@ { /** . */ - private final Serialization<PageNavigationalState> serialization; + private final Serialization<PortletPageNavigationalState> serialization; - public ControllerRequestParameterMapFactory(Serialization<PageNavigationalState> serialization) + public ControllerRequestParameterMapFactory(Serialization<PortletPageNavigationalState> serialization) { this.serialization = serialization; } - public Map<String, String> blah(PageNavigationalState pageNS, String windowId, ContainerURL containerURL) + public Map<String, String> blah(PortletPageNavigationalState pageNS, String windowId, ContainerURL containerURL) { Map<String, String> parameters = new HashMap<String, String>(); Deleted: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,195 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.controller.impl.state; - -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.info.ParameterInfo; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.NavigationInfo; - -import javax.xml.namespace.QName; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PageNavigationalStateImpl implements PageNavigationalState, Serializable -{ - - /** . */ - protected final StateControllerContextImpl context; - - /** . */ - protected final Map<String, WindowNavigationalState> windows; - - /** . */ - protected final Map<QName, String[]> page; - - /** . */ - private final boolean modifiable; - - protected PageNavigationalStateImpl(StateControllerContextImpl context, boolean modifiable) - { - this.context = context; - this.windows = new HashMap<String, WindowNavigationalState>(); - this.page = new HashMap<QName, String[]>(); - this.modifiable = modifiable; - } - - public PageNavigationalStateImpl(PageNavigationalStateImpl original, boolean modifiable) - { - this.context = original.context; - this.windows = new HashMap<String, WindowNavigationalState>(original.windows); - this.page = new HashMap<QName, String[]>(original.page); - this.modifiable = modifiable; - } - - public Set<String> getWindowIds() - { - return windows.keySet(); - } - - public WindowNavigationalState getWindowNavigationalState(String windowId) - { - return windows.get(windowId); - } - - public ParameterMap getPublicNavigationalState(String windowId) - { - PortletInfo info = context.portletControllerContext.getPortletInfo(windowId); - - // - if (info != null) - { - ParameterMap publicNavigationalState = new ParameterMap(); - for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters()) - { - String[] parameterValue = page.get(parameterInfo.getName()); - - // - if (parameterValue != null) - { - String parameterId = parameterInfo.getId(); - - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); - } - } - - // - return publicNavigationalState; - } - - // - return null; - } - - public Set<QName> getPublicNames() - { - return page.keySet(); - } - - public String[] getPublicNavigationalState(QName name) - { - String[] values = page.get(name); - return values != null ? values.clone() : null; - } - - public void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) - { - if (!modifiable) - { - throw new IllegalStateException("The page navigational state is not modifiable"); - } - - // - windows.put(windowId, windowState); - } - - public void setPublicNavigationalState(String windowId, Map<String, String[]> update) - { - if (!modifiable) - { - throw new IllegalStateException("The page navigational state is not modifiable"); - } - - // - PortletInfo info = context.portletControllerContext.getPortletInfo(windowId); - - // - if (info != null) - { - NavigationInfo navigationInfo = info.getNavigation(); - for (Map.Entry<String, String[]> entry : update.entrySet()) - { - String id = entry.getKey(); - - // - ParameterInfo parameterInfo = navigationInfo.getPublicParameter(id); - - // - if (parameterInfo != null) - { - QName name = parameterInfo.getName(); - String[] value = entry.getValue(); - if (value.length > 0) - { - setPublicNavigationalState(name, value); - } - else - { - removePublicNavigationalState(name); - } - } - } - } - } - - public void setPublicNavigationalState(QName name, String[] value) - { - if (!modifiable) - { - throw new IllegalStateException("The page navigational state is not modifiable"); - } - - // We clone the value in order to keep the state not mutated by a side effect - page.put(name, value.clone()); - } - - public void removePublicNavigationalState(QName name) - { - if (!modifiable) - { - throw new IllegalStateException("The page navigational state is not modifiable"); - } - - // - page.remove(name); - } -} \ No newline at end of file Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java (from rev 10534, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,195 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.impl.state; + +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.info.NavigationInfo; + +import javax.xml.namespace.QName; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortletPageNavigationalStateImpl implements PortletPageNavigationalState, Serializable +{ + + /** . */ + protected final StateControllerContextImpl context; + + /** . */ + protected final Map<String, PortletWindowNavigationalState> windows; + + /** . */ + protected final Map<QName, String[]> page; + + /** . */ + private final boolean modifiable; + + protected PortletPageNavigationalStateImpl(StateControllerContextImpl context, boolean modifiable) + { + this.context = context; + this.windows = new HashMap<String, PortletWindowNavigationalState>(); + this.page = new HashMap<QName, String[]>(); + this.modifiable = modifiable; + } + + public PortletPageNavigationalStateImpl(PortletPageNavigationalStateImpl original, boolean modifiable) + { + this.context = original.context; + this.windows = new HashMap<String, PortletWindowNavigationalState>(original.windows); + this.page = new HashMap<QName, String[]>(original.page); + this.modifiable = modifiable; + } + + public Set<String> getPortletWindowIds() + { + return windows.keySet(); + } + + public PortletWindowNavigationalState getPortletWindowNavigationalState(String portletWindowId) + { + return windows.get(portletWindowId); + } + + public ParameterMap getPortletPublicNavigationalState(String portletWindowId) + { + PortletInfo info = context.portletControllerContext.getPortletInfo(portletWindowId); + + // + if (info != null) + { + ParameterMap publicNavigationalState = new ParameterMap(); + for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters()) + { + String[] parameterValue = page.get(parameterInfo.getName()); + + // + if (parameterValue != null) + { + String parameterId = parameterInfo.getId(); + + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } + } + + // + return publicNavigationalState; + } + + // + return null; + } + + public Set<QName> getPublicNames() + { + return page.keySet(); + } + + public String[] getPublicNavigationalState(QName name) + { + String[] values = page.get(name); + return values != null ? values.clone() : null; + } + + public void setPortletWindowNavigationalState(String portletWindowId, PortletWindowNavigationalState portletWindowState) + { + if (!modifiable) + { + throw new IllegalStateException("The page navigational state is not modifiable"); + } + + // + windows.put(portletWindowId, portletWindowState); + } + + public void setPortletPublicNavigationalState(String portletWindowId, Map<String, String[]> update) + { + if (!modifiable) + { + throw new IllegalStateException("The page navigational state is not modifiable"); + } + + // + PortletInfo info = context.portletControllerContext.getPortletInfo(portletWindowId); + + // + if (info != null) + { + NavigationInfo navigationInfo = info.getNavigation(); + for (Map.Entry<String, String[]> entry : update.entrySet()) + { + String id = entry.getKey(); + + // + ParameterInfo parameterInfo = navigationInfo.getPublicParameter(id); + + // + if (parameterInfo != null) + { + QName name = parameterInfo.getName(); + String[] value = entry.getValue(); + if (value.length > 0) + { + setPublicNavigationalState(name, value); + } + else + { + removePublicNavigationalState(name); + } + } + } + } + } + + public void setPublicNavigationalState(QName name, String[] value) + { + if (!modifiable) + { + throw new IllegalStateException("The page navigational state is not modifiable"); + } + + // We clone the value in order to keep the state not mutated by a side effect + page.put(name, value.clone()); + } + + public void removePublicNavigationalState(QName name) + { + if (!modifiable) + { + throw new IllegalStateException("The page navigational state is not modifiable"); + } + + // + page.remove(name); + } +} \ No newline at end of file Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.controller.impl.state; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; /** @@ -48,13 +48,13 @@ this.portletControllerContext = portletControllerContext; } - public PageNavigationalState clonePageNavigationalState(PageNavigationalState pageNavigationalState, boolean modifiable) + public PortletPageNavigationalState clonePortletPageNavigationalState(PortletPageNavigationalState portletPageNavigationalState, boolean modifiable) { - return new PageNavigationalStateImpl((PageNavigationalStateImpl)pageNavigationalState, modifiable); + return new PortletPageNavigationalStateImpl((PortletPageNavigationalStateImpl)portletPageNavigationalState, modifiable); } - public PageNavigationalState createPageNavigationalState(boolean modifiable) + public PortletPageNavigationalState createPortletPageNavigationalState(boolean modifiable) { - return new PageNavigationalStateImpl(this, modifiable); + return new PortletPageNavigationalStateImpl(this, modifiable); } } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -40,5 +40,5 @@ * * @return the page state */ - public abstract PageNavigationalState getPageNavigationalState(); + public abstract PortletPageNavigationalState getPageNavigationalState(); } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,8 +24,8 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -54,8 +54,8 @@ String windowId, StateString interactionState, ParameterMap bodyParameters, - WindowNavigationalState windowNavigationalState, - PageNavigationalState pageNavigationalState) throws IllegalArgumentException + PortletWindowNavigationalState windowNavigationalState, + PortletPageNavigationalState pageNavigationalState) throws IllegalArgumentException { super(windowId, windowNavigationalState, pageNavigationalState); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletEventRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletEventRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletEventRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import javax.xml.namespace.QName; import java.io.Serializable; @@ -46,8 +46,8 @@ public PortletEventRequest( String windowId, - WindowNavigationalState windowNavigationalState, - PageNavigationalState pageNavigationalState, + PortletWindowNavigationalState windowNavigationalState, + PortletPageNavigationalState pageNavigationalState, QName name, Serializable payload) { Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import java.util.Map; @@ -39,9 +39,9 @@ public PortletRenderRequest( String windowId, - WindowNavigationalState windowNavigationalState, + PortletWindowNavigationalState windowNavigationalState, Map<String, String[]> publicNavigationalStateChanges, - PageNavigationalState pageNavigationalState) + PortletPageNavigationalState pageNavigationalState) { super(windowId, windowNavigationalState, pageNavigationalState); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -33,15 +33,15 @@ { /** . */ - private final PageNavigationalState pageNavigationalState; + private final PortletPageNavigationalState pageNavigationalState; /** . */ - private final WindowNavigationalState windowNavigationalState; + private final PortletWindowNavigationalState windowNavigationalState; PortletRequest( String windowId, - WindowNavigationalState windowNavigationalState, - PageNavigationalState pageNavigationalState) + PortletWindowNavigationalState windowNavigationalState, + PortletPageNavigationalState pageNavigationalState) { super(windowId); @@ -50,12 +50,12 @@ this.pageNavigationalState = pageNavigationalState; } - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { return pageNavigationalState; } - public WindowNavigationalState getWindowNavigationalState() + public PortletWindowNavigationalState getWindowNavigationalState() { return windowNavigationalState; } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,8 +24,8 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.cache.CacheLevel; /** @@ -108,7 +108,7 @@ return bodyParameters; } - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { if (scope instanceof PageScope) { @@ -139,14 +139,14 @@ { /** . */ - private final WindowNavigationalState windowNavigationalState; + private final PortletWindowNavigationalState windowNavigationalState; - public PortletScope(WindowNavigationalState windowNavigationalState) + public PortletScope(PortletWindowNavigationalState windowNavigationalState) { this.windowNavigationalState = windowNavigationalState; } - public WindowNavigationalState getWindowNavigationalState() + public PortletWindowNavigationalState getWindowNavigationalState() { return windowNavigationalState; } @@ -161,9 +161,9 @@ { /** . */ - private final PageNavigationalState pageNavigationalState; + private final PortletPageNavigationalState pageNavigationalState; - public PageScope(WindowNavigationalState windowNavigationalState, PageNavigationalState pageNavigationalState) + public PageScope(PortletWindowNavigationalState windowNavigationalState, PortletPageNavigationalState pageNavigationalState) { super(windowNavigationalState); @@ -171,7 +171,7 @@ this.pageNavigationalState = pageNavigationalState; } - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { return pageNavigationalState; } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.response; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; @@ -37,12 +37,12 @@ private ResponseProperties properties; /** . */ - private PageNavigationalState pageNavigationalState; + private PortletPageNavigationalState pageNavigationalState; public PageUpdateResponse( UpdateNavigationalStateResponse update, ResponseProperties properties, - PageNavigationalState pageNavigationalState, + PortletPageNavigationalState pageNavigationalState, int eventCycleStatus) { super(update, eventCycleStatus); @@ -57,7 +57,7 @@ return properties; } - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { return pageNavigationalState; } Deleted: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,127 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.controller.state; - -import org.jboss.portal.common.util.ParameterMap; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.Set; - -/** - * Defines the page navigational state view that the controller needs to operate on. Its name begins with page - * however it does not mandate that the represented context to be a page. I.E it could represent a set - * of physical pages or something else. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface PageNavigationalState -{ - - /** - * Returns the window ids referenced. - * - * @return a set of window id - */ - Set<String> getWindowIds(); - - /** - * Returns the navigational state of a window or null if it does not exist. - * - * @param windowId the window - * @return the window navigational state - * @throws IllegalArgumentException if an argument is not valid - */ - WindowNavigationalState getWindowNavigationalState(String windowId) throws IllegalArgumentException; - - /** - * Update the navigational state of a window. - * - * @param windowId the window id - * @param windowState the window state - * @throws IllegalArgumentException if an argument is not valid - * @throws IllegalStateException if the page state is read only - */ - void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) throws IllegalArgumentException, IllegalStateException; - - /** - * Obtain the public navigational state of a window. The interpretation of what should be retrieved is left up to the - * implementor. An example of implementation would use the mapping between qnames and name provided by the referenced - * portlet info. - * - * @param windowId the window id - * @return the public navigational state - * @throws IllegalArgumentException if an argument is not valid - */ - ParameterMap getPublicNavigationalState(String windowId) throws IllegalArgumentException; - - /** - * Returns the set of public names. - * - * @return the public names - */ - Set<QName> getPublicNames(); - - /** - * Update the public navigational state of a window. The interpretation of what should be updated is left up to the - * implementor. An example of implementation would use the mapping between qname and name provided by the referenced - * portlet info. - * - * The update argument values with a length of zero should be treated as removals. - * - * @param windowId the window id - * @param update the updates - * @throws IllegalArgumentException if an argument is not valid - * @throws IllegalStateException if the page state is read only - */ - void setPublicNavigationalState(String windowId, Map<String, String[]> update) throws IllegalArgumentException, IllegalStateException; - - /** - * Returns a public navigational state entry or null if it is not found. - * - * @param name the name - * @return the entry value - * @throws IllegalArgumentException if an argument is not valid - */ - String[] getPublicNavigationalState(QName name) throws IllegalArgumentException; - - /** - * Sets a public navigational state entry. - * - * @param name the name - * @param value the new value - * @throws IllegalArgumentException if an argument is not valid - * @throws IllegalStateException if the page state is read only - */ - void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException; - - /** - * Removes a public navigational state entry. - * - * @param name the name - * @throws IllegalArgumentException if an argument is not valid - * @throws IllegalStateException if the page state is read only - */ - void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException; -} Deleted: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalStateSerialization.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalStateSerialization.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalStateSerialization.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,234 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.controller.state; - -import org.jboss.portal.common.io.Serialization; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; - -import javax.xml.namespace.QName; -import java.io.OutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.DataOutputStream; -import java.io.DataInputStream; -import java.util.Map; -import java.util.HashMap; -import java.util.Set; - -/** - * Implement serialization of a page navigational state in a compact manner. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class PageNavigationalStateSerialization implements Serialization<PageNavigationalState> -{ - - /** . */ - private static final Map<WindowState, Integer> windowStateToCode = new HashMap<WindowState, Integer>(); - - /** . */ - private static final Map<Mode, Integer> modeToCode = new HashMap<Mode, Integer>(); - - /** . */ - private static final Map<Integer, WindowState> codeToWindowState = new HashMap<Integer, WindowState>(); - - /** . */ - private static final Map<Integer, Mode> codeToMode = new HashMap<Integer, Mode>(); - - static - { - windowStateToCode.put(WindowState.NORMAL, 1); - windowStateToCode.put(WindowState.MINIMIZED, 2); - windowStateToCode.put(WindowState.MAXIMIZED, 3); - codeToWindowState.put(1, WindowState.NORMAL); - codeToWindowState.put(2, WindowState.MINIMIZED); - codeToWindowState.put(3, WindowState.MAXIMIZED); - modeToCode.put(Mode.VIEW, 1); - modeToCode.put(Mode.EDIT, 2); - modeToCode.put(Mode.HELP, 3); - codeToMode.put(1, Mode.VIEW); - codeToMode.put(2, Mode.EDIT); - codeToMode.put(3, Mode.HELP); - } - - /** . */ - private final StateControllerContext context; - - public PageNavigationalStateSerialization(StateControllerContext context) - { - if (context == null) - { - throw new IllegalArgumentException(); - } - this.context = context; - } - - public void serialize(PageNavigationalState pageNavigationalState, OutputStream out) throws IOException, IllegalArgumentException - { - DataOutputStream data = out instanceof DataOutputStream ? (DataOutputStream)out : new DataOutputStream(out); - - // - data.writeInt(pageNavigationalState.getWindowIds().size()); - for (String windowId : pageNavigationalState.getWindowIds()) - { - data.writeUTF(windowId); - WindowNavigationalState windowNS = pageNavigationalState.getWindowNavigationalState(windowId); - byte header = 0; - int decision = 0; - if (windowNS.getPortletNavigationalState() != null) - { - header |= 1; - decision |= 1; - } - if (windowNS.getWindowState() != null) - { - Integer value = windowStateToCode.get(windowNS.getWindowState()); - if (value != null) - { - header |= value << 1; - } - else - { - header |= 4 << 1; - decision |= 2; - } - } - if (windowNS.getMode() != null) - { - Integer value = modeToCode.get(windowNS.getMode()); - if (value != null) - { - header |= value << 4; - } - else - { - header |= 4 << 4; - decision |= 4; - } - } - data.writeByte(header); - if ((decision & 1) != 0) - { - windowNS.getPortletNavigationalState().writeTo(data); - } - if ((decision & 2) != 0) - { - data.writeUTF(windowNS.getWindowState().toString()); - } - if ((decision & 4) != 0) - { - data.writeUTF(windowNS.getMode().toString()); - } - } - - // - Set<QName> publicNames = pageNavigationalState.getPublicNames(); - data.writeInt(publicNames.size()); - for (QName name : pageNavigationalState.getPublicNames()) - { - data.writeUTF(name.getNamespaceURI()); - data.writeUTF(name.getLocalPart()); - String[] values = pageNavigationalState.getPublicNavigationalState(name); - int length = values.length; - data.writeInt(length); - for (String value : values) - { - data.writeUTF(value); - } - } - - // Need to flush before returning otherwise bytes may stay in the buffer when we allocated - // a data stream - data.flush(); - } - - public PageNavigationalState unserialize(InputStream in) throws IOException, IllegalArgumentException - { - DataInputStream data = in instanceof DataInputStream ? (DataInputStream)in : new DataInputStream(in); - - // - PageNavigationalState pageNS = context.createPageNavigationalState(true); - - // - int size = data.readInt(); - while (size-- > 0) - { - String windowId = data.readUTF(); - byte header = data.readByte(); - StateString portletNS = null; - if ((header & 1) != 0) - { - portletNS = ParametersStateString.create(data); - } - WindowState windowState = null; - int windowStateHeader = (header & (7 << 1)) >> 1; - switch (windowStateHeader) - { - case 0: - break; - case 4: - windowState = WindowState.create(data.readUTF()); - break; - default: - windowState = codeToWindowState.get(windowStateHeader); - } - Mode mode = null; - int modeStateHeader = (header & (7 << (1 + 3))) >> (1 + 3); - switch (modeStateHeader) - { - case 0: - break; - case 4: - mode = Mode.create(data.readUTF()); - break; - default: - mode = codeToMode.get(modeStateHeader); - } - WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, mode, windowState); - pageNS.setWindowNavigationalState(windowId, windowNS); - } - - // - size = data.readInt(); - while (size-- > 0) - { - String namespaceURI = data.readUTF(); - String localName = data.readUTF(); - QName name = new QName(namespaceURI, localName); - int length = data.readInt(); - String[] values = new String[length]; - for (int i = 0;i < length;i++) - { - values[i] = data.readUTF(); - } - pageNS.setPublicNavigationalState(name, values); - } - - // - return pageNS; - } -} Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java (from rev 10534, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,127 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.state; + +import org.jboss.portal.common.util.ParameterMap; + +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.Set; + +/** + * Defines the page navigational state view that the controller needs to operate on. Its name begins with page + * however it does not mandate that the represented context to be a page. I.E it could represent a set + * of physical pages or something else. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PortletPageNavigationalState +{ + + /** + * Returns the portlet window ids referenced. + * + * @return a set of window id + */ + Set<String> getPortletWindowIds(); + + /** + * Returns the navigational state of a portlet window or null if it does not exist. + * + * @param portletWindowId the portlet window id + * @return the portlet window navigational state + * @throws IllegalArgumentException if an argument is not valid + */ + PortletWindowNavigationalState getPortletWindowNavigationalState(String portletWindowId) throws IllegalArgumentException; + + /** + * Update the navigational state of a portlet window. + * + * @param portletWindowId the portlet window id + * @param portletWindowState the portlet window state + * @throws IllegalArgumentException if an argument is not valid + * @throws IllegalStateException if the page state is read only + */ + void setPortletWindowNavigationalState(String portletWindowId, PortletWindowNavigationalState portletWindowState) throws IllegalArgumentException, IllegalStateException; + + /** + * Obtain the public navigational state of a portlet window. The interpretation of what should be retrieved is left up + * to the implementor. An example of implementation would use the mapping between qnames and name provided by the + * referenced portlet info. + * + * @param portletWindowId the portlet window id + * @return the portlet public navigational state + * @throws IllegalArgumentException if an argument is not valid + */ + ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException; + + /** + * Update the public navigational state of a portlet window. The interpretation of what should be updated is left up + * to the implementor. An example of implementation would use the mapping between qname and name provided by the referenced + * portlet info. + * + * The update argument values with a length of zero should be treated as removals. + * + * @param portletWindowId the portlet window id + * @param update the updates + * @throws IllegalArgumentException if an argument is not valid + * @throws IllegalStateException if the page state is read only + */ + void setPortletPublicNavigationalState(String portletWindowId, Map<String, String[]> update) throws IllegalArgumentException, IllegalStateException; + + /** + * Returns the set of public names. + * + * @return the public names + */ + Set<QName> getPublicNames(); + + /** + * Returns a public navigational state entry or null if it is not found. + * + * @param name the name + * @return the entry value + * @throws IllegalArgumentException if an argument is not valid + */ + String[] getPublicNavigationalState(QName name) throws IllegalArgumentException; + + /** + * Sets a public navigational state entry. + * + * @param name the name + * @param value the new value + * @throws IllegalArgumentException if an argument is not valid + * @throws IllegalStateException if the page state is read only + */ + void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException; + + /** + * Removes a public navigational state entry. + * + * @param name the name + * @throws IllegalArgumentException if an argument is not valid + * @throws IllegalStateException if the page state is read only + */ + void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException; +} Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java (from rev 10533, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalStateSerialization.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,234 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.state; + +import org.jboss.portal.common.io.Serialization; +import org.jboss.portal.WindowState; +import org.jboss.portal.Mode; +import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.ParametersStateString; + +import javax.xml.namespace.QName; +import java.io.OutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.DataOutputStream; +import java.io.DataInputStream; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; + +/** + * Implement serialization of a page navigational state in a compact manner. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PortletPageNavigationalStateSerialization implements Serialization<PortletPageNavigationalState> +{ + + /** . */ + private static final Map<WindowState, Integer> windowStateToCode = new HashMap<WindowState, Integer>(); + + /** . */ + private static final Map<Mode, Integer> modeToCode = new HashMap<Mode, Integer>(); + + /** . */ + private static final Map<Integer, WindowState> codeToWindowState = new HashMap<Integer, WindowState>(); + + /** . */ + private static final Map<Integer, Mode> codeToMode = new HashMap<Integer, Mode>(); + + static + { + windowStateToCode.put(WindowState.NORMAL, 1); + windowStateToCode.put(WindowState.MINIMIZED, 2); + windowStateToCode.put(WindowState.MAXIMIZED, 3); + codeToWindowState.put(1, WindowState.NORMAL); + codeToWindowState.put(2, WindowState.MINIMIZED); + codeToWindowState.put(3, WindowState.MAXIMIZED); + modeToCode.put(Mode.VIEW, 1); + modeToCode.put(Mode.EDIT, 2); + modeToCode.put(Mode.HELP, 3); + codeToMode.put(1, Mode.VIEW); + codeToMode.put(2, Mode.EDIT); + codeToMode.put(3, Mode.HELP); + } + + /** . */ + private final StateControllerContext context; + + public PortletPageNavigationalStateSerialization(StateControllerContext context) + { + if (context == null) + { + throw new IllegalArgumentException(); + } + this.context = context; + } + + public void serialize(PortletPageNavigationalState pageNavigationalState, OutputStream out) throws IOException, IllegalArgumentException + { + DataOutputStream data = out instanceof DataOutputStream ? (DataOutputStream)out : new DataOutputStream(out); + + // + data.writeInt(pageNavigationalState.getPortletWindowIds().size()); + for (String windowId : pageNavigationalState.getPortletWindowIds()) + { + data.writeUTF(windowId); + PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); + byte header = 0; + int decision = 0; + if (windowNS.getPortletNavigationalState() != null) + { + header |= 1; + decision |= 1; + } + if (windowNS.getWindowState() != null) + { + Integer value = windowStateToCode.get(windowNS.getWindowState()); + if (value != null) + { + header |= value << 1; + } + else + { + header |= 4 << 1; + decision |= 2; + } + } + if (windowNS.getMode() != null) + { + Integer value = modeToCode.get(windowNS.getMode()); + if (value != null) + { + header |= value << 4; + } + else + { + header |= 4 << 4; + decision |= 4; + } + } + data.writeByte(header); + if ((decision & 1) != 0) + { + windowNS.getPortletNavigationalState().writeTo(data); + } + if ((decision & 2) != 0) + { + data.writeUTF(windowNS.getWindowState().toString()); + } + if ((decision & 4) != 0) + { + data.writeUTF(windowNS.getMode().toString()); + } + } + + // + Set<QName> publicNames = pageNavigationalState.getPublicNames(); + data.writeInt(publicNames.size()); + for (QName name : pageNavigationalState.getPublicNames()) + { + data.writeUTF(name.getNamespaceURI()); + data.writeUTF(name.getLocalPart()); + String[] values = pageNavigationalState.getPublicNavigationalState(name); + int length = values.length; + data.writeInt(length); + for (String value : values) + { + data.writeUTF(value); + } + } + + // Need to flush before returning otherwise bytes may stay in the buffer when we allocated + // a data stream + data.flush(); + } + + public PortletPageNavigationalState unserialize(InputStream in) throws IOException, IllegalArgumentException + { + DataInputStream data = in instanceof DataInputStream ? (DataInputStream)in : new DataInputStream(in); + + // + PortletPageNavigationalState pageNS = context.createPortletPageNavigationalState(true); + + // + int size = data.readInt(); + while (size-- > 0) + { + String windowId = data.readUTF(); + byte header = data.readByte(); + StateString portletNS = null; + if ((header & 1) != 0) + { + portletNS = ParametersStateString.create(data); + } + WindowState windowState = null; + int windowStateHeader = (header & (7 << 1)) >> 1; + switch (windowStateHeader) + { + case 0: + break; + case 4: + windowState = WindowState.create(data.readUTF()); + break; + default: + windowState = codeToWindowState.get(windowStateHeader); + } + Mode mode = null; + int modeStateHeader = (header & (7 << (1 + 3))) >> (1 + 3); + switch (modeStateHeader) + { + case 0: + break; + case 4: + mode = Mode.create(data.readUTF()); + break; + default: + mode = codeToMode.get(modeStateHeader); + } + PortletWindowNavigationalState windowNS = new PortletWindowNavigationalState(portletNS, mode, windowState); + pageNS.setPortletWindowNavigationalState(windowId, windowNS); + } + + // + size = data.readInt(); + while (size-- > 0) + { + String namespaceURI = data.readUTF(); + String localName = data.readUTF(); + QName name = new QName(namespaceURI, localName); + int length = data.readInt(); + String[] values = new String[length]; + for (int i = 0;i < length;i++) + { + values[i] = data.readUTF(); + } + pageNS.setPublicNavigationalState(name, values); + } + + // + return pageNS; + } +} Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java (from rev 10533, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,78 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.state; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.StateString; + +import java.io.Serializable; + +/** + * The navigational state of a window that contains the portlet navigational state, the mode and window state. + * This class is immutable. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortletWindowNavigationalState implements Serializable +{ + + /** . */ + private final StateString portletNavigationalState; + + /** . */ + private final Mode mode; + + /** . */ + private final WindowState windowState; + + public PortletWindowNavigationalState() + { + this.portletNavigationalState = null; + this.mode = Mode.VIEW; + this.windowState = WindowState.NORMAL; + } + + public PortletWindowNavigationalState(StateString portletNavigationalState, Mode mode, WindowState windowState) + { + this.portletNavigationalState = portletNavigationalState; + this.mode = mode; + this.windowState = windowState; + } + + public StateString getPortletNavigationalState() + { + return portletNavigationalState; + } + + public Mode getMode() + { + return mode; + } + + public WindowState getWindowState() + { + return windowState; + } +} Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -34,18 +34,20 @@ /** * Clone an existing page state object. * - * @param pageNavigationalState the page navigational state - * @param modifiable set the modifiable status @return the page state clone - * @return the cloned page navigational state + * @param portletPageNavigationalState the portlet page navigational state + * @param modifiable set the modifiable status + * @return the page state clone @return the cloned page navigational state */ - PageNavigationalState clonePageNavigationalState(PageNavigationalState pageNavigationalState, boolean modifiable); + PortletPageNavigationalState clonePortletPageNavigationalState( + PortletPageNavigationalState portletPageNavigationalState, + boolean modifiable); /** - * Create a new page state object. + * Create a new portlet page state object. * * @param modifiable set the modifiable status - * @return the new page state + * @return the new portlet page state */ - PageNavigationalState createPageNavigationalState(boolean modifiable); + PortletPageNavigationalState createPortletPageNavigationalState(boolean modifiable); } Deleted: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,78 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.controller.state; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.StateString; - -import java.io.Serializable; - -/** - * The navigational state of a window that contains the portlet navigational state, the mode and window state. - * This class is immutable. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class WindowNavigationalState implements Serializable -{ - - /** . */ - private final StateString portletNavigationalState; - - /** . */ - private final Mode mode; - - /** . */ - private final WindowState windowState; - - public WindowNavigationalState() - { - this.portletNavigationalState = null; - this.mode = Mode.VIEW; - this.windowState = WindowState.NORMAL; - } - - public WindowNavigationalState(StateString portletNavigationalState, Mode mode, WindowState windowState) - { - this.portletNavigationalState = portletNavigationalState; - this.mode = mode; - this.windowState = windowState; - } - - public StateString getPortletNavigationalState() - { - return portletNavigationalState; - } - - public Mode getMode() - { - return mode; - } - - public WindowState getWindowState() - { - return windowState; - } -} Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.support.PortletSupport; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.AbstractEventControllerContext; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; @@ -97,7 +97,7 @@ { WiringEventControllerContext ecc = new WiringEventControllerContext() { - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { called = true; throw new RuntimeException(); @@ -119,7 +119,7 @@ final Error error = new Error(); ecc = new WiringEventControllerContext() { - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { called = true; throw error; @@ -148,7 +148,7 @@ { AbstractEventControllerContext ecc = new AbstractEventControllerContext() { - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { called = true; throw new RuntimeException(); @@ -168,7 +168,7 @@ final Error error = new Error(); ecc = new AbstractEventControllerContext() { - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { called = true; throw error; @@ -195,7 +195,7 @@ { WiringEventControllerContext ecc = new WiringEventControllerContext() { - public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable) { called = true; throw new RuntimeException(); @@ -217,7 +217,7 @@ final Error error = new Error(); ecc = new WiringEventControllerContext() { - public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable) { called = true; throw error; @@ -246,7 +246,7 @@ { WiringEventControllerContext ecc = new WiringEventControllerContext() { - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { assertEquals(EVENT_CONSUMER_INFO_NOT_AVAILABLE, cause); called = true; @@ -268,7 +268,7 @@ final Error error = new Error(); ecc = new WiringEventControllerContext() { - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { assertEquals(EVENT_CONSUMER_INFO_NOT_AVAILABLE, cause); called = true; Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,9 +24,9 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; @@ -82,7 +82,7 @@ } // - public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) + public PortletInvocationContext createPortletInvocationContext(String windowId, PortletPageNavigationalState pageNavigationalState) { if (windowId == null) { @@ -143,8 +143,8 @@ windowId, new OpaqueStateString(""), new ParameterMap(), - new WindowNavigationalState(), - getStateControllerContext().createPageNavigationalState(false) + new PortletWindowNavigationalState(), + getStateControllerContext().createPortletPageNavigationalState(false) ); } } Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -25,8 +25,8 @@ import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.OpaqueStateString; @@ -49,8 +49,8 @@ private StateString interactionState = new OpaqueStateString(""); private StateString resourceState = new OpaqueStateString(""); private ParameterMap body = new ParameterMap(); - private WindowNavigationalState windowNS = new WindowNavigationalState(); - private PageNavigationalState pageNS = new StateControllerContextImpl(new PortletControllerContextSupport()).createPageNavigationalState(false); + private PortletWindowNavigationalState windowNS = new PortletWindowNavigationalState(); + private PortletPageNavigationalState pageNS = new StateControllerContextImpl(new PortletControllerContextSupport()).createPortletPageNavigationalState(false); private Map<String, String[]> pageNSChanges = Collections.emptyMap(); @Test Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -37,8 +37,8 @@ import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -67,13 +67,13 @@ PortletInvokerSupport invoker = context.getInvoker(); /** . */ - PageNavigationalState pageNS = context.getStateControllerContext().createPageNavigationalState(false); + PortletPageNavigationalState pageNS = context.getStateControllerContext().createPortletPageNavigationalState(false); /** . */ StateString portletNS = new OpaqueStateString("abc"); /** . */ - WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED); + PortletWindowNavigationalState windowNS = new PortletWindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED); /** . */ ParameterMap body = new ParameterMap(Collections.singletonMap("param", new String[]{"value"})); Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,13 +24,13 @@ import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.AbstractEventControllerContext; import org.jboss.portal.portlet.controller.handlers.EventProducerActionHandler; import org.jboss.portal.portlet.controller.handlers.EventProducerEventHandler; @@ -86,14 +86,14 @@ { invoker.addPortlet("foo"); StateString portletNS = new OpaqueStateString("abc"); - PageNavigationalState pageNS = context.getStateControllerContext().createPageNavigationalState(true); - WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED); + PortletPageNavigationalState pageNS = context.getStateControllerContext().createPortletPageNavigationalState(true); + PortletWindowNavigationalState windowNS = new PortletWindowNavigationalState(portletNS, Mode.EDIT, WindowState.MAXIMIZED); PortletRenderRequest render = new PortletRenderRequest("foo", windowNS, new HashMap<String, String[]>(), pageNS); ControllerResponse response = controller.process(context, render); PageUpdateResponse pageUpdate = assertInstanceOf(response, PageUpdateResponse.class); - PageNavigationalState pageNS2 = assertNotNull(pageUpdate.getPageNavigationalState()); - assertEquals(Tools.toSet("foo"), pageNS2.getWindowIds()); - WindowNavigationalState windowNS2 = pageNS2.getWindowNavigationalState("foo"); + PortletPageNavigationalState pageNS2 = assertNotNull(pageUpdate.getPageNavigationalState()); + assertEquals(Tools.toSet("foo"), pageNS2.getPortletWindowIds()); + PortletWindowNavigationalState windowNS2 = pageNS2.getPortletWindowNavigationalState("foo"); assertNotNull(windowNS2); assertEquals(portletNS, windowNS2.getPortletNavigationalState()); assertEquals(Mode.EDIT, windowNS2.getMode()); @@ -166,10 +166,10 @@ ControllerRequest request = context.createActionRequest("foo"); ControllerResponse response = controller.process(context, request); PageUpdateResponse pageUpdate = assertInstanceOf(response, PageUpdateResponse.class); - PageNavigationalState pageNS = assertNotNull(pageUpdate.getPageNavigationalState()); + PortletPageNavigationalState pageNS = assertNotNull(pageUpdate.getPageNavigationalState()); // - WindowNavigationalState fooNS = assertNotNull(pageNS.getWindowNavigationalState("foo")); + PortletWindowNavigationalState fooNS = assertNotNull(pageNS.getPortletWindowNavigationalState("foo")); assertEquals(WindowState.MAXIMIZED, fooNS.getWindowState()); assertEquals(Mode.EDIT, fooNS.getMode()); assertEquals(new OpaqueStateString("abc"), fooNS.getPortletNavigationalState()); @@ -177,17 +177,17 @@ // if (publishEvent) { - assertEquals(Tools.toSet("foo", "bar"), pageNS.getWindowIds()); + assertEquals(Tools.toSet("foo", "bar"), pageNS.getPortletWindowIds()); // - WindowNavigationalState barNS = assertNotNull(pageNS.getWindowNavigationalState("bar")); + PortletWindowNavigationalState barNS = assertNotNull(pageNS.getPortletWindowNavigationalState("bar")); assertEquals(WindowState.MINIMIZED, barNS.getWindowState()); assertEquals(Mode.HELP, barNS.getMode()); assertEquals(new OpaqueStateString("def"), barNS.getPortletNavigationalState()); } else { - assertEquals(Tools.toSet("foo"), pageNS.getWindowIds()); + assertEquals(Tools.toSet("foo"), pageNS.getPortletWindowIds()); } } @@ -353,7 +353,7 @@ controller.setProducedEventThreshold(10); context.setEventControllerContext(new AbstractEventControllerContext() { - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { context.interrupt(); } Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -35,9 +35,9 @@ private final String windowId; /** . */ - private final PageNavigationalState pageNavigationalState; + private final PortletPageNavigationalState pageNavigationalState; - public PortletInvocationContextSupport(String windowId, PageNavigationalState pageNavigationalState) + public PortletInvocationContextSupport(String windowId, PortletPageNavigationalState pageNavigationalState) { this.windowId = windowId; this.pageNavigationalState = pageNavigationalState; @@ -48,7 +48,7 @@ return windowId; } - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { return pageNavigationalState; } Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.controller; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -49,7 +49,7 @@ /** . */ private final List<EventCallback> callbacks = new LinkedList<EventCallback>(); - public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent sourceEvent) { List<Coordinate> dsts = wires.get(new Coordinate(producedEvent.getName(), producedEvent.getWindowId())); @@ -58,22 +58,22 @@ { for (Coordinate dst : dsts) { - context.queueEvent(new Event(dst.name, producedEvent.getPayload(), dst.windowId)); + context.queueEvent(new PortletWindowEvent(dst.name, producedEvent.getPayload(), dst.windowId)); } } } - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { callbacks.add(new EventCallback(EventCallback.EVENT_CONSUMED, consumedEvent, consumerResponse)); } - public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable) { callbacks.add(new EventCallback(EventCallback.EVENT_FAILED, failedEvent, throwable)); } - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { callbacks.add(new EventCallback(EventCallback.EVENT_DISCARDED, discardedEvent, cause)); } @@ -120,12 +120,12 @@ private final int type; /** . */ - private final Event event; + private final PortletWindowEvent event; /** . */ private final Object data; - private EventCallback(int type, Event event, Object data) + private EventCallback(int type, PortletWindowEvent event, Object data) { this.type = type; this.event = event; @@ -137,7 +137,7 @@ return type; } - public Event getEvent() + public PortletWindowEvent getEvent() { return event; } Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -41,8 +41,8 @@ import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.io.SerializationFilter; import org.jboss.portal.common.util.Base64; @@ -114,7 +114,7 @@ // Process only portlet type // The request decoded if not null - PageNavigationalState pageNavigationalState = null; + PortletPageNavigationalState pageNavigationalState = null; if (URLParameterConstants.PORTLET_TYPE.equals(type)) { WebRequest wr = new WebRequest(req); @@ -253,7 +253,7 @@ } else { - PageNavigationalStateSerialization serialization = new PageNavigationalStateSerialization(context.getStateControllerContext()); + PortletPageNavigationalStateSerialization serialization = new PortletPageNavigationalStateSerialization(context.getStateControllerContext()); // The nav state provided with the request // Unmarshall portal navigational state if it is provided pageNavigationalState = null; Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.controller.event.Event; - import javax.xml.namespace.QName; import java.util.LinkedList; import java.util.List; Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.portal.jsp; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -52,7 +52,7 @@ private final PagePortletControllerContext context; /** Used internally. */ - private final Map<Event, EventRoute> routings; + private final Map<PortletWindowEvent, EventRoute> routings; /** . */ private final List<EventRoute> roots; @@ -63,7 +63,7 @@ { this.context = context; this.prepareResponse = prepareResponse; - this.routings = new LinkedHashMap<Event, EventRoute>(); + this.routings = new LinkedHashMap<PortletWindowEvent, EventRoute>(); this.roots = new ArrayList<EventRoute>(); } @@ -72,7 +72,7 @@ return roots; } - public void eventProduced(EventPhaseContext context, Event producedEvent, Event causeEvent) + public void eventProduced(EventPhaseContext context, PortletWindowEvent producedEvent, PortletWindowEvent causeEvent) { EventRoute relatedRoute = routings.get(causeEvent); @@ -91,7 +91,7 @@ // if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) { - Event destinationEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), windowId); + PortletWindowEvent destinationEvent = new PortletWindowEvent(producedEvent.getName(), producedEvent.getPayload(), windowId); // EventRoute eventRoute = new EventRoute( @@ -127,19 +127,19 @@ } } - public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse) + public void eventConsumed(EventPhaseContext context, PortletWindowEvent consumedEvent, PortletInvocationResponse consumerResponse) { EventRoute route = routings.get(consumedEvent); route.acknowledgement = new EventAcknowledgement.Consumed(consumerResponse); } - public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable) + public void eventFailed(EventPhaseContext context, PortletWindowEvent failedEvent, Throwable throwable) { EventRoute route = routings.get(failedEvent); route.acknowledgement = new EventAcknowledgement.Failed(throwable); } - public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause) + public void eventDiscarded(EventPhaseContext context, PortletWindowEvent discardedEvent, int cause) { EventRoute route = routings.get(discardedEvent); route.acknowledgement = new EventAcknowledgement.Discarded(cause); Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -27,8 +27,8 @@ import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -58,7 +58,7 @@ private final StateControllerContext stateControllerContext; /** . */ - private final Serialization<PageNavigationalState> serialization; + private final Serialization<PortletPageNavigationalState> serialization; /** . */ private final PortalPrepareResponse prepareResponse; @@ -96,7 +96,7 @@ this.prepareResponse = prepareResponse; this.stateControllerContext = new StateControllerContextImpl(this); this.eventControllerContext = new PageEventControllerContext(this, prepareResponse); - this.serialization = new PageNavigationalStateSerialization(stateControllerContext); + this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext); } public Portlet findPortlet(String applicationName, String portletName) @@ -127,7 +127,7 @@ return stateControllerContext; } - public Serialization<PageNavigationalState> getPageNavigationalStateSerialization() + public Serialization<PortletPageNavigationalState> getPageNavigationalStateSerialization() { return serialization; } Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.portal.jsp; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.PortletInvokerException; @@ -56,7 +56,7 @@ { /** . */ - private PageNavigationalState pageNavigationalState; + private PortletPageNavigationalState pageNavigationalState; /** . */ private PagePortletControllerContext portletControllerContext; @@ -68,7 +68,7 @@ HttpServletRequest request, HttpServletResponse response, PagePortletControllerContext portletControllerContext, - PageNavigationalState pageNavigationalState, + PortletPageNavigationalState pageNavigationalState, PortalPrepareResponse prepareResponse) throws PortletInvokerException { super(request, response); @@ -79,7 +79,7 @@ { if (pageNavigationalState == null) { - pageNavigationalState = portletControllerContext.getStateControllerContext().createPageNavigationalState(true); + pageNavigationalState = portletControllerContext.getStateControllerContext().createPortletPageNavigationalState(true); } for (QName parameterName : pageParameterNames) { @@ -106,7 +106,7 @@ * * @return the page state */ - public PageNavigationalState getPageNavigationalState() + public PortletPageNavigationalState getPageNavigationalState() { return pageNavigationalState; } @@ -128,17 +128,17 @@ private PortletInvocationResponse render(Portlet portlet, String windowId) throws PortletInvokerException { - WindowNavigationalState windowNS = null; + PortletWindowNavigationalState windowNS = null; if (pageNavigationalState != null) { - windowNS = pageNavigationalState.getWindowNavigationalState(windowId); + windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); } // ParameterMap publicNS = null; if (pageNavigationalState != null) { - publicNS = pageNavigationalState.getPublicNavigationalState(windowId); + publicNS = pageNavigationalState.getPortletPublicNavigationalState(windowId); } // @@ -230,9 +230,9 @@ { if (pageNavigationalState != null) { - for (String windowId : pageNavigationalState.getWindowIds()) + for (String windowId : pageNavigationalState.getPortletWindowIds()) { - WindowNavigationalState windowNS = pageNavigationalState.getWindowNavigationalState(windowId); + PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); if (WindowState.MAXIMIZED.equals(windowNS.getWindowState())) { return windowId; Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.portal.jsp.PortalRenderResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.WindowState; import javax.servlet.jsp.tagext.SimpleTagSupport; @@ -52,10 +52,10 @@ if (portletResp instanceof ContentResponse) { ContentResponse fragment = (ContentResponse)portletResp; - WindowNavigationalState windowNS = null; + PortletWindowNavigationalState windowNS = null; if (renderResponse.getPageNavigationalState() != null) { - windowNS = renderResponse.getPageNavigationalState().getWindowNavigationalState(portletTag.result.getWindowDef().getWindowId()); + windowNS = renderResponse.getPageNavigationalState().getPortletWindowNavigationalState(portletTag.result.getWindowDef().getWindowId()); } if (windowNS == null || !windowNS.getWindowState().equals(WindowState.MINIMIZED)) { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -107,7 +107,7 @@ else { - PageRenderer renderer = new PageRenderer(new ResponseProperties(), context.getStateControllerContext().createPageNavigationalState(false)); + PageRenderer renderer = new PageRenderer(new ResponseProperties(), context.getStateControllerContext().createPortletPageNavigationalState(false)); // renderer.render(new RendererContextImpl(context)); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; @@ -49,7 +49,7 @@ private boolean sendErrorOnProcessActionError; /** The page navigational state if there is one in the request. */ - private PageNavigationalState requestPageNavigationalState; + private PortletPageNavigationalState requestPageNavigationalState; /** . */ private StateControllerContext stateControllerContext; @@ -58,7 +58,7 @@ boolean sendNoContentResponseOnEmptyResource, boolean sendErrorOnProcessActionError, StateControllerContext stateControllerContext, - PageNavigationalState requestPageNavigationalState) + PortletPageNavigationalState requestPageNavigationalState) { this.sendNoContentResponseOnEmptyResource = sendNoContentResponseOnEmptyResource; this.sendErrorOnProcessActionError = sendErrorOnProcessActionError; @@ -112,7 +112,7 @@ } else { - return new PageRenderer(new ResponseProperties(), requestPageNavigationalState != null ? requestPageNavigationalState : stateControllerContext.createPageNavigationalState(false)); + return new PageRenderer(new ResponseProperties(), requestPageNavigationalState != null ? requestPageNavigationalState : stateControllerContext.createPortletPageNavigationalState(false)); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -43,8 +43,8 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.w3c.dom.Element; @@ -66,9 +66,9 @@ protected FragmentRenderer fragmentRenderer = new SimpleFragmentRenderer(); protected List<ContentResponse> fragments; protected List<ErrorResponse> errors; - protected PageNavigationalState pageNavigationalState; + protected PortletPageNavigationalState pageNavigationalState; - public PageRenderer(ResponseProperties properties, PageNavigationalState pageNavigationalState) + public PageRenderer(ResponseProperties properties, PortletPageNavigationalState pageNavigationalState) { super(properties); @@ -143,7 +143,7 @@ for (Portlet portlet : portlets) { - WindowNavigationalState windowNS = pageNavigationalState.getWindowNavigationalState(portlet.getContext().getId()); + PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(portlet.getContext().getId()); // Mode mode = Mode.VIEW; @@ -168,7 +168,7 @@ } // - ParameterMap publicNS = pageNavigationalState.getPublicNavigationalState(portlet.getContext().getId()); + ParameterMap publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); RenderInvocation render = createRenderInvocation(context, properties, pageNavigationalState, portlet, windowNS, mode, windowState, portletNS, publicNS); @@ -210,9 +210,9 @@ protected RenderInvocation createRenderInvocation( RendererContext context, ResponseProperties pageProperties, - PageNavigationalState pageNS, + PortletPageNavigationalState pageNS, Portlet portlet, - WindowNavigationalState windowNS, + PortletWindowNavigationalState windowNS, Mode mode, WindowState windowState, StateString portletNS, Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -32,8 +32,8 @@ import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.web.IllegalRequestException; @@ -62,7 +62,7 @@ private final StateControllerContext stateControllerContext; /** . */ - private final Serialization<PageNavigationalState> serialization; + private final Serialization<PortletPageNavigationalState> serialization; public PortletControllerContextImpl(HttpServletRequest req, HttpServletResponse resp, ServletContext servletContext) throws IllegalRequestException, IOException, ClassNotFoundException @@ -73,7 +73,7 @@ this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.stateControllerContext = new StateControllerContextImpl(this); - this.serialization = new PageNavigationalStateSerialization(stateControllerContext); + this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext); } public PortletInvoker getPortletInvoker() @@ -106,7 +106,7 @@ return portletInvoker.getPortlets(); } - public Serialization<PageNavigationalState> getPageNavigationalStateSerialization() + public Serialization<PortletPageNavigationalState> getPageNavigationalStateSerialization() { return serialization; } Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalState.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -1,102 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.portal.portlet.test.tck; - -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.common.util.ParameterMap; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.Set; -import java.util.HashMap; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class TCKPageNavigationalState implements PageNavigationalState -{ - - /** . */ - final PageNavigationalState defaultState; - - /** . */ - final Set<String> involvedPortlets; - - public TCKPageNavigationalState(PageNavigationalState defaultState, Set<String> involvedPortlets) - { - this.defaultState = defaultState; - this.involvedPortlets = involvedPortlets; - } - - public Set<String> getInvolvedPortlets() - { - return involvedPortlets; - } - - public Set<String> getWindowIds() - { - return defaultState.getWindowIds(); - } - - public WindowNavigationalState getWindowNavigationalState(String windowId) throws IllegalArgumentException - { - return defaultState.getWindowNavigationalState(windowId); - } - - public void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) throws IllegalArgumentException, IllegalStateException - { - defaultState.setWindowNavigationalState(windowId, windowState); - } - - public ParameterMap getPublicNavigationalState(String windowId) throws IllegalArgumentException - { - return defaultState.getPublicNavigationalState(windowId); - } - - public Set<QName> getPublicNames() - { - return defaultState.getPublicNames(); - } - - public void setPublicNavigationalState(String windowId, Map<String, String[]> update) throws IllegalArgumentException, IllegalStateException - { - defaultState.setPublicNavigationalState(windowId, update); - } - - public String[] getPublicNavigationalState(QName name) throws IllegalArgumentException - { - return defaultState.getPublicNavigationalState(name); - } - - public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException - { - defaultState.setPublicNavigationalState(name, value); - } - - public void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException - { - defaultState.removePublicNavigationalState(name); - } -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalStateSerialization.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalStateSerialization.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalStateSerialization.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.tck; -import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.common.io.Serialization; import java.io.OutputStream; @@ -38,20 +38,20 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -public class TCKPageNavigationalStateSerialization implements Serialization<PageNavigationalState> +public class TCKPageNavigationalStateSerialization implements Serialization<PortletPageNavigationalState> { /** . */ - private final PageNavigationalStateSerialization defaultSerialization; + private final PortletPageNavigationalStateSerialization defaultSerialization; public TCKPageNavigationalStateSerialization(TCKStateControllerContext context) { - this.defaultSerialization = new PageNavigationalStateSerialization(context.defaultStateControllerContext); + this.defaultSerialization = new PortletPageNavigationalStateSerialization(context.defaultStateControllerContext); } - public void serialize(PageNavigationalState pageNavigationalState, OutputStream out) throws IOException, IllegalArgumentException + public void serialize(PortletPageNavigationalState pageNavigationalState, OutputStream out) throws IOException, IllegalArgumentException { - TCKPageNavigationalState tckPageNavigationalState = (TCKPageNavigationalState)pageNavigationalState; + TCKPortletPageNavigationalState tckPageNavigationalState = (TCKPortletPageNavigationalState)pageNavigationalState; // DataOutputStream data = out instanceof DataOutputStream ? (DataOutputStream)out : new DataOutputStream(out); @@ -70,13 +70,13 @@ data.flush(); } - public PageNavigationalState unserialize(InputStream in) throws IOException, IllegalArgumentException + public PortletPageNavigationalState unserialize(InputStream in) throws IOException, IllegalArgumentException { // DataInputStream data = in instanceof DataInputStream ? (DataInputStream)in : new DataInputStream(in); // - PageNavigationalState defaultState = defaultSerialization.unserialize(in); + PortletPageNavigationalState defaultState = defaultSerialization.unserialize(in); // int size = data.readInt(); @@ -88,6 +88,6 @@ } // - return new TCKPageNavigationalState(defaultState, involvedPortlets); + return new TCKPortletPageNavigationalState(defaultState, involvedPortlets); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -29,7 +29,7 @@ import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -60,7 +60,7 @@ private final EventControllerContext eventControllerContext; /** . */ - private final Serialization<PageNavigationalState> serialization; + private final Serialization<PortletPageNavigationalState> serialization; public TCKPortletControllerContext( HttpServletRequest req, @@ -96,7 +96,7 @@ return portletInvoker.invoke(invocation); } - protected Serialization<PageNavigationalState> getPageNavigationalStateSerialization() + protected Serialization<PortletPageNavigationalState> getPageNavigationalStateSerialization() { return serialization; } Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java (from rev 10534, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPageNavigationalState.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletPageNavigationalState.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -0,0 +1,101 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.portlet.test.tck; + +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.common.util.ParameterMap; + +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class TCKPortletPageNavigationalState implements PortletPageNavigationalState +{ + + /** . */ + final PortletPageNavigationalState defaultState; + + /** . */ + final Set<String> involvedPortlets; + + public TCKPortletPageNavigationalState(PortletPageNavigationalState defaultState, Set<String> involvedPortlets) + { + this.defaultState = defaultState; + this.involvedPortlets = involvedPortlets; + } + + public Set<String> getInvolvedPortlets() + { + return involvedPortlets; + } + + public Set<String> getPortletWindowIds() + { + return defaultState.getPortletWindowIds(); + } + + public PortletWindowNavigationalState getPortletWindowNavigationalState(String portletWindowId) throws IllegalArgumentException + { + return defaultState.getPortletWindowNavigationalState(portletWindowId); + } + + public void setPortletWindowNavigationalState(String portletWindowId, PortletWindowNavigationalState portletWindowState) throws IllegalArgumentException, IllegalStateException + { + defaultState.setPortletWindowNavigationalState(portletWindowId, portletWindowState); + } + + public ParameterMap getPortletPublicNavigationalState(String portletWindowId) throws IllegalArgumentException + { + return defaultState.getPortletPublicNavigationalState(portletWindowId); + } + + public Set<QName> getPublicNames() + { + return defaultState.getPublicNames(); + } + + public void setPortletPublicNavigationalState(String portletWindowId, Map<String, String[]> update) throws IllegalArgumentException, IllegalStateException + { + defaultState.setPortletPublicNavigationalState(portletWindowId, update); + } + + public String[] getPublicNavigationalState(QName name) throws IllegalArgumentException + { + return defaultState.getPublicNavigationalState(name); + } + + public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException + { + defaultState.setPublicNavigationalState(name, value); + } + + public void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException + { + defaultState.removePublicNavigationalState(name); + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -26,7 +26,6 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.PortletInvoker; import java.util.Collection; import java.util.ArrayList; @@ -43,7 +42,7 @@ public TCKRendererContext( TCKPortletControllerContext portletControllerContext, - TCKPageNavigationalState tckPageNavigationalState) throws PortletInvokerException + TCKPortletPageNavigationalState tckPageNavigationalState) throws PortletInvokerException { super(portletControllerContext, portletControllerContext.getPortletInvoker()); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -95,7 +95,7 @@ ControllerRequest request = factory.createRequest(wr); // We must have one!!! - TCKPageNavigationalState tckPageNavigationalState = (TCKPageNavigationalState)request.getPageNavigationalState(); + TCKPortletPageNavigationalState tckPageNavigationalState = (TCKPortletPageNavigationalState)request.getPageNavigationalState(); // ControllerResponse response = controller.process(context, request); @@ -140,7 +140,7 @@ throw new IllegalStateException("Portlets requested by TCK were not found"); } - TCKPageNavigationalState tckPageNavigationalState = new TCKPageNavigationalState(context.getStateControllerContext().createPageNavigationalState(false), involvedPortlets); + TCKPortletPageNavigationalState tckPageNavigationalState = new TCKPortletPageNavigationalState(context.getStateControllerContext().createPortletPageNavigationalState(false), involvedPortlets); // PageRenderer renderer = new PageRenderer(new ResponseProperties(), tckPageNavigationalState); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKStateControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKStateControllerContext.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKStateControllerContext.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.tck; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import java.util.HashSet; @@ -41,18 +41,18 @@ this.defaultStateControllerContext = defaultStateControllerContext; } - public PageNavigationalState clonePageNavigationalState(PageNavigationalState pageNavigationalState, boolean modifiable) + public PortletPageNavigationalState clonePortletPageNavigationalState(PortletPageNavigationalState portletPageNavigationalState, boolean modifiable) { - TCKPageNavigationalState tckPageNavigationalState = (TCKPageNavigationalState)pageNavigationalState; + TCKPortletPageNavigationalState tckPageNavigationalState = (TCKPortletPageNavigationalState)portletPageNavigationalState; // - return new TCKPageNavigationalState( - defaultStateControllerContext.clonePageNavigationalState(tckPageNavigationalState.defaultState, modifiable), + return new TCKPortletPageNavigationalState( + defaultStateControllerContext.clonePortletPageNavigationalState(tckPageNavigationalState.defaultState, modifiable), new HashSet<String>(tckPageNavigationalState.involvedPortlets)); } - public PageNavigationalState createPageNavigationalState(boolean modifiable) + public PortletPageNavigationalState createPortletPageNavigationalState(boolean modifiable) { - return new TCKPageNavigationalState(defaultStateControllerContext.createPageNavigationalState(modifiable), new HashSet<String>()); + return new TCKPortletPageNavigationalState(defaultStateControllerContext.createPortletPageNavigationalState(modifiable), new HashSet<String>()); } } Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2008-04-14 12:18:16 UTC (rev 10577) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2008-04-14 12:39:36 UTC (rev 10578) @@ -24,10 +24,10 @@ import org.jboss.unit.api.pojo.annotations.Test; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.PortletInvokerException; @@ -63,7 +63,7 @@ @Test public void testMarshalling1() { - PageNavigationalState pageNS = cc.createPageNavigationalState(true); + PortletPageNavigationalState pageNS = cc.createPortletPageNavigationalState(true); assertMarshallable(pageNS); } @@ -90,20 +90,20 @@ private void test(StateString portletNavigationalState, Mode mode, WindowState windowState) { - PageNavigationalState pageNS = cc.createPageNavigationalState(true); - pageNS.setWindowNavigationalState("foo", new WindowNavigationalState(portletNavigationalState, mode, windowState)); + PortletPageNavigationalState pageNS = cc.createPortletPageNavigationalState(true); + pageNS.setPortletWindowNavigationalState("foo", new PortletWindowNavigationalState(portletNavigationalState, mode, windowState)); assertMarshallable(pageNS); } - private void assertMarshallable(PageNavigationalState pageNS) + private void assertMarshallable(PortletPageNavigationalState pageNS) { - byte[] bytes = IOTools.serialize(new PageNavigationalStateSerialization(cc), /*SerializationFilter.COMPRESSOR, */pageNS); - PageNavigationalState expectedPageNS = IOTools.unserialize(new PageNavigationalStateSerialization(cc), /*SerializationFilter.COMPRESSOR, */bytes); - assertEquals(expectedPageNS.getWindowIds(), pageNS.getWindowIds()); - for (String windowId : expectedPageNS.getWindowIds()) + byte[] bytes = IOTools.serialize(new PortletPageNavigationalStateSerialization(cc), /*SerializationFilter.COMPRESSOR, */pageNS); + PortletPageNavigationalState expectedPageNS = IOTools.unserialize(new PortletPageNavigationalStateSerialization(cc), /*SerializationFilter.COMPRESSOR, */bytes); + assertEquals(expectedPageNS.getPortletWindowIds(), pageNS.getPortletWindowIds()); + for (String windowId : expectedPageNS.getPortletWindowIds()) { - WindowNavigationalState windowNS = expectedPageNS.getWindowNavigationalState(windowId); - WindowNavigationalState expectedWindowNS = pageNS.getWindowNavigationalState(windowId); + PortletWindowNavigationalState windowNS = expectedPageNS.getPortletWindowNavigationalState(windowId); + PortletWindowNavigationalState expectedWindowNS = pageNS.getPortletWindowNavigationalState(windowId); assertEquals(windowNS.getPortletNavigationalState(), expectedWindowNS.getPortletNavigationalState()); assertEquals(windowNS.getMode(), expectedWindowNS.getMode()); assertEquals(windowNS.getWindowState(), expectedWindowNS.getWindowState()); @@ -127,7 +127,7 @@ throw new NotYetImplemented(); } - public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) + public PortletInvocationContext createPortletInvocationContext(String windowId, PortletPageNavigationalState pageNavigationalState) { throw new NotYetImplemented(); }

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits April 2008