Author: julien(a)jboss.com
Date: 2008-02-05 06:38:38 -0500 (Tue, 05 Feb 2008)
New Revision: 9767
Removed:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/WindowNavigationalState.java
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestPortletInvocationContext.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/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/PageUpdateRenderer.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java
Log:
- actually delegate to the PortletControllerContext the createion of hte
PortalInvocationContext, this way the controller does not care about context managmeent
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestPortletInvocationContext.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestPortletInvocationContext.java 2008-02-05
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestPortletInvocationContext.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -23,8 +23,8 @@
package org.jboss.portal.portlet.test;
import org.jboss.portal.portlet.ContainerURL;
-import org.jboss.portal.portlet.test.controller.PortletControllerContext;
import org.jboss.portal.portlet.test.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;
import org.jboss.portal.common.util.MarkupInfo;
@@ -42,7 +42,7 @@
{
/** . */
- private final PortletControllerContext controllerContext;
+ private final PortletURLRenderer urlRenderer;
/** . */
private final String windowId;
@@ -50,8 +50,15 @@
/** . */
private final PageNavigationalState pageState;
+ /** . */
+ private final HttpServletRequest clientRequest;
+
+ /** . */
+ private final HttpServletResponse clientResponse;
+
public TestPortletInvocationContext(
- PortletControllerContext controllerContext,
+ HttpServletRequest clientRequest,
+ HttpServletResponse clientResponse,
String windowId,
PageNavigationalState pageState,
MarkupInfo markupInfo)
@@ -59,12 +66,14 @@
super(markupInfo);
//
+ this.clientRequest = clientRequest;
+ this.clientResponse = clientResponse;
this.windowId = windowId;
this.pageState = pageState;
- this.controllerContext = controllerContext;
+ this.urlRenderer = new PortletURLRenderer(pageState, windowId, clientRequest,
clientResponse);
//
- addResolver(PortletInvocation.PRINCIPAL_SCOPE, new
PrincipalAttributeResolver(controllerContext.getClientRequest()));
+ addResolver(PortletInvocation.PRINCIPAL_SCOPE, new
PrincipalAttributeResolver(clientRequest));
addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver());
addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new
MapAttributeResolver());
addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new
MapAttributeResolver());
@@ -73,16 +82,16 @@
public HttpServletRequest getClientRequest() throws IllegalStateException
{
- return controllerContext.getClientRequest();
+ return clientRequest;
}
public HttpServletResponse getClientResponse() throws IllegalStateException
{
- return controllerContext.getClientResponse();
+ return clientResponse;
}
public String renderURL(ContainerURL containerURL, Boolean wantSecure, Boolean
wantAuthenticated, boolean relative)
{
- return controllerContext.renderURL(windowId, pageState, containerURL, wantSecure,
wantAuthenticated, relative);
+ return urlRenderer.renderURL(containerURL, wantSecure, wantAuthenticated,
relative);
}
}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/WindowNavigationalState.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/WindowNavigationalState.java 2008-02-05
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/WindowNavigationalState.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -1,75 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.portlet.test;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.StateString;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class WindowNavigationalState implements Serializable
-{
-
- /** . */
- private final StateString portletNavigationalState;
-
- /** . */
- private final Mode mode;
-
- /** . */
- private final WindowState windowState;
-
- public WindowNavigationalState()
- {
- this.portletNavigationalState = null;
- this.mode = Mode.VIEW;
- this.windowState = WindowState.NORMAL;
- }
-
- public WindowNavigationalState(StateString portletNavigationalState, Mode mode,
WindowState windowState)
- {
- this.portletNavigationalState = portletNavigationalState;
- this.mode = mode;
- this.windowState = windowState;
- }
-
- public StateString getPortletNavigationalState()
- {
- return portletNavigationalState;
- }
-
- public Mode getMode()
- {
- return mode;
- }
-
- public WindowState getWindowState()
- {
- return windowState;
- }
-}
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
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -38,10 +38,6 @@
*/
public class PortletController
{
-
- /** . */
- public static final MarkupInfo MARKUP_INFO = new MarkupInfo(MediaType.HTML,
"UTF8");
-
public ControllerResponse process(ControllerRequest controllerRequest) throws
IOException, PortletInvokerException
{
RequestHandler handler;
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
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -22,9 +22,8 @@
******************************************************************************/
package org.jboss.portal.portlet.test.controller;
-import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.ContainerURL;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.ActionInvocation;
@@ -55,6 +54,8 @@
PortletInfo getPortletInfo(String windowId) throws PortletInvokerException;
+ PortletInvocationContext createPortletInvocationContext(String windowId,
PageNavigationalState pageState);
+
PortletInvocationResponse invoke(String windowId, ActionInvocation actionInvocation)
throws PortletInvokerException;
PortletInvocationResponse invoke(String windowId, List<Cookie> requestCookies,
EventInvocation eventInvocation) throws PortletInvokerException;
@@ -63,15 +64,6 @@
EventControllerContext getEventControllerContext();
- String renderURL(
- String windowId,
- PageNavigationalState pageState,
- ContainerURL containerURL,
- Boolean wantSecure,
- Boolean wantAuthenticated,
- boolean relative);
-
-
// To be removed, now only used in controller2
PortletInvocationResponse invoke(PortletInvocation invocation) throws
PortletInvokerException;
}
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
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -9,6 +9,7 @@
import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
@@ -205,11 +206,7 @@
//
ParameterMap publicNS = pageState.getPublicNavigationalState(portlet);
- TestPortletInvocationContext portletInvocationContext = new
TestPortletInvocationContext(
- context,
- portletRequest.getWindowId(),
- pageState,
- MARKUP_INFO);
+ PortletInvocationContext portletInvocationContext =
context.createPortletInvocationContext(portletRequest.getWindowId(), pageState);
ActionInvocation actionInvocation = new
ActionInvocation(portletInvocationContext);
//
@@ -244,12 +241,8 @@
ParameterMap publicNS = pageState.getPublicNavigationalState(portlet);
//
- TestPortletInvocationContext actionContext = new TestPortletInvocationContext(
- context,
- event.getWindowId(),
- pageState,
- MARKUP_INFO);
- EventInvocation eventInvocation = new EventInvocation(actionContext);
+ PortletInvocationContext portletInvocationContext =
context.createPortletInvocationContext(event.getWindowId(), pageState);
+ EventInvocation eventInvocation = new EventInvocation(portletInvocationContext);
//
eventInvocation.setMode(windowNS.getMode());
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
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -28,14 +28,13 @@
import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.cache.CacheLevel;
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.TestPortletInvocationContext;
-import static org.jboss.portal.portlet.test.controller.PortletController.*;
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;
@@ -82,7 +81,7 @@
//
Mode mode = null;
WindowState windowState = null;
- PageNavigationalState pageNS = null;
+ PageNavigationalState pageState = null;
ParameterMap publicNS = null;
StateString portletNS = null;
CacheLevel cacheability;
@@ -104,13 +103,13 @@
if (portletResourceRequest instanceof PageScopedFullPortletResourceRequest)
{
PageScopedFullPortletResourceRequest pageScopedRequest =
(PageScopedFullPortletResourceRequest)portletResourceRequest;
- pageNS = pageScopedRequest.getPageState();
+ pageState = pageScopedRequest.getPageState();
cacheability = CacheLevel.PAGE;
//
- if (pageNS != null)
+ if (pageState != null)
{
- publicNS = pageNS.getPublicNavigationalState(portlet);
+ publicNS = pageState.getPublicNavigationalState(portlet);
}
}
else
@@ -134,12 +133,8 @@
}
//
- TestPortletInvocationContext resourceInvocationContext = new
TestPortletInvocationContext(
- context,
- portletResourceRequest.getWindowId(),
- pageNS,
- MARKUP_INFO);
- ResourceInvocation resourceInvocation = new
ResourceInvocation(resourceInvocationContext);
+ PortletInvocationContext portletInvocationContext =
context.createPortletInvocationContext(portletResourceRequest.getWindowId(), pageState);
+ ResourceInvocation resourceInvocation = new
ResourceInvocation(portletInvocationContext);
//
resourceInvocation.setResourceId(portletResourceRequest.getResourceId());
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -31,6 +31,7 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
@@ -44,10 +45,8 @@
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 org.jboss.portal.portlet.test.controller.PageNavigationalState;
import org.jboss.portal.portlet.test.controller.PortletControllerContext;
-import org.jboss.portal.portlet.test.controller.PortletController;
import org.jboss.portal.portlet.test.controller.response.PageUpdate;
import org.w3c.dom.Element;
@@ -229,11 +228,7 @@
//
TestInstanceContext instanceContext = new TestInstanceContext(req,
portlet.getContext(), false);
- TestPortletInvocationContext renderContext = new TestPortletInvocationContext(
- context,
- portlet.getContext().getId(),
- pageNS,
- PortletController.MARKUP_INFO);
+ PortletInvocationContext renderContext =
context.createPortletInvocationContext(portlet.getContext().getId(), pageNS);
//
RenderInvocation render = new RenderInvocation(renderContext);
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
11:29:47 UTC (rev 9766)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05
11:38:38 UTC (rev 9767)
@@ -27,6 +27,8 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.util.MarkupInfo;
+import org.jboss.portal.common.util.MediaType;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletContext;
@@ -34,6 +36,7 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.ContainerURL;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
@@ -50,7 +53,7 @@
import org.jboss.portal.portlet.test.StringCodec;
import org.jboss.portal.portlet.test.TestInstanceContext;
import org.jboss.portal.portlet.test.TestPortalContext;
-import org.jboss.portal.portlet.test.controller2.PortletURLRenderer;
+import org.jboss.portal.portlet.test.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;
@@ -84,6 +87,9 @@
{
/** . */
+ public static final MarkupInfo MARKUP_INFO = new MarkupInfo(MediaType.HTML,
"UTF8");
+
+ /** . */
public static final int NAV_SCOPE = 0;
/** . */
@@ -368,4 +374,9 @@
return invoke(resourceInvocation);
}
+
+ public PortletInvocationContext createPortletInvocationContext(String windowId,
PageNavigationalState pageState)
+ {
+ return new TestPortletInvocationContext(req, resp, windowId, pageState,
MARKUP_INFO);
+ }
}