February 2008 - portal-commits - Jboss List Archives

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

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 18:52:19 -0500 (Tue, 05 Feb 2008) New Revision: 9788 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/ContainerInfoBuilderContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java Log: add name/applicationName on portlet info which expose portlet name and application name (context path name more or less). 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-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -587,6 +587,7 @@ containerNavigation, filters, portletMD.getPortletName(), + context.getApplicationName(), portletMD.getPortletClass(), initParameters, false, @@ -604,6 +605,7 @@ containerCache, containerSession, portletMD.getPortletName(), + context.getApplicationName(), portletMD.getPortletClass(), Collections.unmodifiableMap(initParameters), false, Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -33,6 +33,8 @@ public interface ContainerInfoBuilderContext { + String getApplicationName(); + ResourceBundleManager getBundleManager(); ResourceBundleManager getBundleManager(PortletMetaData portletMD); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -65,6 +65,9 @@ private final String name; /** . */ + private final String applicationName; + + /** . */ private final String className; /** . */ @@ -94,6 +97,7 @@ ContainerSessionInfo session, String name, String className, + String applicationName, Map<String, String> initParameters, Boolean remotable, ResourceBundleManager bundleManager) @@ -108,6 +112,7 @@ this.navigation = new ContainerNavigationInfo(); this.filterRefs = Collections.emptyList(); this.name = name; + this.applicationName = applicationName; this.className = className; this.initParameters = initParameters; this.remotable = remotable; @@ -126,6 +131,7 @@ ContainerNavigationInfo navigation, List<String> filterRefs, String name, + String applicationName, String className, Map<String, String> initParameters, Boolean remotable, @@ -142,6 +148,7 @@ this.navigation = navigation; this.filterRefs = filterRefs; this.name = name; + this.applicationName = applicationName; this.className = className; this.initParameters = initParameters; this.remotable = remotable; @@ -154,6 +161,11 @@ return name; } + public String getApplicationName() + { + return null; + } + public Map<String, ContainerOptionInfo> getOptions() { return options; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -41,20 +41,34 @@ public class ContainerInfoBuilderContextImpl implements ContainerInfoBuilderContext { - private PortletApplication10MetaData metaData; + /** . */ + private final PortletApplication10MetaData metaData; - private WebApp webApp; + /** . */ + private final WebApp webApp; - private final Map<String, ResourceBundleManager> portletBundleMgrs = new HashMap<String, ResourceBundleManager>(); + /** . */ + private final Map<String, ResourceBundleManager> portletBundleMgrs; + /** . */ private ResourceBundleManager applicationBundleMgr; + /** . */ + private final String applicationName; + public ContainerInfoBuilderContextImpl(PortletApplication10MetaData metaData, WebApp webApp) { this.metaData = metaData; this.webApp = webApp; + this.portletBundleMgrs = new HashMap<String, ResourceBundleManager>(); + this.applicationName = webApp.getContextPath().substring(1); } + public String getApplicationName() + { + return applicationName; + } + public ResourceBundleManager getBundleManager() { if (applicationBundleMgr == null) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -31,7 +31,22 @@ */ public interface PortletInfo { + /** + * Returns the portlet name. + * + * @return the portlet name + */ + String getName(); + + /** + * Returns the portlet application name. + * + * @return the portlet application name + */ + String getApplicationName(); + + /** * Retrieves the capabilities of supported by the described portlet. * * @return the capabilities of the portlet Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -32,6 +32,8 @@ public class PortletInfoSupport implements PortletInfo { + private String name; + private String applicationName; private Boolean remotable; private PreferencesInfoSupport preferencesSupport = new PreferencesInfoSupport(); private SecurityInfoSupport securitySupport = new SecurityInfoSupport(); @@ -41,6 +43,26 @@ private EventingInfoSupport eventsSupport = new EventingInfoSupport(); private NavigationInfoSupport navigationSupport = new NavigationInfoSupport(); + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getApplicationName() + { + return applicationName; + } + + public void setApplicationName(String applicationName) + { + this.applicationName = applicationName; + } + public CapabilitiesInfo getCapabilities() { throw new UnsupportedOperationException("Implement me");

18 years, 2 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:59:46 -0500 (Tue, 05 Feb 2008) New Revision: 9787 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/Event.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/FullScopedCacheablePortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.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/PortletApplicationDeployer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletUtilsTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodec.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodecTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/URLParameterConstants.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.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/ErrorResponseRenderer.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/controller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/Renderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestInstanceContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortalContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvoker.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/LocalizedStringBuilder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaDataException.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java Log: - Update copyright... Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -20,6 +20,7 @@ * 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; import org.jboss.portal.portlet.PortletInvokerException; @@ -31,16 +32,15 @@ import java.io.IOException; /** - * The portlet controller which handles the page state management and the interactions between - * the action phase and the event phase. It really only does that and not more. - * + * The portlet controller which handles the page state management and the interactions between the action phase and the + * event phase. It really only does that and not more. + * <p/> * 1/ introduce EventRequest so the portal can send events directly to a portlet + * <p/> + * 2/ make the event controller return a decision for a given event. Today it just returns a list of events to process. + * An event can be handled in various manners by the controller: - produce new events (what exists today) - make it a + * portal event which delivers the event to the portal * - * 2/ make the event controller return a decision for a given event. Today it just returns a list - * of events to process. An event can be handled in various manners by the controller: - * - produce new events (what exists today) - * - make it a portal event which delivers the event to the portal - * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -23,20 +23,20 @@ package org.jboss.portal.portlet.controller; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; +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 javax.servlet.http.Cookie; import java.util.List; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,25 @@ -/* - * Copyright (c) 2008, Your Corporation. All Rights Reserved. - */ +/****************************************************************************** + * 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; @@ -9,13 +28,6 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; @@ -26,8 +38,15 @@ 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.StateControllerContext; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; import javax.servlet.http.Cookie; import java.io.IOException; @@ -248,7 +267,7 @@ private void updateNavigationalState( PortletControllerContext context, String windowId, - UpdateNavigationalStateResponse update, + UpdateNavigationalStateResponse update, PageNavigationalState pageState) throws PortletInvokerException { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,25 @@ -/* - * Copyright (c) 2008, Your Corporation. All Rights Reserved. - */ +/****************************************************************************** + * 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; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/Event.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -37,6 +37,6 @@ * @param producedEvent the produced event * @return the list of event to be consumed */ - List<Event> getConsumedEvents(Event producedEvent); + List<Event> getConsumedEvents(Event producedEvent); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.impl.event; +import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.info.PortletInfo; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Collections; -import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.impl.state; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.PortletInvokerException; import javax.xml.namespace.QName; import java.util.Map; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -23,16 +23,16 @@ package org.jboss.portal.portlet.controller.impl.state; import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.PortletInvokerException; +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.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.PortletInvokerException; import javax.xml.namespace.QName; +import java.io.Serializable; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.io.Serializable; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,17 +22,17 @@ ******************************************************************************/ 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.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; +import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/FullScopedCacheablePortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,9 +22,9 @@ ******************************************************************************/ 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.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,11 +22,11 @@ ******************************************************************************/ 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.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,11 +22,11 @@ ******************************************************************************/ 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.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import java.util.Map; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,13 +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.cache.CacheLevel; -import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,10 +22,10 @@ ******************************************************************************/ 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.PortletControllerContext; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.common.util.ParameterMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.response; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -46,16 +46,16 @@ /** * Update the navigational state of a window. * - * @param windowId the window id + * @param windowId the window id * @param windowState the window state * @throws UnsupportedOperationException if the page state is read only */ void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) throws UnsupportedOperationException; /** - * 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. + * 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 @@ -63,14 +63,14 @@ ParameterMap getPublicNavigationalState(String windowId); /** - * 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. - * + * 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. + * <p/> * The update argument values with a length of zero should be treated as removals. * * @param windowId the window id - * @param update the updates + * @param update the updates * @throws UnsupportedOperationException if the page state is read only */ void setPublicNavigationalState(String windowId, Map<String, String[]> update) throws UnsupportedOperationException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/InterceptorStackFactoryImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; +import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.common.invocation.InterceptorStack; -import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.common.invocation.InterceptorStackFactory; /** 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-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,14 +22,13 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.PortletController; -import org.jboss.portal.portlet.test.controller.PortletControllerContextImpl; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.test.controller.ControllerResponseRendererFactory; -import org.jboss.portal.portlet.test.controller.Renderer; import org.jboss.portal.portlet.test.controller.PageRenderer; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.test.controller.PortletControllerContextImpl; +import org.jboss.portal.portlet.test.controller.Renderer; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -81,7 +80,7 @@ ControllerResponse response = controller.process(context.getRequest()); // - Renderer renderer = ControllerResponseRendererFactory.getRenderer(response); + Renderer renderer = ControllerResponseRendererFactory.getRenderer(response); // renderer.render(context); @@ -89,7 +88,7 @@ else { PageRenderer renderer = new PageRenderer(new ResponseProperties(), context.getStateControllerContext().createPageState()); - + // renderer.render(context); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,42 +22,42 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; +import org.apache.log4j.Logger; +import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; +import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData; +import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; +import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData; +import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; +import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; +import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.InstallMetaData; +import org.jboss.beans.metadata.spi.ParameterMetaData; +import org.jboss.beans.metadata.spi.PropertyMetaData; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.container.PortletApplicationContext; +import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder; +import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext; +import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; +import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; +import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImpl; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; -import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImpl; import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder; -import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext; -import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; import org.jboss.portal.web.WebApp; -import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.NotYetImplemented; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData; -import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; -import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; -import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; -import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData; -import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; -import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; -import org.jboss.beans.metadata.plugins.ThisValueMetaData; -import org.jboss.beans.metadata.spi.PropertyMetaData; -import org.jboss.beans.metadata.spi.ParameterMetaData; -import org.jboss.beans.metadata.spi.InstallMetaData; -import org.jboss.dependency.spi.ControllerState; -import org.apache.log4j.Logger; import javax.servlet.ServletContext; -import java.util.List; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -100,7 +100,7 @@ void start() { - + log.debug("Starting installation"); // @@ -190,7 +190,7 @@ } catch (Throwable throwable) { - log.debug("Installation of bean " + beanName + " produced an error", throwable); + log.debug("Installation of bean " + beanName + " produced an error", throwable); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletUtilsTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletUtilsTestCase.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletUtilsTestCase.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,21 +1,44 @@ +/****************************************************************************** + * 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.test; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; +import static org.jboss.unit.api.Assert.assertEquals; -import static org.jboss.unit.api.Assert.*; +public class PortletUtilsTestCase +{ -public class PortletUtilsTestCase { + public void testgenerateNamespaceFrom() + { + String name = "_09azAZ$"; + assertEquals(PortletUtils.PREFIX + name + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); - public void testgenerateNamespaceFrom() - { - String name = "_09azAZ$"; - assertEquals(PortletUtils.PREFIX + name + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); + name = "_"; + assertEquals(PortletUtils.PREFIX + "_" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); - name = "_"; - assertEquals(PortletUtils.PREFIX + "_" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); + name = "_é"; + assertEquals(PortletUtils.PREFIX + "__e9" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); + } - name = "_é"; - assertEquals(PortletUtils.PREFIX + "__e9" + PortletUtils.SUFFIX, PortletUtils.generateNamespaceFrom(name)); - } - } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodec.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodec.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodec.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,14 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import java.io.OutputStreamWriter; -import java.io.OutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.io.ByteArrayOutputStream; -import java.nio.charset.Charset; -import java.nio.charset.CharsetEncoder; +import java.io.UnsupportedEncodingException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -47,7 +41,7 @@ { StringBuffer buffer = new StringBuffer(); char[] tmp = new char[1]; - for (int i = 0;i < decodedValue.length();i++) + for (int i = 0; i < decodedValue.length(); i++) { char c = decodedValue.charAt(i); if (Character.isLetterOrDigit(c)) @@ -77,7 +71,7 @@ try { ByteArrayOutputStream baos = new ByteArrayOutputStream(encodedValue.length()); - for (int i = 0;i < encodedValue.length();i++) + for (int i = 0; i < encodedValue.length(); i++) { char c = encodedValue.charAt(i); if (Character.isLetterOrDigit(c)) @@ -109,5 +103,4 @@ } - } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodecTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodecTestCase.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/StringCodecTestCase.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,10 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; +import static org.jboss.unit.api.Assert.assertEquals; import org.jboss.unit.api.pojo.annotations.Test; -import static org.jboss.unit.api.Assert.*; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -58,7 +57,7 @@ assertEquals("/", StringCodec.decode(StringCodec.encode("/"))); assertEquals("@", StringCodec.decode(StringCodec.encode("@"))); assertEquals(Character.toString(EURO_CHAR), StringCodec.decode(StringCodec.encode(Character.toString(EURO_CHAR)))); - assertEquals("A" + EURO_CHAR +"B@C", StringCodec.decode(StringCodec.encode("A" + EURO_CHAR + "B@C"))); + assertEquals("A" + EURO_CHAR + "B@C", StringCodec.decode(StringCodec.encode("A" + EURO_CHAR + "B@C"))); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/URLParameterConstants.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/URLParameterConstants.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/URLParameterConstants.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -39,64 +39,40 @@ */ public static final String LIFECYCLE_TYPE = "type"; - /** - * The portlet mode. - */ + /** The portlet mode. */ public static final String MODE = "mode"; - /** - * The window state. - */ + /** The window state. */ public static final String WINDOW_STATE = "windowstate"; - /** - * The portlet navigational state for any type of lifecycle. - */ + /** The portlet navigational state for any type of lifecycle. */ public static final String NAVIGATIONAL_STATE = "navigationalstate"; - /** - * The portlet resource state for lifecycle of type <code>RENDER_LIFECYCLE</code>. - */ + /** The portlet resource state for lifecycle of type <code>RENDER_LIFECYCLE</code>. */ public static final String RESOURCE_STATE = "resourcestate"; - /** - * The portlet interaction state for lifecycle of type <code>ACTION_LIFECYCLE</code>. - */ + /** The portlet interaction state for lifecycle of type <code>ACTION_LIFECYCLE</code>. */ public static final String INTERACTION_STATE = "interactionstate"; - /** - * The page state for any kind of lifecycle. - */ + /** The page state for any kind of lifecycle. */ public static final String PAGE_STATE = "pagestate"; - /** - * The public navigational state changes of a portlet for lifecycle of type <code>RENDER_LIFECYCLE</code>. - */ + /** The public navigational state changes of a portlet for lifecycle of type <code>RENDER_LIFECYCLE</code>. */ public static final String PUBLIC_NAVIGATIONAL_STATE_CHANGES = "publicnavigationalstatechanges"; - /** - * The resource id for lifecycle of type <code>RESOURCE_LIFECYCLE</code>. - */ + /** The resource id for lifecycle of type <code>RESOURCE_LIFECYCLE</code>. */ public static final String RESOURCE_ID = "resourceid"; - /** - * The resource cacheability for lifecycle of type <code>RENDER_LIFECYCLE</code>. - */ + /** The resource cacheability for lifecycle of type <code>RENDER_LIFECYCLE</code>. */ public static final String RESOURCE_CACHEABILITY = "resourcecacheability"; - /** - * Denotes an action lifecycle operation. - */ + /** Denotes an action lifecycle operation. */ public static final String ACTION_LIFECYCLE = "action"; - /** - * Denotes a render lifecycle operation. - */ + /** Denotes a render lifecycle operation. */ public static final String RENDER_LIFECYCLE = "render"; - /** - * Denotes a resource lifecycle operation. - */ + /** Denotes a resource lifecycle operation. */ public static final String RESOURCE_LIFECYCLE = "resource"; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,14 +20,15 @@ * 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.controller; +import org.jboss.portal.common.util.MultiValuedPropertyMap; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.MultiValuedPropertyMap; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.IOException; import java.util.List; 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-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,16 +20,17 @@ * 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.controller; 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.response.ResourceResponse; -import org.jboss.portal.portlet.controller.response.PortletResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,11 +20,12 @@ * 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.controller; +import org.apache.log4j.Logger; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.apache.log4j.Logger; import java.io.IOException; 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-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,63 +20,64 @@ * 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.controller; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.FullScopedCacheablePortletResourceRequest; +import org.jboss.portal.portlet.controller.request.PageScopedFullPortletResourceRequest; +import org.jboss.portal.portlet.controller.request.PortletActionRequest; +import org.jboss.portal.portlet.controller.request.PortletRenderRequest; +import org.jboss.portal.portlet.controller.request.PortletScopedPortletResourceRequest; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; +import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; +import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; import org.jboss.portal.portlet.impl.spi.AbstractServerContext; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; -import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; -import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.test.StringCodec; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; -import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.controller.request.PortletScopedPortletResourceRequest; -import org.jboss.portal.portlet.controller.request.FullScopedCacheablePortletResourceRequest; -import org.jboss.portal.portlet.controller.request.PageScopedFullPortletResourceRequest; -import org.jboss.portal.portlet.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.web.Body; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.web.WebRequest; import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.IOException; import java.util.Collection; +import java.util.List; import java.util.Map; -import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -332,7 +333,7 @@ public PortletInvocationResponse invoke(String windowId, ActionInvocation actionInvocation) throws PortletInvokerException { - Portlet portlet =_getPortlet(windowId); + Portlet portlet = _getPortlet(windowId); TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); @@ -382,7 +383,7 @@ resourceInvocation.setSecurityContext(new AbstractSecurityContext(req)); resourceInvocation.setRequestContext(new AbstractRequestContext(req)); resourceInvocation.setTarget(instanceContext.getTarget()); - + return invoke(resourceInvocation); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.controller; import org.jboss.portal.common.io.IOTools; @@ -33,10 +34,10 @@ import org.jboss.portal.portlet.ResourceURL; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; -import static org.jboss.portal.portlet.test.URLParameterConstants.*; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.test.StringCodec; +import static org.jboss.portal.portlet.test.URLParameterConstants.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -67,7 +68,7 @@ final PageNavigationalState pageNS; public PortletURLRenderer( - StateControllerContextImpl stateContext, + StateControllerContextImpl stateContext, PageNavigationalState pageNS, String windowId, HttpServletRequest clientReq, Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.controller; import org.jboss.portal.portlet.controller.PortletControllerContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/Renderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/Renderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/Renderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.controller; import org.jboss.portal.portlet.controller.PortletControllerContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,13 +20,14 @@ * 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.controller; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.common.io.IOTools; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; import java.io.IOException; import java.io.Writer; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestInstanceContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestInstanceContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestInstanceContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,12 +20,13 @@ * 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.controller; -import org.jboss.portal.portlet.state.AccessMode; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.state.AccessMode; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortalContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortalContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortalContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.controller; import org.jboss.portal.portlet.impl.spi.AbstractPortalContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,17 +20,17 @@ * 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.controller; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; +import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.portlet.ContainerURL; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; -import org.jboss.portal.portlet.test.controller.PortletURLRenderer; +import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvoker.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvoker.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvoker.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,24 +20,25 @@ * 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.controller; +import org.jboss.portal.common.invocation.InterceptorStackFactory; +import org.jboss.portal.common.invocation.Invocation; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.common.invocation.InvocationHandler; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.common.invocation.InterceptorStackFactory; -import org.jboss.portal.common.invocation.InvocationHandler; -import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; +import java.util.List; import java.util.Set; -import java.util.List; /** * A simple consumer. @@ -114,11 +115,11 @@ { if (e instanceof PortletInvokerException) { - throw(PortletInvokerException)e; + throw (PortletInvokerException)e; } else if (e instanceof RuntimeException) { - throw(RuntimeException)e; + throw (RuntimeException)e; } else { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/LocalizedStringBuilder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/LocalizedStringBuilder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/LocalizedStringBuilder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,18 +20,19 @@ * 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.metadata.factory; +import org.apache.log4j.Logger; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; +import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; -import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData; - /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,11 +20,9 @@ * 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.metadata.factory; -import java.net.URI; -import java.net.URISyntaxException; - import org.apache.log4j.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -34,12 +32,12 @@ import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; +import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.DEFAULT_LOCALE; +import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_286_NS; import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData; import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData; -import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData; import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; @@ -61,11 +59,14 @@ import org.jboss.portal.portlet.impl.metadata.security.PortletCollectionMetaData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; import org.jboss.portal.portlet.impl.metadata.security.UserDataConstraintMetaData; +import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData; +import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; import org.jboss.xb.binding.GenericObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; -import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.*; +import java.net.URI; +import java.net.URISyntaxException; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -91,8 +92,8 @@ // portlet-app 2.0 or 1.0 PortletApplication10MetaData md = PORTLET_JSR_286_NS.equals(nsURI) - ? new AnnotationPortletApplication20MetaData() - : new AnnotationPortletApplication10MetaData(); + ? new AnnotationPortletApplication20MetaData() + : new AnnotationPortletApplication10MetaData(); // Set portlet-app id md.setId(id); @@ -302,7 +303,7 @@ if (child instanceof DescribableMetaData) { - DescribableMetaData md = (DescribableMetaData) child; + DescribableMetaData md = (DescribableMetaData)child; LocalizedString d = this.descriptions.getLocalizedString(md); md.setDescription(d); } @@ -310,33 +311,33 @@ // portlet app if (parent instanceof PortletApplication10MetaData) { - PortletApplication10MetaData md = (PortletApplication10MetaData) parent; + PortletApplication10MetaData md = (PortletApplication10MetaData)parent; // add portlet if (child instanceof PortletMetaData) { - PortletMetaData portlet = (PortletMetaData) child; + PortletMetaData portlet = (PortletMetaData)child; portlet.setDisplayName(this.displayNames.getLocalizedString(portlet)); md.addPortlet(portlet); } // add custom-portlet-mode else if (child instanceof CustomPortletModeMetaData) { - md.addCustomPortletMode((CustomPortletModeMetaData) child); + md.addCustomPortletMode((CustomPortletModeMetaData)child); } // add custom window state else if (child instanceof CustomWindowStateMetaData) { - md.addCustomWindowState((CustomWindowStateMetaData) child); + md.addCustomWindowState((CustomWindowStateMetaData)child); } // add user-attribute else if (child instanceof UserAttributeMetaData) { - md.addUserAttribute((UserAttributeMetaData) child); + md.addUserAttribute((UserAttributeMetaData)child); } // add security-constraint else if (child instanceof SecurityConstraintMetaData) { - SecurityConstraintMetaData security = (SecurityConstraintMetaData) child; + SecurityConstraintMetaData security = (SecurityConstraintMetaData)child; // display-name security.setDisplayName(this.displayNames.getLocalizedString(security)); md.addSecurityConstraint(security); @@ -346,38 +347,38 @@ // portlet-app 2.0 if (parent instanceof PortletApplication20MetaData) { - PortletApplication20MetaData md = (PortletApplication20MetaData) parent; + PortletApplication20MetaData md = (PortletApplication20MetaData)parent; // add public-render-parameter if (child instanceof PublicRenderParameterMetaData) { - md.addPublicRenderParameter((PublicRenderParameterMetaData) child); + md.addPublicRenderParameter((PublicRenderParameterMetaData)child); } // add event-defintion else if (child instanceof EventDefinitionMetaData) { - md.addEventDefinition((EventDefinitionMetaData) child); + md.addEventDefinition((EventDefinitionMetaData)child); } // add filter else if (child instanceof FilterMetaData) { - FilterMetaData filter = (FilterMetaData) child; + FilterMetaData filter = (FilterMetaData)child; filter.setDisplayName(this.displayNames.getLocalizedString(filter)); md.addFilter(filter); } // add filter-mapping else if (child instanceof FilterMappingMetaData) { - md.addFilterMapping((FilterMappingMetaData) child); + md.addFilterMapping((FilterMappingMetaData)child); } // add container-runtime-option else if (child instanceof ContainerRuntimeMetaData) { - md.addContainerRuntime((ContainerRuntimeMetaData) child); + md.addContainerRuntime((ContainerRuntimeMetaData)child); } // add listener else if (child instanceof ListenerMetaData) { - ListenerMetaData listener = (ListenerMetaData) child; + ListenerMetaData listener = (ListenerMetaData)child; listener.setDisplayName(this.displayNames.getLocalizedString(listener)); md.addListener(listener); } @@ -386,104 +387,104 @@ // portlet if (parent instanceof PortletMetaData) { - PortletMetaData md = (PortletMetaData) parent; + PortletMetaData md = (PortletMetaData)parent; // init-param if (child instanceof InitParamMetaData) { - md.addInitParam((InitParamMetaData) child); + md.addInitParam((InitParamMetaData)child); } // supports else if (child instanceof SupportsMetaData) { - md.addSupport((SupportsMetaData) child); + md.addSupport((SupportsMetaData)child); } // supported-locale else if (child instanceof SupportedLocaleMetaData) { - md.addSupportedLocale((SupportedLocaleMetaData) child); + md.addSupportedLocale((SupportedLocaleMetaData)child); } // portlet-info else if (child instanceof PortletInfoMetaData) { - md.setPortletInfo((PortletInfoMetaData) child); + md.setPortletInfo((PortletInfoMetaData)child); } // portlet-preferences else if (child instanceof PortletPreferencesMetaData) { - md.setPortletPreferences((PortletPreferencesMetaData) child); + md.setPortletPreferences((PortletPreferencesMetaData)child); } // security-role-ref else if (child instanceof SecurityRoleRefMetaData) { - md.addSecurityRoleRef((SecurityRoleRefMetaData) child); + md.addSecurityRoleRef((SecurityRoleRefMetaData)child); } // supported-events else if (child instanceof EventDefinitionReferenceMetaData) { if ("supported-processing-event".equals(localName)) { - md.addSupportedProcessingEvent((EventDefinitionReferenceMetaData) child); + md.addSupportedProcessingEvent((EventDefinitionReferenceMetaData)child); } else if ("supported-publishing-event".equals(localName)) { - md.addSupportedPublishingEvent((EventDefinitionReferenceMetaData) child); + md.addSupportedPublishingEvent((EventDefinitionReferenceMetaData)child); } } // container-runtime-option else if (child instanceof ContainerRuntimeMetaData) { - md.addContainerRuntime((ContainerRuntimeMetaData) child); + md.addContainerRuntime((ContainerRuntimeMetaData)child); } } // adding user-data-constraint and portlet-name(s) to security-constraint if (parent instanceof SecurityConstraintMetaData) { - SecurityConstraintMetaData md = (SecurityConstraintMetaData) parent; + SecurityConstraintMetaData md = (SecurityConstraintMetaData)parent; // add user-data-constraint if (child instanceof UserDataConstraintMetaData) { - md.setUserDataConstraint((UserDataConstraintMetaData) child); + md.setUserDataConstraint((UserDataConstraintMetaData)child); } // add portlet-collection else if (child instanceof PortletCollectionMetaData) { - md.setPortletList((PortletCollectionMetaData) child); + md.setPortletList((PortletCollectionMetaData)child); } } // filter if (parent instanceof FilterMetaData) { - FilterMetaData md = (FilterMetaData) parent; + FilterMetaData md = (FilterMetaData)parent; // add init-param if (child instanceof InitParamMetaData) { - md.addInitParam((InitParamMetaData) child); + md.addInitParam((InitParamMetaData)child); } } // add portlet-mode and window-state if (parent instanceof SupportsMetaData) { - SupportsMetaData md = (SupportsMetaData) parent; + SupportsMetaData md = (SupportsMetaData)parent; if (child instanceof PortletModeMetaData) { - md.addPortletMode((PortletModeMetaData) child); + md.addPortletMode((PortletModeMetaData)child); } else if (child instanceof WindowStateMetaData) { - md.addWindowState((WindowStateMetaData) child); + md.addWindowState((WindowStateMetaData)child); } } // add preference if (parent instanceof PortletPreferencesMetaData) { - PortletPreferencesMetaData md = (PortletPreferencesMetaData) parent; + PortletPreferencesMetaData md = (PortletPreferencesMetaData)parent; if (child instanceof PortletPreferenceMetaData) { - md.addPortletPreference((PortletPreferenceMetaData) child); + md.addPortletPreference((PortletPreferenceMetaData)child); } } } @@ -494,7 +495,7 @@ // JSR 286 portlet-app attributes - default-namespace and resource-bundle. if (object instanceof PortletApplication20MetaData) { - PortletApplication20MetaData md = (PortletApplication20MetaData) object; + PortletApplication20MetaData md = (PortletApplication20MetaData)object; if ("resource-bundle".equals(localName)) { md.setResourceBundle(value); @@ -515,7 +516,7 @@ // portlet if (object instanceof PortletMetaData) { - PortletMetaData md = (PortletMetaData) object; + PortletMetaData md = (PortletMetaData)object; if ("portlet-name".equals(localName)) { md.setPortletName(value); @@ -544,7 +545,7 @@ if (object instanceof LocalizedDescriptionMetaData) { - LocalizedDescriptionMetaData localized = (LocalizedDescriptionMetaData) object; + LocalizedDescriptionMetaData localized = (LocalizedDescriptionMetaData)object; if ("description".equals(localName)) { localized.setDescription(value); @@ -558,7 +559,7 @@ // init-param if (object instanceof InitParamMetaData) { - InitParamMetaData md = (InitParamMetaData) object; + InitParamMetaData md = (InitParamMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -572,7 +573,7 @@ // supports if (object instanceof SupportsMetaData) { - SupportsMetaData md = (SupportsMetaData) object; + SupportsMetaData md = (SupportsMetaData)object; if ("mime-type".equals(localName)) { md.setMimeType(value); @@ -582,7 +583,7 @@ // supports --- portlet-mode if (object instanceof PortletModeMetaData) { - PortletModeMetaData md = (PortletModeMetaData) object; + PortletModeMetaData md = (PortletModeMetaData)object; if ("portlet-mode".equals(localName)) { md.setPortletMode(Mode.create(value)); @@ -592,7 +593,7 @@ // supports --- window-state if (object instanceof WindowStateMetaData) { - WindowStateMetaData md = (WindowStateMetaData) object; + WindowStateMetaData md = (WindowStateMetaData)object; if ("window-state".equals(localName)) { md.setWindowState(WindowState.create(value)); @@ -602,7 +603,7 @@ // supported-locale if (object instanceof SupportedLocaleMetaData) { - SupportedLocaleMetaData md = (SupportedLocaleMetaData) object; + SupportedLocaleMetaData md = (SupportedLocaleMetaData)object; if ("supported-locale".equals(localName)) { md.setLocale(value); @@ -612,7 +613,7 @@ // portlet-info if (object instanceof PortletInfoMetaData) { - PortletInfoMetaData md = (PortletInfoMetaData) object; + PortletInfoMetaData md = (PortletInfoMetaData)object; if ("title".equals(localName)) { md.setTitle(value); @@ -630,7 +631,7 @@ // portlet-preferences if (object instanceof PortletPreferencesMetaData) { - PortletPreferencesMetaData md = (PortletPreferencesMetaData) object; + PortletPreferencesMetaData md = (PortletPreferencesMetaData)object; if ("preferences-validator".equals(localName)) { md.setPreferenceValidator(value); @@ -640,7 +641,7 @@ // preference if (object instanceof PortletPreferenceMetaData) { - PortletPreferenceMetaData md = (PortletPreferenceMetaData) object; + PortletPreferenceMetaData md = (PortletPreferenceMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -658,7 +659,7 @@ // security-role-ref if (object instanceof SecurityRoleRefMetaData) { - SecurityRoleRefMetaData md = (SecurityRoleRefMetaData) object; + SecurityRoleRefMetaData md = (SecurityRoleRefMetaData)object; if ("role-name".equals(localName)) { md.setRoleName(value); @@ -672,7 +673,7 @@ // supported events if (object instanceof EventDefinitionReferenceMetaData) { - EventDefinitionReferenceMetaData md = (EventDefinitionReferenceMetaData) object; + EventDefinitionReferenceMetaData md = (EventDefinitionReferenceMetaData)object; if ("qname".equals(localName)) { md.setQname(nav.resolveQName(value)); @@ -686,7 +687,7 @@ // custom-portlet-mode if (object instanceof CustomPortletModeMetaData) { - CustomPortletModeMetaData mode = (CustomPortletModeMetaData) object; + CustomPortletModeMetaData mode = (CustomPortletModeMetaData)object; if ("portlet-mode".equals(localName)) { mode.setPortletMode(value); @@ -700,7 +701,7 @@ // custom-window-state if (object instanceof CustomWindowStateMetaData) { - CustomWindowStateMetaData md = (CustomWindowStateMetaData) object; + CustomWindowStateMetaData md = (CustomWindowStateMetaData)object; if ("window-state".equals(localName)) { md.setWindowState(value); @@ -710,7 +711,7 @@ // user-attribute if (object instanceof UserAttributeMetaData) { - UserAttributeMetaData md = (UserAttributeMetaData) object; + UserAttributeMetaData md = (UserAttributeMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -720,7 +721,7 @@ // user-data-constraint if (object instanceof UserDataConstraintMetaData) { - UserDataConstraintMetaData md = (UserDataConstraintMetaData) object; + UserDataConstraintMetaData md = (UserDataConstraintMetaData)object; if ("transport-guarantee".equals(localName)) { md.setTransportQuarantee(TransportGuarantee.valueOf(value)); @@ -730,7 +731,7 @@ // portlet-collection in security-constraint if (object instanceof PortletCollectionMetaData) { - PortletCollectionMetaData md = (PortletCollectionMetaData) object; + PortletCollectionMetaData md = (PortletCollectionMetaData)object; if ("portlet-name".equals(localName)) { md.addPortletname(value); @@ -740,7 +741,7 @@ // filter if (object instanceof FilterMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - FilterMetaData md = (FilterMetaData) object; + FilterMetaData md = (FilterMetaData)object; if ("filter-class".equals(localName)) { md.setFilterClass(value); @@ -751,12 +752,12 @@ } else if ("lifecycle".equals(localName)) { - String lifeCycle = value.substring(0 , value.length() - "_PHASE".length()); + String lifeCycle = value.substring(0, value.length() - "_PHASE".length()); try { md.addLifecycle(LifeCyclePhase.valueOf(lifeCycle)); } - catch(IllegalArgumentException e) + catch (IllegalArgumentException e) { throw new IllegalArgumentException("Invalid value for lifecycle. Valid values are [RENDER_PHASE, RESOURCE_PHASE, ACTION_PHASE, EVENT_PHASE]"); } @@ -766,7 +767,7 @@ // filter-mapping if (object instanceof FilterMappingMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - FilterMappingMetaData md = (FilterMappingMetaData) object; + FilterMappingMetaData md = (FilterMappingMetaData)object; if ("filter-name".equals(localName)) { md.setName(value); @@ -780,7 +781,7 @@ // event-defintion if (object instanceof EventDefinitionMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - EventDefinitionMetaData md = (EventDefinitionMetaData) object; + EventDefinitionMetaData md = (EventDefinitionMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -802,7 +803,7 @@ // public-render-parameter if (object instanceof PublicRenderParameterMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - PublicRenderParameterMetaData md = (PublicRenderParameterMetaData) object; + PublicRenderParameterMetaData md = (PublicRenderParameterMetaData)object; if ("identifier".equals(localName)) { md.setIdentifier(value); @@ -824,7 +825,7 @@ // container-runtime-option if (object instanceof ContainerRuntimeMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - ContainerRuntimeMetaData md = (ContainerRuntimeMetaData) object; + ContainerRuntimeMetaData md = (ContainerRuntimeMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -838,7 +839,7 @@ // listener if (object instanceof ListenerMetaData && PORTLET_JSR_286_NS.equals(nsURI)) { - ListenerMetaData md = (ListenerMetaData) object; + ListenerMetaData md = (ListenerMetaData)object; if ("listener-class".equals(localName)) { md.setListenerClass(value); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,17 +20,18 @@ * 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.metadata.impl; +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; +import org.jboss.xb.annotations.JBossXmlSchema; + +import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.xb.annotations.JBossXmlSchema; -import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; - /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -38,9 +39,9 @@ @XmlRootElement(name = "portlet-app") @XmlType(name = "portlet-appType") @JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = PortletMetaDataConstants.PORTLET_JSR_168_NS, prefix = "portlet")}, - ignoreUnresolvedFieldOrClass = false, - namespace = PortletMetaDataConstants.PORTLET_JSR_168_NS, - elementFormDefault = XmlNsForm.QUALIFIED) + ignoreUnresolvedFieldOrClass = false, + namespace = PortletMetaDataConstants.PORTLET_JSR_168_NS, + elementFormDefault = XmlNsForm.QUALIFIED) public class AnnotationPortletApplication10MetaData extends PortletApplication10MetaData { } \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,17 +20,18 @@ * 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.metadata.impl; +import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; +import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; +import org.jboss.xb.annotations.JBossXmlSchema; + import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.xb.annotations.JBossXmlSchema; -import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; -import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; - /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -39,9 +40,9 @@ @XmlRootElement(name = "portlet-app") @XmlType(name = "portlet-appType") @JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = PortletMetaDataConstants.PORTLET_JSR_286_NS, prefix = "portlet")}, - ignoreUnresolvedFieldOrClass = false, - namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS, - elementFormDefault = XmlNsForm.QUALIFIED) + ignoreUnresolvedFieldOrClass = false, + namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS, + elementFormDefault = XmlNsForm.QUALIFIED) public class AnnotationPortletApplication20MetaData extends PortletApplication20MetaData { } \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaDataException.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaDataException.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaDataException.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.metadata.impl; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -20,6 +20,7 @@ * 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.metadata.impl; import org.jboss.xb.binding.GenericObjectModelFactory; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/CodecBuilder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.url; -import java.util.LinkedHashSet; import java.util.ArrayList; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterDecoder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -89,7 +89,7 @@ } // - for (int i = builder.metaParameterNames.size() - 1;reservedParameter > 0;) + for (int i = builder.metaParameterNames.size() - 1; reservedParameter > 0;) { if (i < 0) { @@ -132,7 +132,7 @@ } // - for (Iterator i = parameters.entrySet().iterator();i.hasNext();) + for (Iterator i = parameters.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); String parameterName = (String)entry.getKey(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/url/ParameterEncoder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. *

18 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r9786 - in modules/portlet/trunk/test/src: test and 5 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:52:39 -0500 (Tue, 05 Feb 2008) New Revision: 9786 Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/portlet.xml modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/web.xml modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/portlet.xml modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/web.xml Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java modules/portlet/trunk/test/src/test/build.xml Log: - Define use of public render parameters in demo portlets. - Package demo portlets. Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java 2008-02-05 21:10:46 UTC (rev 9785) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java 2008-02-05 21:52:39 UTC (rev 9786) @@ -50,18 +50,14 @@ { protected static final String A = "<a"; private static final String A_TARGET_BLANK = "<a target='_blank'"; - private static final String ZIP = "zip"; + private static final String ZIP = "zipcode"; private static final String SAN_FRAN = "94102"; private static final String GOOGLE = "http://www.google.com/search?q="; @Override protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException { - String zip = renderRequest.getParameter(ZIP); - if (zip == null) - { - zip = renderRequest.getPreferences().getValue(ZIP, SAN_FRAN); - } + String zip = getZipCode(renderRequest); String query = getQueryString(zip); @@ -109,6 +105,16 @@ } } + protected String getZipCode(RenderRequest renderRequest) + { + String zip = renderRequest.getParameter(ZIP); + if (zip == null) + { + zip = renderRequest.getPreferences().getValue(ZIP, SAN_FRAN); + } + return zip; + } + @Override protected void doEdit(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException { @@ -120,7 +126,7 @@ "\n" + " <form method='post' action='" + renderResponse.createActionURL() + "'\n" + " <font class='portlet-font'>Zip Code:</font><br/>\n" + - " <input class='portlet-form-input-field' type='text' value='' size='12' name='zip'>\n" + + " <input class='portlet-form-input-field' type='text' value='' size='12' name='" + ZIP + "'/>\n" + " <br/>\n" + " <input class='portlet-form-input-field' type='submit' name='submit' value='submit'>\n" + " </form>\n" + Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-05 21:10:46 UTC (rev 9785) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -127,7 +127,7 @@ <path id="mc.log4j"> <pathelement path="${dependency.log4j.jar}"/> </path> - <path id="mc.portal-portlet"> + <path id="mc.portal-portlet"> <pathelement path="${dependency.portal-portlet.jar}"/> </path> <path id="mc.jaxb-api"> @@ -202,7 +202,7 @@ </target> - <macrodef name="package-misc-test"> + <macrodef name="package-misc-test"> <attribute name="test"/> <sequential> <package-testsuite testsuiteversion="jsr168" testsuitetype="misc" testsuitename="@{test}"/> @@ -460,13 +460,13 @@ </target> - <target name="cargo.setup"> + <target name="cargo.setup"> <property name="cargo.log.dir" value="${target}/test/cargo"/> <mkdir dir="${cargo.log.dir}"/> <taskdef resource="cargo.tasks"> - <classpath> - <pathelement path="${plugin_classpath}"/> - </classpath> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> </taskdef> </target> @@ -579,10 +579,10 @@ <target name="cargo.tomcat-6.start" depends="cargo.setup"> - <taskdef resource="cargo.tasks"> - <classpath> - <pathelement path="${plugin_classpath}"/> - </classpath> + <taskdef resource="cargo.tasks"> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> </taskdef> <cargo @@ -616,7 +616,7 @@  <deployable type="war" file="${test.temp.lib}/manager.war"/> <deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/> - </configuration> + </configuration> </cargo> </target> @@ -687,7 +687,6 @@ <delete dir="${target}/simple-portal"/> <jar jarfile="${target}/portlet-test-lib.jar"> -  <fileset dir="${target}/classes"/> </jar> @@ -749,10 +748,25 @@ <delete file="${target}/portlet-test-lib.jar"/> + <antcall target="package-demo-portlets"/> </target> -  + <target name="package-demo-portlets" depends="prepare_env"> + <copy todir="${test.temp.dir}/google-map-portlet-war"> + <fileset dir="src/test/resources/google-map-portlet-war"/> + <fileset dir="${target}/classes" includes="org/jboss/portal/simple/samples/GoogleClippingPortlet.class"/> + </copy> + <jar jarfile="${target}/google-map-portlet.war"> + <fileset dir="${test.temp.dir}/google-map-portlet-war"/> + </jar> + <copy todir="${test.temp.dir}/google-weather-portlet-war"> + <fileset dir="src/test/resources/google-weather-portlet-war"/> + <fileset dir="${target}/classes" includes="org/jboss/portal/simple/samples/*.class"/> + </copy> + <jar jarfile="${target}/google-weather-portlet.war"> + <fileset dir="${test.temp.dir}/google-weather-portlet-war"/> + </jar> + </target> + </project> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/portlet.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/portlet.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> + <portlet-name>GoogleMap</portlet-name> + <portlet-class>org.jboss.portal.simple.samples.GoogleClippingPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <supported-public-render-parameter>g:zipcode</supported-public-render-parameter> + </portlet> + + <public-render-parameter> + <identifier>zipcode</identifier> + <qname xmlns:g='urn:jboss:portal:simple:google'>g:zipcode</qname> + </public-render-parameter> + +</portlet-app> + Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB-INF/web.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app/> + Added: modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/portlet.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/portlet.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> + <portlet-name>GoogleWeather</portlet-name> + <portlet-class>org.jboss.portal.simple.samples.GoogleWeatherClippingPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <supported-public-render-parameter>g:zipcode</supported-public-render-parameter> + </portlet> + + <public-render-parameter> + <identifier>zipcode</identifier> + <qname xmlns:g='urn:jboss:portal:simple:google'>g:zipcode</qname> + </public-render-parameter> + +</portlet-app> + Added: modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF/web.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app/> +

18 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r9785 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:10:46 -0500 (Tue, 05 Feb 2008) New Revision: 9785 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java Log: - Fixed incorrect implementation of renderError Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java 2008-02-05 18:18:56 UTC (rev 9784) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java 2008-02-05 21:10:46 UTC (rev 9785) @@ -62,7 +62,7 @@ public String renderError(ErrorResponse error) { String html = error.toHTML(); - StringBuilder builder = new StringBuilder(html + 50); + StringBuilder builder = new StringBuilder(html.length() + 50); builder.append("<div class='error'>").append(html).append("</div>"); return builder.toString(); }

18 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r9784 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 13:18:56 -0500 (Tue, 05 Feb 2008) New Revision: 9784 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java Log: removed a done todo Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 18:17:46 UTC (rev 9783) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 18:18:56 UTC (rev 9784) @@ -41,8 +41,6 @@ * - produce new events (what exists today) * - make it a portal event which delivers the event to the portal * - * 3/ delegate public render parameter wiring to the context - * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */

18 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r9783 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 13:17:46 -0500 (Tue, 05 Feb 2008) New Revision: 9783 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java Log: remove a bit of non used code Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 18:17:46 UTC (rev 9783) @@ -10,7 +10,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.response.ErrorResponse; @@ -31,8 +30,6 @@ import org.jboss.portal.portlet.controller.state.StateControllerContext; import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -162,9 +159,6 @@ PortletInvocationResponse invoke(PortletRequest portletRequest) throws PortletInvokerException { PortletControllerContext context = portletRequest.getControllerContext(); - PortletInfo portlet = context.getPortletInfo(portletRequest.getWindowId()); - HttpServletRequest req = context.getClientRequest(); - HttpServletResponse resp = context.getClientResponse(); // if (portletRequest instanceof PortletRenderRequest) @@ -224,9 +218,6 @@ PageNavigationalState pageState, List<Cookie> requestCookies) throws PortletInvokerException { - PortletInfo portlet = context.getPortletInfo(event.getWindowId()); - HttpServletRequest req = context.getClientRequest(); - HttpServletResponse resp = context.getClientResponse(); WindowNavigationalState windowNS = pageState.getWindowNavigationalState(event.getWindowId()); // @@ -261,9 +252,6 @@ PageNavigationalState pageState) throws PortletInvokerException { - PortletInfo portlet = context.getPortletInfo(windowId); - - // WindowNavigationalState windowNS = pageState.getWindowNavigationalState(windowId); // Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 18:17:46 UTC (rev 9783) @@ -29,7 +29,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -41,8 +40,6 @@ import org.jboss.portal.portlet.controller.response.ResourceResponse; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** @@ -73,9 +70,6 @@ CacheLevel cacheability; PortletControllerContext context = portletResourceRequest.getControllerContext(); - PortletInfo portlet = context.getPortletInfo(portletResourceRequest.getWindowId()); - HttpServletRequest req = context.getClientRequest(); - HttpServletResponse resp = context.getClientResponse(); // if (portletResourceRequest instanceof PortletScopedPortletResourceRequest)

18 years, 2 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 13:14:56 -0500 (Tue, 05 Feb 2008) New Revision: 9782 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java Log: - now delegates the update of public nav state of a window to the context because it can have several interpretations/implementations Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -10,8 +10,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; @@ -35,7 +33,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -298,27 +295,7 @@ Map<String, String[]> publicNS = update.getPublicNavigationalStateUpdates(); if (publicNS != null) { - NavigationInfo navigationInfo = portlet.getNavigation(); - for (Map.Entry<String, String[]> entry : publicNS.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) - { - pageState.setPublicNavigationalState(name, value); - } - else - { - pageState.removePublicNavigationalState(name); - } - } - } + pageState.setPublicNavigationalState(windowId, publicNS); } } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -23,8 +23,13 @@ package org.jboss.portal.portlet.controller.impl.state; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.info.NavigationInfo; +import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.PortletInvokerException; import javax.xml.namespace.QName; +import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -43,11 +48,47 @@ super(original); } - public void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) + public void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) { - windows.put(windowId, windowNS); + windows.put(windowId, windowState); } + public void setPublicNavigationalState(String windowId, Map<String, String[]> update) + { + try + { + PortletInfo info = context.portletControllerContext.getPortletInfo(windowId); + + 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); + } + } + } + } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } + } + public void setPublicNavigationalState(QName name, String[] value) { // We clone the value in order to keep the state not mutated by a side effect Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -104,11 +104,16 @@ return publicNavigationalState; } - public void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) throws UnsupportedOperationException + public void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } + public void setPublicNavigationalState(String windowId, Map<String, String[]> update) + { + throw new UnsupportedOperationException(); + } + public void setPublicNavigationalState(QName name, String[] value) throws UnsupportedOperationException { throw new UnsupportedOperationException(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -23,24 +23,55 @@ package org.jboss.portal.portlet.controller.state; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.info.PortletInfo; -import javax.xml.namespace.QName; +import java.util.Map; /** + * Defines the page navigational state that the controller needs. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ public interface PageNavigationalState { + /** + * Returns the navigational state of a window or null if it does not exist. + * + * @param windowId the window + * @return the window navigational state + */ WindowNavigationalState getWindowNavigationalState(String windowId); + /** + * Update the navigational state of a window. + * + * @param windowId the window id + * @param windowState the window state + * @throws UnsupportedOperationException if the page state is read only + */ + void setWindowNavigationalState(String windowId, WindowNavigationalState windowState) throws UnsupportedOperationException; + + /** + * 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 + */ ParameterMap getPublicNavigationalState(String windowId); - void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) throws UnsupportedOperationException; - - void setPublicNavigationalState(QName name, String[] value) throws UnsupportedOperationException; - - void removePublicNavigationalState(QName name) throws UnsupportedOperationException; + /** + * 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 UnsupportedOperationException if the page state is read only + */ + void setPublicNavigationalState(String windowId, Map<String, String[]> update) throws UnsupportedOperationException; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -23,14 +23,27 @@ package org.jboss.portal.portlet.controller.state; /** + * The context used by the controller to manage state. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ public interface StateControllerContext { + /** + * Clone an existing page state object. + * + * @param pageState the page state to clone + * @return the page state clone + */ PageNavigationalState clonePageState(PageNavigationalState pageState); + /** + * Create a new page state object. + * + * @return the new page state + */ PageNavigationalState createPageState(); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -29,6 +29,8 @@ import java.io.Serializable; /** + * The navigational state of a window that contains the portlet navigational state, the mode and window state. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */

18 years, 2 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 12:52:29 -0500 (Tue, 05 Feb 2008) New Revision: 9781 Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.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/controller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java Log: use window id in PageNavigationalState instead of "Portlet" for the public render parameter retrieval Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -1,60 +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.controller; - -import org.jboss.portal.portlet.controller.WindowNavigationalState; - -import javax.xml.namespace.QName; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class MutablePageNavigationalState extends PageNavigationalState -{ - - public MutablePageNavigationalState() - { - } - - public MutablePageNavigationalState(PageNavigationalState original) - { - super(original); - } - - public void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) - { - windows.put(windowId, windowNS); - } - - public void setPublicNavigationalState(QName name, String[] value) - { - // 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) - { - page.remove(name); - } -} \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -206,7 +206,7 @@ } // - ParameterMap publicNS = pageState.getPublicNavigationalState(portlet); + ParameterMap publicNS = pageState.getPublicNavigationalState(portletRequest.getWindowId()); PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(portletRequest.getWindowId(), pageState); ActionInvocation actionInvocation = new ActionInvocation(portletInvocationContext); @@ -239,7 +239,7 @@ } // - ParameterMap publicNS = pageState.getPublicNavigationalState(portlet); + ParameterMap publicNS = pageState.getPublicNavigationalState(event.getWindowId()); // PortletInvocationContext portletInvocationContext = context.createPortletInvocationContext(event.getWindowId(), pageState); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -95,7 +95,7 @@ // if (pageState != null) { - publicNS = pageState.getPublicNavigationalState(portlet); + publicNS = pageState.getPublicNavigationalState(portletResourceRequest.getWindowId()); } } else Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -1,73 +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.controller.event; - -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; - -import java.util.List; -import java.util.Collections; -import java.util.ArrayList; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class EventControllerContextImpl implements EventControllerContext -{ - - /** . */ - private PortletInvoker invoker; - - public EventControllerContextImpl(PortletInvoker invoker) - { - this.invoker = invoker; - } - - public List<Event> getConsumedEvents(Event producedEvent) - { - try - { - ArrayList<Event> consumedEvents = new ArrayList<Event>(); - for (Portlet portlet : invoker.getPortlets()) - { - PortletInfo portletInfo = portlet.getInfo(); - if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) - { - Event consumedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext().getId()); - consumedEvents.add(consumedEvent); - } - } - return consumedEvents; - } - catch (PortletInvokerException e) - { - System.out.println("e = " + e); - - // - return Collections.emptyList(); - } - } -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -33,8 +33,9 @@ class MutablePageNavigationalState extends PageNavigationalStateImpl { - public MutablePageNavigationalState() + MutablePageNavigationalState(StateControllerContextImpl context) { + super(context); } public MutablePageNavigationalState(PageNavigationalStateImpl original) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -27,18 +27,12 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.PortletInvokerException; import javax.xml.namespace.QName; import java.util.Map; import java.util.HashMap; -import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -47,20 +41,25 @@ class PageNavigationalStateImpl implements PageNavigationalState, Serializable { + /** We don't save it. */ + protected transient StateControllerContextImpl context; + /** . */ protected final Map<String, WindowNavigationalState> windows; /** . */ protected final Map<QName, String[]> page; - public PageNavigationalStateImpl() + public PageNavigationalStateImpl(StateControllerContextImpl context) { + this.context = context; this.windows = new HashMap<String, WindowNavigationalState>(); this.page = new HashMap<QName, String[]>(); } public PageNavigationalStateImpl(PageNavigationalStateImpl original) { + this.context = original.context; this.windows = new HashMap<String, WindowNavigationalState>(original.windows); this.page = new HashMap<QName, String[]>(original.page); } @@ -70,28 +69,36 @@ return windows.get(windowId); } - public ParameterMap getPublicNavigationalState(PortletInfo portlet) + public ParameterMap getPublicNavigationalState(String windowId) { ParameterMap publicNavigationalState = null; - for (ParameterInfo parameterInfo : portlet.getNavigation().getPublicParameters()) + try { - String[] parameterValue = page.get(parameterInfo.getName()); - - // - if (parameterValue != null) + PortletInfo info = context.portletControllerContext.getPortletInfo(windowId); + for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters()) { - String parameterId = parameterInfo.getId(); + String[] parameterValue = page.get(parameterInfo.getName()); - // Lazy create - if (publicNavigationalState == null) + // + if (parameterValue != null) { - publicNavigationalState = new ParameterMap(); + String parameterId = parameterInfo.getId(); + + // Lazy create + if (publicNavigationalState == null) + { + publicNavigationalState = new ParameterMap(); + } + + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); } - - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); } } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } // return publicNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -24,6 +24,7 @@ import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; import java.io.IOException; import java.io.ByteArrayOutputStream; @@ -40,6 +41,14 @@ public class StateControllerContextImpl implements StateControllerContext { + /** . */ + protected final PortletControllerContext portletControllerContext; + + public StateControllerContextImpl(PortletControllerContext portletControllerContext) + { + this.portletControllerContext = portletControllerContext; + } + public PageNavigationalState clonePageState(PageNavigationalState pageState) { return new MutablePageNavigationalState((PageNavigationalStateImpl)pageState); @@ -47,10 +56,10 @@ public PageNavigationalState createPageState() { - return new MutablePageNavigationalState(); + return new MutablePageNavigationalState(this); } - public static byte[] serialize(PageNavigationalState object) throws IOException + public byte[] serialize(PageNavigationalState object) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); GZIPOutputStream zos = new GZIPOutputStream(baos); @@ -60,11 +69,13 @@ return baos.toByteArray(); } - public static PageNavigationalState unserialize(byte[] bytes) throws IOException, ClassNotFoundException + public PageNavigationalState unserialize(byte[] bytes) throws IOException, ClassNotFoundException { ByteArrayInputStream bais = new ByteArrayInputStream(bytes); GZIPInputStream zis = new GZIPInputStream(bais); ObjectInputStream ois = new ObjectInputStream(zis); - return (PageNavigationalState)ois.readObject(); + PageNavigationalStateImpl state = (PageNavigationalStateImpl)ois.readObject(); + state.context = this; + return state; } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -36,7 +36,7 @@ WindowNavigationalState getWindowNavigationalState(String windowId); - ParameterMap getPublicNavigationalState(PortletInfo portlet); + ParameterMap getPublicNavigationalState(String windowId); void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) throws UnsupportedOperationException; 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-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -169,7 +169,7 @@ } // - ParameterMap publicNS = pageState.getPublicNavigationalState(portlet.getInfo()); + ParameterMap publicNS = pageState.getPublicNavigationalState(portlet.getContext().getId()); RenderInvocation render = createRenderInvocation(context, properties, pageState, portlet, windowNS, mode, windowState, portletNS, publicNS); 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-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -113,7 +113,7 @@ private final EventControllerContext eventControllerContext; /** . */ - private final StateControllerContext stateControllerContext; + private final StateControllerContextImpl stateControllerContext; public PortletControllerContextImpl( HttpServletRequest req, @@ -123,6 +123,9 @@ { PortletInvoker invoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); + // + StateControllerContextImpl tmp = new StateControllerContextImpl(this); + // The nav state provided with the request PageNavigationalState pageState = null; @@ -144,7 +147,7 @@ if (context != null) { byte[] bytes = Tools.fromHexString(context); - pageState = StateControllerContextImpl.unserialize(bytes); + pageState = tmp.unserialize(bytes); } // @@ -265,7 +268,7 @@ this.servletContext = servletContext; this.invoker = invoker; this.eventControllerContext = new EventControllerContextImpl(invoker); - this.stateControllerContext = new StateControllerContextImpl(); + this.stateControllerContext = tmp; } public ControllerRequest getRequest() @@ -320,7 +323,7 @@ public String renderURL(String windowId, PageNavigationalState pageState, ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative) { - PortletURLRenderer renderer = new PortletURLRenderer(pageState, windowId, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(stateControllerContext, pageState, windowId, req, resp); // return renderer.renderURL(containerURL, wantSecure, wantAuthenticated, relative); @@ -385,6 +388,6 @@ public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageState) { - return new TestPortletInvocationContext(req, resp, windowId, pageState, MARKUP_INFO); + return new TestPortletInvocationContext(stateControllerContext, req, resp, windowId, pageState, MARKUP_INFO); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -52,6 +52,9 @@ { /** . */ + final StateControllerContextImpl stateContext; + + /** . */ final String windowId; /** . */ @@ -64,11 +67,13 @@ final PageNavigationalState pageNS; public PortletURLRenderer( + StateControllerContextImpl stateContext, PageNavigationalState pageNS, String windowId, HttpServletRequest clientReq, HttpServletResponse clientResp) { + this.stateContext = stateContext; this.pageNS = pageNS; this.windowId = windowId; this.clientReq = clientReq; @@ -114,7 +119,7 @@ String pageState; try { - byte[] bytes = StateControllerContextImpl.serialize(pageNS); + byte[] bytes = stateContext.serialize(pageNS); pageState = Tools.toHexString(bytes); } catch (IOException e) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -24,6 +24,7 @@ import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.test.controller.PortletURLRenderer; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; @@ -42,6 +43,9 @@ { /** . */ + private final StateControllerContextImpl stateContext; + + /** . */ private final PortletURLRenderer urlRenderer; /** . */ @@ -57,6 +61,7 @@ private final HttpServletResponse clientResponse; public TestPortletInvocationContext( + StateControllerContextImpl stateContext, HttpServletRequest clientRequest, HttpServletResponse clientResponse, String windowId, @@ -66,11 +71,12 @@ super(markupInfo); // + this.stateContext = stateContext; this.clientRequest = clientRequest; this.clientResponse = clientResponse; this.windowId = windowId; this.pageState = pageState; - this.urlRenderer = new PortletURLRenderer(pageState, windowId, clientRequest, clientResponse); + this.urlRenderer = new PortletURLRenderer(stateContext, pageState, windowId, clientRequest, clientResponse); // addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(clientRequest));

18 years, 2 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 12:17:28 -0500 (Tue, 05 Feb 2008) New Revision: 9780 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.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/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/controller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java Log: - introduce state controller context class Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -1,115 +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.controller; - -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.info.ParameterInfo; -import org.jboss.portal.portlet.info.PortletInfo; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.HashMap; -import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PageNavigationalState implements Serializable -{ - - /** . */ - protected final Map<String, WindowNavigationalState> windows; - - /** . */ - protected final Map<QName, String[]> page; - - public PageNavigationalState() - { - this.windows = new HashMap<String, WindowNavigationalState>(); - this.page = new HashMap<QName, String[]>(); - } - - public PageNavigationalState(PageNavigationalState original) - { - this.windows = new HashMap<String, WindowNavigationalState>(original.windows); - this.page = new HashMap<QName, String[]>(original.page); - } - - public WindowNavigationalState getWindowNavigationalState(String windowId) - { - return windows.get(windowId); - } - - public ParameterMap getPublicNavigationalState(PortletInfo portlet) - { - ParameterMap publicNavigationalState = null; - for (ParameterInfo parameterInfo : portlet.getNavigation().getPublicParameters()) - { - String[] parameterValue = page.get(parameterInfo.getName()); - - // - if (parameterValue != null) - { - String parameterId = parameterInfo.getId(); - - // Lazy create - if (publicNavigationalState == null) - { - publicNavigationalState = new ParameterMap(); - } - - // We clone the value here so we keep the internal state not potentially changed - publicNavigationalState.put(parameterId, parameterValue.clone()); - } - } - - // - return publicNavigationalState; - } - - public static byte[] serialize(PageNavigationalState object) throws IOException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream zos = new GZIPOutputStream(baos); - ObjectOutputStream oos = new ObjectOutputStream(zos); - oos.writeObject(object); - oos.close(); - return baos.toByteArray(); - } - - public static PageNavigationalState unserialize(byte[] bytes) throws IOException, ClassNotFoundException - { - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - GZIPInputStream zis = new GZIPInputStream(bais); - ObjectInputStream ois = new ObjectInputStream(zis); - return (PageNavigationalState)ois.readObject(); - } -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -30,6 +30,8 @@ import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -64,4 +66,6 @@ EventControllerContext getEventControllerContext(); + StateControllerContext getStateControllerContext(); + } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -28,6 +28,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.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -64,10 +67,20 @@ { PortletControllerContext context = portletRequest.getControllerContext(); + StateControllerContext stateContext = context.getStateControllerContext(); + // 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 - MutablePageNavigationalState pageState = portletRequest.getPageState() == null ? new MutablePageNavigationalState() : new MutablePageNavigationalState(portletRequest.getPageState()); + PageNavigationalState pageState = portletRequest.getPageState(); + if (pageState == null) + { + pageState = stateContext.createPageState(); + } + else + { + pageState = stateContext.clonePageState(pageState); + } // ResponseProperties requestProperties = new ResponseProperties(); @@ -244,8 +257,11 @@ return context.invoke(event.getWindowId(), requestCookies, eventInvocation); } - private void updateNavigationalState(PortletControllerContext context, String windowId, - UpdateNavigationalStateResponse update, MutablePageNavigationalState pageState) + private void updateNavigationalState( + PortletControllerContext context, + String windowId, + UpdateNavigationalStateResponse update, + PageNavigationalState pageState) throws PortletInvokerException { PortletInfo portlet = context.getPortletInfo(windowId); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -39,6 +39,7 @@ import org.jboss.portal.portlet.controller.request.PortletScopedPortletResourceRequest; 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 javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -1,75 +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.controller; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.StateString; - -import java.io.Serializable; - -/** - * @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; - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java (from rev 9779, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,75 @@ +/****************************************************************************** + * 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.controller.impl.event; + +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.info.PortletInfo; + +import java.util.List; +import java.util.Collections; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class EventControllerContextImpl implements EventControllerContext +{ + + /** . */ + private PortletInvoker invoker; + + public EventControllerContextImpl(PortletInvoker invoker) + { + this.invoker = invoker; + } + + public List<Event> getConsumedEvents(Event producedEvent) + { + try + { + ArrayList<Event> consumedEvents = new ArrayList<Event>(); + for (Portlet portlet : invoker.getPortlets()) + { + PortletInfo portletInfo = portlet.getInfo(); + if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) + { + Event consumedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext().getId()); + consumedEvents.add(consumedEvent); + } + } + return consumedEvents; + } + catch (PortletInvokerException e) + { + System.out.println("e = " + e); + + // + return Collections.emptyList(); + } + } +} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java (from rev 9779, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,60 @@ +/****************************************************************************** + * 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.controller.impl.state; + +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; + +import javax.xml.namespace.QName; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +class MutablePageNavigationalState extends PageNavigationalStateImpl +{ + + public MutablePageNavigationalState() + { + } + + public MutablePageNavigationalState(PageNavigationalStateImpl original) + { + super(original); + } + + public void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) + { + windows.put(windowId, windowNS); + } + + public void setPublicNavigationalState(QName name, String[] value) + { + // 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) + { + page.remove(name); + } +} \ No newline at end of file Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,115 @@ +/****************************************************************************** + * 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.controller.impl.state; + +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; + +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.HashMap; +import java.util.zip.GZIPOutputStream; +import java.util.zip.GZIPInputStream; +import java.io.Serializable; +import java.io.ObjectOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ByteArrayInputStream; +import java.io.ObjectInputStream; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +class PageNavigationalStateImpl implements PageNavigationalState, Serializable +{ + + /** . */ + protected final Map<String, WindowNavigationalState> windows; + + /** . */ + protected final Map<QName, String[]> page; + + public PageNavigationalStateImpl() + { + this.windows = new HashMap<String, WindowNavigationalState>(); + this.page = new HashMap<QName, String[]>(); + } + + public PageNavigationalStateImpl(PageNavigationalStateImpl original) + { + this.windows = new HashMap<String, WindowNavigationalState>(original.windows); + this.page = new HashMap<QName, String[]>(original.page); + } + + public WindowNavigationalState getWindowNavigationalState(String windowId) + { + return windows.get(windowId); + } + + public ParameterMap getPublicNavigationalState(PortletInfo portlet) + { + ParameterMap publicNavigationalState = null; + for (ParameterInfo parameterInfo : portlet.getNavigation().getPublicParameters()) + { + String[] parameterValue = page.get(parameterInfo.getName()); + + // + if (parameterValue != null) + { + String parameterId = parameterInfo.getId(); + + // Lazy create + if (publicNavigationalState == null) + { + publicNavigationalState = new ParameterMap(); + } + + // We clone the value here so we keep the internal state not potentially changed + publicNavigationalState.put(parameterId, parameterValue.clone()); + } + } + + // + return publicNavigationalState; + } + + public void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) throws UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } + + public void setPublicNavigationalState(QName name, String[] value) throws UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } + + public void removePublicNavigationalState(QName name) throws UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } + +} \ No newline at end of file Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/impl/state/StateControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,70 @@ +/****************************************************************************** + * 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.controller.impl.state; + +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; + +import java.io.IOException; +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ObjectInputStream; +import java.util.zip.GZIPOutputStream; +import java.util.zip.GZIPInputStream; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class StateControllerContextImpl implements StateControllerContext +{ + + public PageNavigationalState clonePageState(PageNavigationalState pageState) + { + return new MutablePageNavigationalState((PageNavigationalStateImpl)pageState); + } + + public PageNavigationalState createPageState() + { + return new MutablePageNavigationalState(); + } + + public static byte[] serialize(PageNavigationalState object) throws IOException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + GZIPOutputStream zos = new GZIPOutputStream(baos); + ObjectOutputStream oos = new ObjectOutputStream(zos); + oos.writeObject(object); + oos.close(); + return baos.toByteArray(); + } + + public static PageNavigationalState unserialize(byte[] bytes) throws IOException, ClassNotFoundException + { + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + GZIPInputStream zis = new GZIPInputStream(bais); + ObjectInputStream ois = new ObjectInputStream(zis); + return (PageNavigationalState)ois.readObject(); + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.common.util.ParameterMap; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import java.util.Map; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java (from rev 9779, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,46 @@ +/****************************************************************************** + * 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.controller.state; + +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.info.PortletInfo; + +import javax.xml.namespace.QName; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PageNavigationalState +{ + + WindowNavigationalState getWindowNavigationalState(String windowId); + + ParameterMap getPublicNavigationalState(PortletInfo portlet); + + void setWindowNavigationalState(String windowId, WindowNavigationalState windowNS) throws UnsupportedOperationException; + + void setPublicNavigationalState(QName name, String[] value) throws UnsupportedOperationException; + + void removePublicNavigationalState(QName name) throws UnsupportedOperationException; +} Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/StateControllerContext.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,36 @@ +/****************************************************************************** + * 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.controller.state; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface StateControllerContext +{ + + PageNavigationalState clonePageState(PageNavigationalState pageState); + + PageNavigationalState createPageState(); + +} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java (from rev 9779, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/state/WindowNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,75 @@ +/****************************************************************************** + * 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.controller.state; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.StateString; + +import java.io.Serializable; + +/** + * @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/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-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.test.controller.PortletControllerContextImpl; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.test.controller.ControllerResponseRendererFactory; import org.jboss.portal.portlet.test.controller.Renderer; import org.jboss.portal.portlet.test.controller.PageRenderer; @@ -88,7 +88,7 @@ } else { - PageRenderer renderer = new PageRenderer(new ResponseProperties(), new PageNavigationalState()); + PageRenderer renderer = new PageRenderer(new ResponseProperties(), context.getStateControllerContext().createPageState()); // renderer.render(context); 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-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -42,8 +42,8 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.w3c.dom.Element; 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-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -51,13 +51,13 @@ import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.test.StringCodec; -import org.jboss.portal.portlet.test.controller.TestInstanceContext; -import org.jboss.portal.portlet.test.controller.TestPortalContext; -import org.jboss.portal.portlet.test.controller.TestPortletInvocationContext; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; +import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletScopedPortletResourceRequest; @@ -65,7 +65,6 @@ import org.jboss.portal.portlet.controller.request.PageScopedFullPortletResourceRequest; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.EventControllerContextImpl; import org.jboss.portal.web.Body; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.web.WebRequest; @@ -113,6 +112,9 @@ /** . */ private final EventControllerContext eventControllerContext; + /** . */ + private final StateControllerContext stateControllerContext; + public PortletControllerContextImpl( HttpServletRequest req, HttpServletResponse resp, @@ -142,7 +144,7 @@ if (context != null) { byte[] bytes = Tools.fromHexString(context); - pageState = PageNavigationalState.unserialize(bytes); + pageState = StateControllerContextImpl.unserialize(bytes); } // @@ -263,6 +265,7 @@ this.servletContext = servletContext; this.invoker = invoker; this.eventControllerContext = new EventControllerContextImpl(invoker); + this.stateControllerContext = new StateControllerContextImpl(); } public ControllerRequest getRequest() @@ -310,6 +313,11 @@ return eventControllerContext; } + public StateControllerContext getStateControllerContext() + { + return stateControllerContext; + } + public String renderURL(String windowId, PageNavigationalState pageState, ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative) { PortletURLRenderer renderer = new PortletURLRenderer(pageState, windowId, req, resp); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletURLRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -34,7 +34,8 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.test.StringCodec; import javax.servlet.http.HttpServletRequest; @@ -113,7 +114,7 @@ String pageState; try { - byte[] bytes = PageNavigationalState.serialize(pageNS); + byte[] bytes = StateControllerContextImpl.serialize(pageNS); pageState = Tools.toHexString(bytes); } catch (IOException e) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/TestPortletInvocationContext.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.test.controller.PortletURLRenderer; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,7 +23,6 @@ package org.jboss.portal.simple; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller.Renderer; @@ -88,7 +87,7 @@ } else { - PageRenderer renderer = new PageRenderer(new ResponseProperties(), new PageNavigationalState()); + PageRenderer renderer = new PageRenderer(new ResponseProperties(), context.getStateControllerContext().createPageState()); // renderer.render(context);

18 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r9779 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-02-05 11:07:25 -0500 (Tue, 05 Feb 2008) New Revision: 9779 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java Log: added a few todos Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 15:46:21 UTC (rev 9778) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 16:07:25 UTC (rev 9779) @@ -34,6 +34,15 @@ * The portlet controller which handles the page state management and the interactions between * the action phase and the event phase. It really only does that and not more. * + * 1/ introduce EventRequest so the portal can send events directly to a portlet + * + * 2/ make the event controller return a decision for a given event. Today it just returns a list + * of events to process. An event can be handled in various manners by the controller: + * - produce new events (what exists today) + * - make it a portal event which delivers the event to the portal + * + * 3/ delegate public render parameter wiring to the context + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */

18 years, 2 months

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 February 2008