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. *