Author: julien(a)jboss.com
Date: 2008-02-06 11:10:42 -0500 (Wed, 06 Feb 2008)
New Revision: 9803
Added:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java
modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war/WEB-INF/portlet.xml
Log:
implement and test javax.portlet.servletDefaultSessionScope feature
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -32,7 +32,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.portlet.PortletSession;
@@ -42,6 +41,7 @@
import javax.portlet.ResourceRequest;
import javax.portlet.EventRequest;
import javax.portlet.RenderRequest;
+import javax.portlet.PortletConfig;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
@@ -118,7 +118,7 @@
private final Map<String, String[]> parameters;
/** . */
- private final int sessionScope = PortletSession.APPLICATION_SCOPE;
+ private final int sessionScope;
/** . */
private final LinkedList<Map<String, String>> containerAttributesStack;
@@ -130,7 +130,7 @@
private final ServletContext servletContext;
/** . */
- private DispatchedHttpSession[] session;
+ private DispatchedHttpSession session;
public DispatchedHttpServletRequest(
Dispatch dispatch,
@@ -140,12 +140,22 @@
{
super(dreq);
+ PortletConfig config =
(PortletConfig)dreq.getAttribute(Constants.JAVAX_PORTLET_CONFIG);
+ Map<String, String[]> options = config.getContainerRuntimeOptions();
+ String[] sessionScopeOption =
options.get("javax.portlet.servletDefaultSessionScope");
+ int sessionScope = PortletSession.APPLICATION_SCOPE;
+ if (sessionScopeOption != null && sessionScopeOption.length > 0
&& "PORTLET_SCOPE".equals(sessionScopeOption[0]))
+ {
+ sessionScope = PortletSession.PORTLET_SCOPE;
+ }
+
//
this.dispatchType = dispatch.getType();
this.preq = preq;
this.dreq = dreq;
this.servletContext = servletContext;
this.containerAttributesStack = new LinkedList<Map<String, String>>();
+ this.sessionScope = sessionScope;
// Push dispatch
this.infos = pushDispatch(dispatch);
@@ -473,7 +483,7 @@
public final HttpSession getSession(boolean b)
{
- return getSession(b, PortletSession.APPLICATION_SCOPE);
+ return getSession(b, sessionScope);
}
public final HttpSession getSession()
@@ -665,19 +675,14 @@
*/
private HttpSession getSession(boolean create, int scope)
{
- if (session == null)
- {
- session = new DispatchedHttpSession[2];
- }
-
// Dereference an existing session if necessary
- if (session[scope] != null && !session[scope].isValid())
+ if (session != null && !session.isValid())
{
- session[scope] = null;
+ session = null;
}
// If we have a session here we are sure it is valid and ok to return it
- if (session[scope] != null)
+ if (session != null)
{
// So we do nothing
}
@@ -685,7 +690,7 @@
{
// For sure we need a session we will obtain a valid one
PortletSession portletSession = preq.getPortletSession();
- session[scope] = new DispatchedHttpSession(this, portletSession, scope);
+ session = new DispatchedHttpSession(this, portletSession, scope);
}
else
{
@@ -695,12 +700,12 @@
//
if (portletSession != null)
{
- session[scope] = new DispatchedHttpSession(this, portletSession, scope);
+ session = new DispatchedHttpSession(this, portletSession, scope);
}
}
//
- return session[scope];
+ return session;
}
// Subclasses
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -50,7 +50,10 @@
private ContainerPortletApplicationInfo info;
/** . */
- public static final Set<String> SUPPORTED_OPTIONS =
Collections.unmodifiableSet(Tools.toSet("javax.portlet.actionScopedRequestAttributes","javax.portlet.escapeXml"));
+ public static final Set<String> SUPPORTED_OPTIONS =
Collections.unmodifiableSet(Tools.toSet(
+ "javax.portlet.actionScopedRequestAttributes",
+ "javax.portlet.escapeXml",
+ "javax.portlet.servletDefaultSessionScope"));
public PortletContextImpl(ServletContext servletContext)
{
Added:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java
(rev 0)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -0,0 +1,153 @@
+/******************************************************************************
+ * 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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import static org.jboss.unit.api.Assert.*;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.portlet.PortletException;
+import javax.portlet.RenderResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.PortletSession;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public abstract class AbstractDispatchedSessionTestCase
+{
+ public AbstractDispatchedSessionTestCase(
+ PortletTestCase seq,
+ JoinPoint portletJoinPoint,
+ final int sessionScope)
+ {
+ seq.bindAction(0, portletJoinPoint, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ PortletRequestDispatcher dispatcher =
((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
+ assertNotNull(dispatcher);
+ dispatcher.include(request, response);
+
+ //
+ PortletSession session = request.getPortletSession(false);
+ assertNotNull(session);
+ assertTrue(session.isNew());
+ assertEquals("foo_dispatched_value",
session.getAttribute("foo", sessionScope));
+
+ //
+ return new InvokeGetResponse(response.createRenderURL().toString());
+ }
+ });
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
+ {
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request,
HttpServletResponse response, PortletTestContext context) throws ServletException,
IOException
+ {
+ HttpSession session = request.getSession(false);
+ assertNull(session);
+
+ //
+ session = request.getSession();
+ assertNotNull(session);
+ assertTrue(session.isNew());
+ session.setAttribute("foo", "foo_dispatched_value");
+ assertEquals("foo_dispatched_value",
session.getAttribute("foo"));
+
+ //
+ return null;
+ }
+ });
+ seq.bindAction(1, portletJoinPoint, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ PortletSession session = request.getPortletSession(false);
+ assertNotNull(session);
+ assertFalse(session.isNew());
+ assertEquals("foo_dispatched_value",
session.getAttribute("foo", sessionScope));
+
+ //
+ PortletRequestDispatcher dispatcher =
((AbstractUniversalTestPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA");
+ assertNotNull(dispatcher);
+ dispatcher.include(request, response);
+
+ //
+ try
+ {
+ session.isNew();
+ fail();
+ }
+ catch (IllegalStateException ignore)
+ {
+ }
+
+ //
+ return new EndTestResponse();
+ }
+ });
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
+ {
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request,
HttpServletResponse response, PortletTestContext context) throws ServletException,
IOException
+ {
+ HttpSession session = request.getSession(false);
+ assertNotNull(session);
+ assertFalse(session.isNew());
+ assertEquals("foo_dispatched_value",
session.getAttribute("foo"));
+
+ //
+ session.invalidate();
+
+ try
+ {
+ session.isNew();
+ fail();
+ }
+ catch (IllegalStateException ignore)
+ {
+ }
+
+ //
+ return null;
+ }
+ });
+ }
+}
Added:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
(rev 0)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.test.portlet.framework.UTP1;
+
+import javax.portlet.PortletSession;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+@TestCase
+public class ApplicationScopeDispatchedSessionTestCase extends
AbstractDispatchedSessionTestCase
+{
+ public ApplicationScopeDispatchedSessionTestCase(PortletTestCase seq)
+ {
+ super(seq, UTP1.RENDER_JOIN_POINT, PortletSession.APPLICATION_SCOPE);
+ }
+}
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -27,6 +27,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.*;
@@ -49,7 +50,7 @@
{
public ContentTestCase(PortletTestCase seq)
{
- seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -69,7 +70,7 @@
return new InvokeGetResponse(response.createRenderURL().toString());
}
});
- seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -95,7 +96,7 @@
return new InvokeGetResponse(response.createRenderURL().toString());
}
});
- seq.bindAction(2, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -122,7 +123,7 @@
return new InvokeGetResponse(response.createRenderURL().toString());
}
});
- seq.bindAction(3, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -149,7 +150,7 @@
return new InvokeGetResponse(response.createRenderURL().toString());
}
});
- seq.bindAction(4, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws PortletException, IOException
{
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -26,6 +26,7 @@
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
@@ -47,7 +48,7 @@
{
public DispatchingFilterTestCase(PortletTestCase seq)
{
- seq.bindAction(0, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -26,6 +26,7 @@
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
@@ -50,7 +51,7 @@
{
public FiltersTestCase(PortletTestCase seq)
{
- seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request,
RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Added:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
(rev 0)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java 2008-02-06
16:10:42 UTC (rev 9803)
@@ -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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
+
+import javax.portlet.PortletSession;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+@TestCase
+public class PortletScopeDispatchedSessionTestCase extends
AbstractDispatchedSessionTestCase
+{
+ public PortletScopeDispatchedSessionTestCase(PortletTestCase seq)
+ {
+ super(seq, UTP2.RENDER_JOIN_POINT, PortletSession.PORTLET_SCOPE);
+ }
+}
\ No newline at end of file
Modified:
modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war/WEB-INF/portlet.xml
===================================================================
---
modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war/WEB-INF/portlet.xml 2008-02-06
15:25:41 UTC (rev 9802)
+++
modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war/WEB-INF/portlet.xml 2008-02-06
16:10:42 UTC (rev 9803)
@@ -22,10 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<portlet-app
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+<portlet-app
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- version="1.0">
+
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2...
http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
<portlet>
@@ -48,28 +48,10 @@
<portlet-info>
<title></title>
</portlet-info>
+ <container-runtime-option>
+ <name>javax.portlet.servletDefaultSessionScope</name>
+ <value>PORTLET_SCOPE</value>
+ </container-runtime-option>
</portlet>
- <portlet>
- <portlet-name>TestUniversalPortletC</portlet-name>
-
<portlet-class>org.jboss.portal.test.portlet.framework.UTP3</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title></title>
- </portlet-info>
- </portlet>
-
- <portlet>
- <portlet-name>TestUniversalPortletD</portlet-name>
-
<portlet-class>org.jboss.portal.test.portlet.framework.UTP4</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title></title>
- </portlet-info>
- </portlet>
-
</portlet-app>