Author: julien(a)jboss.com Date: 2008-04-15 20:17:02 -0400 (Tue, 15 Apr 2008) New Revision: 10600 Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml Log: move the PortetInvokerInterceptor to o.j.p.portlet package as it is related to that package Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java =================================================================== --- modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.bridge; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.PortletInvokerException; Modified: modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java =================================================================== --- modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -27,10 +27,10 @@ import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; /** Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600) @@ -52,7 +52,7 @@ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/> <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor"> + <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor"> <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> </bean> <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"> Copied: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java (from rev 10596, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvokerInterceptor.java) =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -0,0 +1,129 @@ +/****************************************************************************** + * 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.portlet; + +import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.PortletInvocation; + +import java.util.Set; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +/** + * A base class for {@link org.jboss.portal.portlet.PortletInvoker} interface interceptors. The subclasses + * extends it and override the intercepted methods. The next interceptor in the chain is wired in the field + * {@link #next} of the interceptor. When the interceptor wants to give control to the next interceptor, it must + * invoke the same method on the super class. If no next interceptor is configured the invocation of the parent + * method will throw an {@link IllegalStateException}. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PortletInvokerInterceptor implements PortletInvoker +{ + + /** . */ + private final AtomicReference<PortletInvoker> next = new AtomicReference<PortletInvoker>(); + + public PortletInvokerInterceptor() + { + } + + public PortletInvokerInterceptor(PortletInvoker next) + { + this.next.set(next); + } + + public PortletInvoker getNext() + { + return next.get(); + } + + public void setNext(PortletInvoker next) + { + this.next.set(next); + } + + public Set<Portlet> getPortlets() throws PortletInvokerException + { + return safeGetNext().getPortlets(); + } + + public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException + { + return safeGetNext().getPortlet(portletContext); + } + + public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException + { + return safeGetNext().invoke(invocation); + } + + public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + return safeGetNext().createClone(portletContext); + } + + public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + return safeGetNext().destroyClones(portletContexts); + } + + public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + return safeGetNext().getProperties(portletContext, keys); + } + + public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + return safeGetNext().getProperties(portletContext); + } + + public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + { + return safeGetNext().setProperties(portletContext, changes); + } + + /** + * Attempt to get the next invoker, the method never returns a null value and rather throws an {@link IllegalStateException} + * if the next invoker cannot be obtained. + * + * @return the non null next invoker + */ + private PortletInvoker safeGetNext() + { + PortletInvoker next = this.next.get(); + + // + if (next == null) + { + throw new IllegalStateException("No next invoker"); + } + + // + return next; + } +} Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.aspects.portlet; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.PortletInvokerException; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.aspects.portlet.cache.ContentRef; import org.jboss.portal.portlet.aspects.portlet.cache.StrongContentRef; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -29,7 +29,7 @@ import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.ServletContainerFactory; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.ServerContext; import org.jboss.portal.portlet.PortletInvokerException; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.container.PortletContainer; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.aspects.portlet; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.PortletInvokerException; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -25,7 +25,7 @@ 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.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.UserContext; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; /** * Not removed as it is a place holder to implement producer cache (i.e caching markup Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.container.PortletContainer; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -29,7 +29,7 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.SecurityInfo; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.SecurityContext; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.container.PortletContainerContext; import org.jboss.portal.portlet.container.managed.PortletApplicationRegistry; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.container; -import org.jboss.portal.common.invocation.InterceptorStackFactory; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -33,7 +32,7 @@ import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -29,8 +29,8 @@ import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateEvent; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.state.AccessMode; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-16 00:17:02 UTC (rev 10600) @@ -36,7 +36,7 @@ import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.PortletInvokerInterceptor; +import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.state.AbstractPropertyContext; Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600) @@ -65,7 +65,7 @@ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/> <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor"> + <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor"> <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> </bean> <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"> Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-04-16 00:07:05 UTC (rev 10599) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-04-16 00:17:02 UTC (rev 10600) @@ -65,7 +65,7 @@ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/> <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.invocation.PortletInvokerInterceptor"> + <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor"> <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> </bean> <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">