[portal-commits] JBoss Portal SVN: r9777 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal: portlet/controller and 6 other directories.

Author: julien(a)jboss.com Date: 2008-02-05 10:38:52 -0500 (Tue, 05 Feb 2008) New Revision: 9777 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/ Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java 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/PortletResourceRequestHandler.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/WindowNavigationalState.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/event/EventControllerContextImpl.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/ControllerResponse.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/response/ResourceResponse.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/controller2/AbstractMarkupRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ControllerResponseRendererFactory.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ErrorResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/RedirectResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/Renderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortletInvocationContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java Log: move controller package to org/jboss/portal/portlet Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller (from rev 9775, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/MutablePageNavigationalState.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/MutablePageNavigationalState.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,9 +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.controller; +package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.WindowNavigationalState; import javax.xml.namespace.QName; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigationalState.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,10 +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.controller; +package org.jboss.portal.portlet.controller; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; 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/test/controller/PortletController.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,15 +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; +package org.jboss.portal.portlet.controller; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.test.controller.request.ControllerRequest; -import org.jboss.portal.portlet.test.controller.request.PortletRequest; -import org.jboss.portal.portlet.test.controller.request.PortletResourceRequest; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.PortletRequest; +import org.jboss.portal.portlet.controller.request.PortletResourceRequest; +import org.jboss.portal.portlet.controller.response.ControllerResponse; import java.io.IOException; 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/test/controller/PortletControllerContext.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,7 +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; +package org.jboss.portal.portlet.controller; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -29,7 +29,7 @@ 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.test.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; 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/test/controller/PortletRequestHandler.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -2,7 +2,7 @@ * Copyright (c) 2008, Your Corporation. All Rights Reserved. */ -package org.jboss.portal.portlet.test.controller; +package org.jboss.portal.portlet.controller; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -19,15 +19,15 @@ 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.test.controller.event.Event; -import org.jboss.portal.portlet.test.controller.event.EventControllerContext; -import org.jboss.portal.portlet.test.controller.request.ControllerRequest; -import org.jboss.portal.portlet.test.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.test.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.test.controller.request.PortletRequest; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller.response.PageUpdateResponse; -import org.jboss.portal.portlet.test.controller.response.PortletResponse; +import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.PortletActionRequest; +import org.jboss.portal.portlet.controller.request.PortletRenderRequest; +import org.jboss.portal.portlet.controller.request.PortletRequest; +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 javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -21,7 +21,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.portlet.test.controller; +package org.jboss.portal.portlet.controller; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -33,12 +33,12 @@ import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.test.controller.request.ControllerRequest; -import org.jboss.portal.portlet.test.controller.request.PageScopedFullPortletResourceRequest; -import org.jboss.portal.portlet.test.controller.request.PortletResourceRequest; -import org.jboss.portal.portlet.test.controller.request.PortletScopedPortletResourceRequest; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller.response.ResourceResponse; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.PageScopedFullPortletResourceRequest; +import org.jboss.portal.portlet.controller.request.PortletResourceRequest; +import org.jboss.portal.portlet.controller.request.PortletScopedPortletResourceRequest; +import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.response.ResourceResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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/test/controller/RequestHandler.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -2,12 +2,12 @@ * Copyright (c) 2008, Your Corporation. All Rights Reserved. */ -package org.jboss.portal.portlet.test.controller; +package org.jboss.portal.portlet.controller; import org.apache.log4j.Logger; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.test.controller.request.ControllerRequest; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import java.io.IOException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/WindowNavigationalState.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNavigationalState.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,7 +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; +package org.jboss.portal.portlet.controller; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; 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/test/controller/event/Event.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,10 +20,8 @@ * 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.event; +package org.jboss.portal.portlet.controller.event; -import org.jboss.portal.portlet.PortletContext; - import javax.xml.namespace.QName; import java.io.Serializable; 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/test/controller/event/EventControllerContext.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,7 +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.event; +package org.jboss.portal.portlet.controller.event; import java.util.List; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/EventControllerContextImpl.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContextImpl.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,7 +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.event; +package org.jboss.portal.portlet.controller.event; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.Portlet; 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/test/controller/request/ContainerRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,9 +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.controller.request; +package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +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/ControllerRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/ControllerRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/ControllerRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,9 +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.controller.request; +package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +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/FullScopedCacheablePortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,10 +20,10 @@ * 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.request; +package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,12 +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.request; +package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,12 +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.request; +package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.common.util.ParameterMap; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRenderRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,11 +20,11 @@ * 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.request; +package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PageNavigationalState; import java.util.Map; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,11 +20,11 @@ * 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.request; +package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.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/test/controller/request/PortletResourceRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,11 +20,11 @@ * 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.request; +package org.jboss.portal.portlet.controller.request; import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; import java.util.Map; 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/test/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,10 +20,10 @@ * 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.request; +package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/ControllerResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/ControllerResponse.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -21,7 +21,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.portlet.test.controller.response; +package org.jboss.portal.portlet.controller.response; /** * Must be used as base class for high level response provided by the controller that will be translated into something 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/test/controller/response/PageUpdateResponse.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,12 +20,11 @@ * 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.response; +package org.jboss.portal.portlet.controller.response; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.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/test/controller/response/PortletResponse.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -20,7 +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.response; +package org.jboss.portal.portlet.controller.response; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceResponse.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -21,7 +21,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.portlet.test.controller.response; +package org.jboss.portal.portlet.controller.response; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; 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 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller.PortletController; +import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.test.controller2.PortletControllerContextImpl; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller2.ControllerResponseRendererFactory; import org.jboss.portal.portlet.test.controller2.Renderer; import org.jboss.portal.portlet.test.controller2.PageRenderer; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/AbstractMarkupRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/AbstractMarkupRenderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/AbstractMarkupRenderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller2; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.MultiValuedPropertyMap; import javax.servlet.http.HttpServletResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ControllerResponseRendererFactory.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ControllerResponseRendererFactory.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ControllerResponseRendererFactory.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller.response.PageUpdateResponse; -import org.jboss.portal.portlet.test.controller.response.ResourceResponse; -import org.jboss.portal.portlet.test.controller.response.PortletResponse; +import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.response.PageUpdateResponse; +import org.jboss.portal.portlet.controller.response.ResourceResponse; +import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; import org.jboss.portal.portlet.invocation.response.ErrorResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ErrorResponseRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ErrorResponseRenderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ErrorResponseRenderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.apache.log4j.Logger; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -42,9 +42,9 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.w3c.dom.Element; import javax.servlet.http.HttpServletRequest; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -55,17 +55,17 @@ import org.jboss.portal.portlet.test.controller2.TestPortalContext; import org.jboss.portal.portlet.test.controller2.TestPortletInvocationContext; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.test.controller.request.ControllerRequest; -import org.jboss.portal.portlet.test.controller.request.PortletScopedPortletResourceRequest; -import org.jboss.portal.portlet.test.controller.request.FullScopedCacheablePortletResourceRequest; -import org.jboss.portal.portlet.test.controller.request.PageScopedFullPortletResourceRequest; -import org.jboss.portal.portlet.test.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.test.controller.event.EventControllerContext; -import org.jboss.portal.portlet.test.controller.event.EventControllerContextImpl; +import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PageNavigationalState; +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.portlet.controller.event.EventControllerContextImpl; import org.jboss.portal.web.Body; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.web.WebRequest; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletURLRenderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletURLRenderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -28,15 +28,13 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.RenderURL; import org.jboss.portal.portlet.ResourceURL; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.test.StringCodec; import javax.servlet.http.HttpServletRequest; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/RedirectResponseRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/RedirectResponseRenderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/RedirectResponseRenderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; import java.io.IOException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/Renderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/Renderer.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/Renderer.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletControllerContext; import java.io.IOException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortletInvocationContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortletInvocationContext.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortletInvocationContext.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller2; import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller2.PortletURLRenderer; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-02-05 15:23:27 UTC (rev 9776) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-02-05 15:38:52 UTC (rev 9777) @@ -23,9 +23,9 @@ package org.jboss.portal.simple; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller.PortletController; -import org.jboss.portal.portlet.test.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.PortletController; +import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller2.Renderer; import org.jboss.portal.portlet.test.controller2.ControllerResponseRendererFactory; import org.jboss.portal.portlet.test.controller2.PortletControllerContextImpl;