Author: julien(a)jboss.com Date: 2008-01-13 19:16:23 -0500 (Sun, 13 Jan 2008) New Revision: 9495 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestInstanceContext.java Log: simplify a bit Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-13 23:19:42 UTC (rev 9494) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-14 00:16:23 UTC (rev 9495) @@ -23,12 +23,10 @@ package org.jboss.portal.portlet.test; import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; @@ -50,7 +48,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletContext; import java.io.UnsupportedEncodingException; import java.io.PrintWriter; import java.io.IOException; @@ -85,10 +82,7 @@ } else { - ServletContext servletContext = context.getServletContext(); - PortletInvoker invoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); - PortletContext target = PortletContext.createPortletContext(action.portletId); - Portlet portlet = invoker.getPortlet(target); + Portlet portlet = context.getPortlet(action.portletId); HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); PortalNavigationalState navState = context.getNavigationalState(); @@ -148,7 +142,7 @@ // try { - return invoker.invoke(actionInvocation); + return context.invoke(actionInvocation); } catch (PortletInvokerException e) { @@ -159,8 +153,6 @@ public void process(PortletControllerContext context, Action action) throws PortletInvokerException, IOException { - ServletContext servletContext = context.getServletContext(); - PortletInvoker invoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); PortalNavigationalState navState = context.getNavigationalState(); @@ -175,8 +167,6 @@ { StateResponse stateResponse = (StateResponse)response; - - // for (StateResponse.Event event : stateResponse.getEvents()) { @@ -266,7 +256,7 @@ // try { - for (Iterator i = invoker.getPortlets().iterator(); i.hasNext();) + for (Iterator i = context.getPortlets().iterator(); i.hasNext();) { Portlet portlet = (Portlet)i.next(); writer.print("<div><div>" + portlet.getContext() + "</div>"); @@ -313,7 +303,7 @@ // try { - invoker.invoke(render); + context.invoke(render); } catch (PortletInvokerException e) { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContext.java 2008-01-13 23:19:42 UTC (rev 9494) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContext.java 2008-01-14 00:16:23 UTC (rev 9495) @@ -22,9 +22,15 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.PortletInvocation; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; +import java.util.Collection; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -41,4 +47,10 @@ HttpServletResponse getClientResponse(); + Portlet getPortlet(String portletId) throws PortletInvokerException; + + PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException; + + Collection<Portlet> getPortlets() throws PortletInvokerException; + } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-13 23:19:42 UTC (rev 9494) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-14 00:16:23 UTC (rev 9495) @@ -26,6 +26,12 @@ import org.jboss.portal.web.WebRequest; import org.jboss.portal.web.Body; import org.jboss.portal.portlet.test.url.ParameterDecoder; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.util.Tools; import org.jboss.portal.Mode; @@ -35,6 +41,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; import java.io.IOException; +import java.util.Collection; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -63,6 +70,9 @@ /** . */ private final PortletController.Action action; + + /** . */ + private final PortletInvoker invoker; public PortletControllerContextImpl( HttpServletRequest req, @@ -77,6 +87,9 @@ } // + PortletInvoker invoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); + + // String pathInfo = req.getPathInfo(); String targetId; @@ -146,6 +159,7 @@ this.req = req; this.resp = resp; this.servletContext = servletContext; + this.invoker = invoker; } else { @@ -154,6 +168,7 @@ this.req = req; this.resp = resp; this.servletContext = servletContext; + this.invoker = invoker; // if (navStateScope == SESSION_SCOPE) @@ -187,4 +202,20 @@ { return resp; } + + public Portlet getPortlet(String portletId) throws PortletInvokerException + { + PortletContext target = PortletContext.createPortletContext(action.portletId); + return invoker.getPortlet(target); + } + + public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException + { + return invoker.invoke(invocation); + } + + public Collection<Portlet> getPortlets() throws PortletInvokerException + { + return invoker.getPortlets(); + } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestInstanceContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestInstanceContext.java 2008-01-13 23:19:42 UTC (rev 9494) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestInstanceContext.java 2008-01-14 00:16:23 UTC (rev 9495) @@ -37,14 +37,19 @@ public class TestInstanceContext implements InstanceContext { + /** . */ private HttpServletRequest req; + /** . */ private boolean modifiable; + /** . */ private PortletContext target; + /** . */ private boolean useClone; + /** . */ private String id; public TestInstanceContext(