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

Author: julien(a)jboss.com Date: 2008-02-04 22:19:00 -0500 (Mon, 04 Feb 2008) New Revision: 9761 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ErrorControllerResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/RedirectControllerResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceControllerResponse.java 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/controller/PageUpdate.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RequestHandler.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/RedirectResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ResourceRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java Log: moved responses to response package 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 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.portlet.test.controller.ControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller.PortletController; import org.jboss.portal.portlet.test.controller2.PortletControllerContextImpl; import org.jboss.portal.portlet.test.controller.PageUpdate; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageUpdate.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageUpdate.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageUpdate.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.test.controller.response.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -28,6 +28,7 @@ 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 java.io.IOException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -27,6 +27,9 @@ 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.ErrorControllerResponse; +import org.jboss.portal.portlet.test.controller.response.RedirectControllerResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -40,6 +40,9 @@ 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.ErrorControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ResourceControllerResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RequestHandler.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RequestHandler.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -7,6 +7,7 @@ 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.invocation.response.PortletInvocationResponse; import java.io.IOException; Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java (from rev 9754, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponse.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -0,0 +1,38 @@ +/****************************************************************************** + * 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.controller.response; + +/** + * Must be used as base class for high level response provided by the controller that will be translated into something + * at the portal level. The goal is to avoid to manipulate the HTTP response directly. + * <p/> + * The test bed will of course use the HTTP response but the Presentation Framework will work differently. + * <p/> + * So we really need to abstract everything done with the HttpServletResponse and *never* use it in the controller. + * <p/> + * Typical usage should be : ControllerResponse response = controller.invoker(ControllerRequest request); + */ +public abstract class ControllerResponse +{ +} Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ControllerResponse.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ErrorControllerResponse.java (from rev 9754, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorControllerResponse.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ErrorControllerResponse.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ErrorControllerResponse.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -0,0 +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.controller.response; + +import org.jboss.portal.portlet.invocation.response.ErrorResponse; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class ErrorControllerResponse extends ControllerResponse +{ + + /** . */ + public ErrorResponse error; + + + public ErrorControllerResponse(ErrorResponse error) + { + this.error = error; + } + +} Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ErrorControllerResponse.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/RedirectControllerResponse.java (from rev 9754, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectControllerResponse.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/RedirectControllerResponse.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/RedirectControllerResponse.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -0,0 +1,42 @@ +/****************************************************************************** + * 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.controller.response; + +import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class RedirectControllerResponse extends ControllerResponse +{ + + /** . */ + public HTTPRedirectionResponse redirection; + + public RedirectControllerResponse(HTTPRedirectionResponse redirection) + { + this.redirection = redirection; + } +} Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/RedirectControllerResponse.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceControllerResponse.java (from rev 9754, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceControllerResponse.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceControllerResponse.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceControllerResponse.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -0,0 +1,42 @@ +/****************************************************************************** + * 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.controller.response; + +import org.jboss.portal.portlet.invocation.response.FragmentResponse; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class ResourceControllerResponse extends ControllerResponse +{ + + /** . */ + public FragmentResponse fragment; + + public ResourceControllerResponse(FragmentResponse fragment) + { + this.fragment = fragment; + } +} \ No newline at end of file Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/response/ResourceControllerResponse.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native 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 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ControllerResponseRendererFactory.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.ControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller.PageUpdate; -import org.jboss.portal.portlet.test.controller.RedirectControllerResponse; -import org.jboss.portal.portlet.test.controller.ErrorControllerResponse; -import org.jboss.portal.portlet.test.controller.ResourceControllerResponse; +import org.jboss.portal.portlet.test.controller.response.RedirectControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ErrorControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ResourceControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> 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 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ErrorResponseRenderer.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller2; -import org.jboss.portal.portlet.test.controller.ErrorControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ErrorControllerResponse; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.apache.log4j.Logger; 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 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/RedirectResponseRenderer.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -23,7 +23,8 @@ package org.jboss.portal.portlet.test.controller2; import org.jboss.portal.portlet.test.controller.PortletControllerContext; -import org.jboss.portal.portlet.test.controller.RedirectControllerResponse; +import org.jboss.portal.portlet.test.controller.response.RedirectControllerResponse; + import java.io.IOException; /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ResourceRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ResourceRenderer.java 2008-02-05 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/ResourceRenderer.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller2; import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.test.controller.ResourceControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ResourceControllerResponse; import org.jboss.portal.common.io.IOTools; import javax.servlet.http.HttpServletResponse; 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 03:17:08 UTC (rev 9760) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-02-05 03:19:00 UTC (rev 9761) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.simple; -import org.jboss.portal.portlet.test.controller.ControllerResponse; +import org.jboss.portal.portlet.test.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller.PortletController; import org.jboss.portal.portlet.test.controller2.PortletControllerContextImpl; import org.jboss.portal.portlet.test.controller2.ControllerResponseRenderer;