Author: thomas.heute(a)jboss.com Date: 2008-06-18 05:26:13 -0400 (Wed, 18 Jun 2008) New Revision: 11077 Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java Log: Oups Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java 2008-06-18 04:14:58 UTC (rev 11076) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java 2008-06-18 09:26:13 UTC (rev 11077) @@ -23,8 +23,10 @@ package org.jboss.portal.portlet.aspects.portlet; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; /** * This interceptor get the current webapp context path and adds it to the set of the collected context path. @@ -32,9 +34,9 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class ContextTrackerInterceptor extends PortletInterceptor +public class ContextTrackerInterceptor extends PortletInvokerInterceptor { - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException { // String contextPath = (String)invocation.getDispatchedRequest().getAttribute("javax.servlet.include.context_path"); @@ -43,6 +45,6 @@ org.jboss.portal.server.aspects.server.SignOutInterceptor.getSet().add(contextPath); // Invoke next command - return invocation.invokeNext(); + return super.invoke(invocation); } } Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java 2008-06-18 04:14:58 UTC (rev 11076) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java 2008-06-18 09:26:13 UTC (rev 11077) @@ -24,8 +24,10 @@ import org.apache.log4j.Logger; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.session.SubSession; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -38,13 +40,13 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PortalSessionSynchronizationInterceptor extends PortletInterceptor +public class PortalSessionSynchronizationInterceptor extends PortletInvokerInterceptor { /** . */ private final Logger log = Logger.getLogger(PortalSessionSynchronizationInterceptor.class); - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException { HttpServletRequest req = null; @@ -84,21 +86,21 @@ // Set the sub session for the portlet synchronization if (ss != null && ss.isActivated()) { - invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession", ss); + invocation.setAttribute("subsession", ss); } // - return invocation.invokeNext(); + return super.invoke(invocation); } finally { - List modifications = (List)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); + List modifications = (List)invocation.getAttribute("subsession"); // If we have any modifications propagate them if (modifications != null) { // - invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); + invocation.removeAttribute("subsession"); // if (ss == null) @@ -113,7 +115,7 @@ } else { - return invocation.invokeNext(); + return super.invoke(invocation); } } } Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2008-06-18 04:14:58 UTC (rev 11076) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2008-06-18 09:26:13 UTC (rev 11077) @@ -23,12 +23,14 @@ package org.jboss.portal.portlet.aspects.portlet; import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.deployment.jboss.info.SessionInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.session.SessionListener; import org.jboss.portal.portlet.session.SubSession; @@ -38,17 +40,17 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PortletSessionSynchronizationInterceptor extends PortletInterceptor +public class PortletSessionSynchronizationInterceptor extends PortletInvokerInterceptor { - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException { - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, ContainerPortletInvoker.PORTLET_CONTAINER); + PortletContainer container = (PortletContainer)invocation.getAttribute(ContainerPortletInvoker.PORTLET_CONTAINER); PortletInfo portletInfo = container.getInfo(); SessionInfo sessionInfo = portletInfo.getAttachment(SessionInfo.class); if (sessionInfo != null && Boolean.TRUE.equals(sessionInfo.getDistributed())) { - SubSession ss = (SubSession)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); + SubSession ss = (SubSession)invocation.getAttribute("subsession"); // If we detect an activation then we copy the content in the dispatched session if (ss != null) @@ -64,7 +66,7 @@ SessionListener.activate(); // - return invocation.invokeNext(); + return super.invoke(invocation); } finally { @@ -72,12 +74,12 @@ List modifications = SessionListener.desactivate(); // Set modifications for portal session synchronization - invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession", modifications); + invocation.setAttribute("subsession", modifications); } } else { - return invocation.invokeNext(); + return super.invoke(invocation); } } }