Author: julien(a)jboss.com
Date: 2008-02-04 21:33:07 -0500 (Mon, 04 Feb 2008)
New Revision: 9757
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.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/controller2/PortletControllerContextImpl.java
Log:
moved the stuffing of the portlet invocation to the portlet controller context
implementation (as the controller does not care about)
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05
01:13:32 UTC (rev 9756)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05
02:33:07 UTC (rev 9757)
@@ -25,12 +25,18 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.invocation.PortletInvocation;
+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.test.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.test.TestInstanceContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import java.util.List;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -47,8 +53,15 @@
Portlet getPortlet(String portletId) throws PortletInvokerException;
+ // To be removed
PortletInvocationResponse invoke(PortletInvocation invocation) throws
PortletInvokerException;
+ PortletInvocationResponse invoke(String windowId, ActionInvocation actionInvocation)
throws PortletInvokerException;
+
+ PortletInvocationResponse invoke(String windowId, List<Cookie> requestCookies,
EventInvocation eventInvocation) throws PortletInvokerException;
+
+ PortletInvocationResponse invoke(String windowId, ResourceInvocation
resourceInvocation) throws PortletInvokerException;
+
EventControllerContext getEventControllerContext();
}
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
01:13:32 UTC (rev 9756)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05
02:33:07 UTC (rev 9757)
@@ -11,12 +11,6 @@
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
-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.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.invocation.ActionInvocation;
@@ -30,7 +24,6 @@
import org.jboss.portal.portlet.test.TestPortletInvocationContext;
import org.jboss.portal.portlet.test.TestInstanceContext;
import org.jboss.portal.portlet.test.controller.WindowNavigationalState;
-import org.jboss.portal.portlet.test.TestPortalContext;
import static org.jboss.portal.portlet.test.controller.PortletController.*;
import org.jboss.portal.portlet.test.controller.event.Event;
import org.jboss.portal.portlet.test.controller.event.EventControllerContext;
@@ -215,12 +208,7 @@
//
ParameterMap publicNS = pageNS.getPublicNavigationalState(portlet);
-
- //
PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req,
resp);
-
- //
- TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
TestPortletInvocationContext portletInvocationContext = new
TestPortletInvocationContext(renderer, MARKUP_INFO);
ActionInvocation actionInvocation = new
ActionInvocation(portletInvocationContext);
@@ -233,25 +221,7 @@
actionInvocation.setForm(portletActionRequest.getBodyParameters() != null ?
ParameterMap.clone(portletActionRequest.getBodyParameters()) : null);
//
- actionInvocation.setClientContext(new AbstractClientContext(req));
- actionInvocation.setServerContext(new AbstractServerContext(req, resp));
- actionInvocation.setInstanceContext(instanceContext);
- actionInvocation.setUserContext(new AbstractUserContext(req));
- actionInvocation.setWindowContext(new
AbstractWindowContext(portlet.getContext().getId()));
- actionInvocation.setPortalContext(new TestPortalContext());
- actionInvocation.setSecurityContext(new AbstractSecurityContext(req));
- actionInvocation.setRequestContext(new AbstractRequestContext(req));
- actionInvocation.setTarget(instanceContext.getTarget());
-
- //
- try
- {
- return context.invoke(actionInvocation);
- }
- catch (PortletInvokerException e)
- {
- return null;
- }
+ return context.invoke(portletRequest.getPortletId(), actionInvocation);
}
}
@@ -275,7 +245,6 @@
ParameterMap publicNS = pageNS.getPublicNavigationalState(portlet);
//
- TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
TestPortletInvocationContext actionContext = new
TestPortletInvocationContext(renderer, MARKUP_INFO);
EventInvocation eventInvocation = new EventInvocation(actionContext);
@@ -288,27 +257,7 @@
eventInvocation.setPayload(event.getPayload());
//
- eventInvocation.setClientContext(new AbstractClientContext(req, requestCookies));
- eventInvocation.setServerContext(new AbstractServerContext(req, resp));
- eventInvocation.setInstanceContext(instanceContext);
- eventInvocation.setUserContext(new AbstractUserContext(req));
- eventInvocation.setWindowContext(new
AbstractWindowContext(portlet.getContext().getId()));
- eventInvocation.setPortalContext(new TestPortalContext());
- eventInvocation.setSecurityContext(new AbstractSecurityContext(req));
- eventInvocation.setTarget(instanceContext.getTarget());
-
- //
- try
- {
- return context.invoke(eventInvocation);
- }
- catch (PortletInvokerException e)
- {
- log.error("Error during event invocation", e);
-
- //
- return null;
- }
+ return context.invoke(event.getPortletContext().getId(), requestCookies,
eventInvocation);
}
private void updateNavigationalState(PortletControllerContext context, String
portletId,
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
01:13:32 UTC (rev 9756)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05
02:33:07 UTC (rev 9757)
@@ -30,20 +30,12 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.cache.CacheLevel;
-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.invocation.ResourceInvocation;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.test.PortletURLRenderer;
-import org.jboss.portal.portlet.test.TestInstanceContext;
import org.jboss.portal.portlet.test.controller.WindowNavigationalState;
-import org.jboss.portal.portlet.test.TestPortalContext;
import org.jboss.portal.portlet.test.TestPortletInvocationContext;
import static org.jboss.portal.portlet.test.controller.PortletController.*;
import org.jboss.portal.portlet.test.controller.request.ControllerRequest;
@@ -141,13 +133,9 @@
}
//
- WindowNavigationalState windowNS = new WindowNavigationalState(portletNS, mode,
windowState);
-
- //
PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp);
//
- TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
TestPortletInvocationContext resourceInvocationContext = new
TestPortletInvocationContext(renderer, MARKUP_INFO);
ResourceInvocation resourceInvocation = new
ResourceInvocation(resourceInvocationContext);
@@ -162,20 +150,9 @@
resourceInvocation.setForm(portletResourceRequest.getBodyParameters() != null ?
ParameterMap.clone(portletResourceRequest.getBodyParameters()) : null);
//
- resourceInvocation.setClientContext(new AbstractClientContext(req));
- resourceInvocation.setServerContext(new AbstractServerContext(req, resp));
- resourceInvocation.setInstanceContext(instanceContext);
- resourceInvocation.setUserContext(new AbstractUserContext(req));
- resourceInvocation.setWindowContext(new
AbstractWindowContext(portlet.getContext().getId()));
- resourceInvocation.setPortalContext(new TestPortalContext());
- resourceInvocation.setSecurityContext(new AbstractSecurityContext(req));
- resourceInvocation.setRequestContext(new AbstractRequestContext(req));
- resourceInvocation.setTarget(instanceContext.getTarget());
-
- //
try
{
- return context.invoke(resourceInvocation);
+ return context.invoke(portletResourceRequest.getPortletId(),
resourceInvocation);
}
catch (PortletInvokerException e)
{
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
01:13:32 UTC (rev 9756)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05
02:33:07 UTC (rev 9757)
@@ -33,10 +33,21 @@
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+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.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.test.StringCodec;
+import org.jboss.portal.portlet.test.TestInstanceContext;
+import org.jboss.portal.portlet.test.TestPortalContext;
import static org.jboss.portal.portlet.test.URLParameterConstants.*;
import org.jboss.portal.portlet.test.controller.WindowNavigationalState;
import org.jboss.portal.portlet.test.controller.PortletControllerContext;
@@ -56,9 +67,11 @@
import javax.servlet.ServletContext;
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.Map;
+import java.util.List;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -282,4 +295,61 @@
{
return eventControllerContext;
}
+
+ public PortletInvocationResponse invoke(String windowId, ActionInvocation
actionInvocation) throws PortletInvokerException
+ {
+
+ Portlet portlet = getPortlet(windowId);
+
+ TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
+
+ actionInvocation.setClientContext(new AbstractClientContext(req));
+ actionInvocation.setServerContext(new AbstractServerContext(req, resp));
+ actionInvocation.setInstanceContext(instanceContext);
+ actionInvocation.setUserContext(new AbstractUserContext(req));
+ actionInvocation.setWindowContext(new
AbstractWindowContext(portlet.getContext().getId()));
+ actionInvocation.setPortalContext(new TestPortalContext());
+ actionInvocation.setSecurityContext(new AbstractSecurityContext(req));
+ actionInvocation.setRequestContext(new AbstractRequestContext(req));
+ actionInvocation.setTarget(instanceContext.getTarget());
+
+ return invoke(actionInvocation);
+ }
+
+ public PortletInvocationResponse invoke(String windowId, List<Cookie>
requestCookies, EventInvocation eventInvocation) throws PortletInvokerException
+ {
+ Portlet portlet = getPortlet(windowId);
+
+ TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
+
+ eventInvocation.setClientContext(new AbstractClientContext(req, requestCookies));
+ eventInvocation.setServerContext(new AbstractServerContext(req, resp));
+ eventInvocation.setInstanceContext(instanceContext);
+ eventInvocation.setUserContext(new AbstractUserContext(req));
+ eventInvocation.setWindowContext(new AbstractWindowContext(windowId));
+ eventInvocation.setPortalContext(new TestPortalContext());
+ eventInvocation.setSecurityContext(new AbstractSecurityContext(req));
+ eventInvocation.setTarget(instanceContext.getTarget());
+
+ return invoke(eventInvocation);
+ }
+
+ public PortletInvocationResponse invoke(String windowId, ResourceInvocation
resourceInvocation) throws PortletInvokerException
+ {
+ Portlet portlet = getPortlet(windowId);
+
+ TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), true);
+
+ resourceInvocation.setClientContext(new AbstractClientContext(req));
+ resourceInvocation.setServerContext(new AbstractServerContext(req, resp));
+ resourceInvocation.setInstanceContext(instanceContext);
+ resourceInvocation.setUserContext(new AbstractUserContext(req));
+ resourceInvocation.setWindowContext(new
AbstractWindowContext(portlet.getContext().getId()));
+ resourceInvocation.setPortalContext(new TestPortalContext());
+ resourceInvocation.setSecurityContext(new AbstractSecurityContext(req));
+ resourceInvocation.setRequestContext(new AbstractRequestContext(req));
+ resourceInvocation.setTarget(instanceContext.getTarget());
+
+ return invoke(resourceInvocation);
+ }
}