[portal-commits] JBoss Portal SVN: r6765 - in trunk: common/src/main/org/jboss/portal/common/invocation and 17 other directories.

Author: julien(a)jboss.com Date: 2007-03-19 22:05:40 -0400 (Mon, 19 Mar 2007) New Revision: 6765 Modified: trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java trunk/common/src/main/org/jboss/portal/common/invocation/Scope.java trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java Log: rather use a scope for portlet invocation that does not use the servlet request attributes as it leads to collision when using nested portlet invocation (which is the case with the JSF component that shows a portlet when used in a portlet bridge). Modified: trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java =================================================================== --- trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -123,7 +123,7 @@ public BridgeInfo(PortletInvocation invocation) { - ContainerPortletInfo info = (ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + ContainerPortletInfo info = (ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); // this.invocation = invocation; Modified: trunk/common/src/main/org/jboss/portal/common/invocation/Scope.java =================================================================== --- trunk/common/src/main/org/jboss/portal/common/invocation/Scope.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/common/src/main/org/jboss/portal/common/invocation/Scope.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -43,6 +43,9 @@ /** Session scope. */ public static final Scope SESSION_SCOPE = new Scope("session"); + /** Invocation scope. */ + public static final Scope INVOCATION_SCOPE = new Scope("invocation"); + /** The value. */ private final String value; Modified: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -59,7 +59,7 @@ // Add declaratively injected header content here (get it via the component) String headerChars = fragment.getHeader(); // Chris' modif: note that the header might to be re-written... - PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); + PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); JBossPortletMetaData portletMD = (JBossPortletMetaData)container.getJBossMetaData(); if (portletMD != null) { Modified: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -44,7 +44,7 @@ Transactions.Type txType = Transactions.TYPE_NOT_SUPPORTED; // Override tx type if found - ContainerPortletInfo portlet = (ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + ContainerPortletInfo portlet = (ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); JBossPortletMetaData portletMD = portlet.getContainer().getJBossMetaData(); if (portletMD != null) { Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -113,7 +113,7 @@ ActionInvocation action = new ActionInvocation(ctx); // - action.setAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context", controllerContext); + action.setAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context", controllerContext); // Contextualize action.setSecurityContext(cf.createSecurityContext()); @@ -149,7 +149,7 @@ RenderInvocation render = new RenderInvocation(ctx); // - render.setAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context", controllerContext); + render.setAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context", controllerContext); // Contextualize render.setSecurityContext(cf.createSecurityContext()); @@ -175,6 +175,7 @@ this.controllerContext = controllerContext; // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, controllerContext); addResolver(PortletInvocation.PRINCIPAL_SCOPE, controllerContext); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); @@ -207,6 +208,7 @@ this.controllerContext = controllerContext; // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, controllerContext); addResolver(PortletInvocation.PRINCIPAL_SCOPE, controllerContext); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new MapAttributeResolver()); Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -225,7 +225,7 @@ try { - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, INSTANCE_ID_ATTRIBUTE, getInstanceId()); + invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, INSTANCE_ID_ATTRIBUTE, getInstanceId()); invocation.setTarget(portletContext); invocation.setInstanceContext(instanceContext); @@ -272,7 +272,7 @@ finally { // Reset state before invocation - invocation.removeAttribute(PortletInvocation.REQUEST_SCOPE, INSTANCE_ID_ATTRIBUTE); + invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, INSTANCE_ID_ATTRIBUTE); invocation.setTarget(null); invocation.setInstanceContext(null); } Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -61,7 +61,7 @@ { try { - String instanceid = (String)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, Instance.INSTANCE_ID_ATTRIBUTE); + String instanceid = (String)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, Instance.INSTANCE_ID_ATTRIBUTE); PortalAuthorizationManager pam = pamf.getManager(); InstancePermission perm = new InstancePermission(instanceid, InstancePermission.VIEW_MASK); boolean authorized = pam.checkPermission(perm); Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -143,7 +143,7 @@ public void setProperty(String key, String value) throws IllegalStateException { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate(key, new StringValue(value))}); } } Modified: trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -222,7 +222,7 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("_abc", new StringValue("_def"))}); return null; } @@ -233,7 +233,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("_abc", new StringValue("_def"))}); return null; } @@ -246,7 +246,7 @@ { try { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("_abc", new StringValue("_def"))}); fail("Was expecting an IllegalStateException"); } @@ -262,7 +262,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("_abc", new StringValue("_def"))}); throw new RuntimeException("custom_message"); } Modified: trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java =================================================================== --- trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -52,7 +52,7 @@ super(invocation); // - this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context"); + this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context"); this.blah = null; } Modified: trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java =================================================================== --- trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -51,7 +51,7 @@ super(invocation, preq); // - this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context"); + this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context"); } // /** Modified: trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java =================================================================== --- trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -54,7 +54,7 @@ super(invocation); // - this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context"); + this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context"); } public ControllerContext getControllerContext() Modified: trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java =================================================================== --- trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -47,7 +47,7 @@ super(invocation, preq); // - this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "controller_context"); + this.controllerContext = (ControllerContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "controller_context"); } public PortalNodeURL createActionURL(PortalNode node) throws IllegalArgumentException, IllegalStateException Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -60,6 +60,7 @@ this.invocation = invocation; // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(invocation.clientRequest)); addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(invocation.clientRequest)); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -61,6 +61,7 @@ this.invocation = invocation; // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(invocation.clientRequest)); addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(invocation.clientRequest)); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -65,7 +65,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = ((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); + PortletContainer container = ((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); PortletApplication portletApplication = container.getApplication(); RequestContext reqCtx = invocation.getRequestContext(); ServletContext targetCtx = portletApplication.getContext().getServletContext(); Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -69,7 +69,7 @@ String contentType = si.getContentType().toString(); // Get the modes for this content type - PortletInfo containerInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + PortletInfo containerInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); CapabilitiesInfo capabilities = containerInfo.getCapabilities(); // Add all the modes Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -84,7 +84,7 @@ // Set the sub session for the portlet synchronization if (ss != null && ss.isActivated()) { - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, "subsession", ss); + invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession", ss); } // @@ -92,13 +92,13 @@ } finally { - List modifications = (List)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "subsession"); + List modifications = (List)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); // If we have any modifications propagate them if (modifications != null) { // - invocation.removeAttribute(PortletInvocation.REQUEST_SCOPE, "subsession"); + invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); // if (ss == null) Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -41,12 +41,12 @@ { protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletInfo portletInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + PortletInfo portletInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); SessionInfo sessionInfo = portletInfo.getSession(); if (sessionInfo != null && Boolean.TRUE.equals(sessionInfo.getDistributed())) { - SubSession ss = (SubSession)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, "subsession"); + SubSession ss = (SubSession)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession"); // If we detect an activation then we copy the content in the dispatched session if (ss != null) @@ -70,7 +70,7 @@ List modifications = SessionListener.desactivate(); // Set modifications for portal session synchronization - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, "subsession", modifications); + invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, "subsession", modifications); } } else Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -62,7 +62,7 @@ FragmentResponse fragmentResult = (FragmentResponse)response; // Get config - PortletInfo info = (PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + PortletInfo info = (PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); CacheInfo cacheInfo = info.getCache(); // Update the fragment cache info from the meta info Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -43,7 +43,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletInfo containerInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + PortletInfo containerInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); SecurityInfo securityInfo = containerInfo.getSecurity(); SecurityContext securityContext = invocation.getSecurityContext(); boolean invoke = true; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -49,7 +49,7 @@ { protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { - PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); + PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); Valve valve = container.getValve(); // Try to aquire the valve Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -82,7 +82,7 @@ portletInvocation.setHandler(null); // - ContainerPortletInfo info = (ContainerPortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); + ContainerPortletInfo info = (ContainerPortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO); PortletContainer container = info.getContainer(); return container.dispatch(portletInvocation); } @@ -194,7 +194,7 @@ { invocation.setHandler(handler); - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, PORTLET_CONTAINER_INFO, info); + invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, PORTLET_CONTAINER_INFO, info); return (PortletInvocationResponse)invocation.invoke(stackFactory.getInterceptorStack()); } catch (Exception e) @@ -215,7 +215,7 @@ finally { invocation.setHandler(prevHandler); - invocation.removeAttribute(PortletInvocation.REQUEST_SCOPE, PORTLET_CONTAINER_INFO); + invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, PORTLET_CONTAINER_INFO); } } Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -107,7 +107,7 @@ this.securityContext = invocation.getSecurityContext(); this.requestContext = invocation.getRequestContext(); this.instanceContext = invocation.getInstanceContext(); - this.container = (PortletContainerImpl)((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); + this.container = (PortletContainerImpl)((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); this.contentTypes = container.getContentTypes(); this.dreq = invocation.getDispatchedRequest(); this.portalContext = new PortalContextImpl(invocation.getPortalContext()); @@ -115,7 +115,7 @@ // int mode = this instanceof RenderRequest ? PortletPreferencesImpl.RENDER : PortletPreferencesImpl.ACTION; - PropertyContext prefs = (PropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + PropertyContext prefs = (PropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); PreferencesValidator validator = container.getPreferencesValidator(); ContainerPreferencesInfo containerPrefs = (ContainerPreferencesInfo)container.getInfo().getPreferences(); this.preferences = new PortletPreferencesImpl(prefs, containerPrefs, validator, mode); @@ -400,7 +400,7 @@ public boolean isUserInRole(String roleName) { // Get the map role name to role link - Map securityRoleRefsMap = ((PortletContainerImpl)((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer()).getSecurityRoleRefsMap(); + Map securityRoleRefsMap = ((PortletContainerImpl)((ContainerPortletInfo)(PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer()).getSecurityRoleRefsMap(); // Process the role link String roleLink = (String)securityRoleRefsMap.get(roleName); Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -52,6 +52,9 @@ /** The request scope. */ public static final Scope REQUEST_SCOPE = Scope.REQUEST_SCOPE; + /** The request scope. */ + public static final Scope INVOCATION_SCOPE = Scope.INVOCATION_SCOPE; + /** The request properties . */ public static final Scope REQUEST_PROPERTIES_SCOPE = new Scope("request_properties"); Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.state.consumer; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -133,12 +132,6 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException { - AttributeResolver resolver = invocation.getContext().getAttributeResolver(PortletInvocation.REQUEST_SCOPE); - if (resolver == null) - { - throw new IllegalArgumentException(); - } - PortletContext portletContext = invocation.getTarget(); if (portletContext == null) { Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -227,7 +227,7 @@ try { invocation.setTarget(context.getPortletContext()); - invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE, prefs); + invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE, prefs); // Invoke response = portletInvoker.invoke(invocation); @@ -235,7 +235,7 @@ finally { invocation.setTarget(portletContext); - invocation.removeAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); } // Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -715,7 +715,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); return null; } @@ -749,7 +749,7 @@ { try { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); return null; } @@ -780,7 +780,7 @@ { public PortletInvocationResponse invoke(PortletInvocation invocation) { - AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); + AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); return null; } Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -612,6 +612,7 @@ this.invocation = invocation; // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(ServerInvocation.REQUEST_SCOPE, invocation.getContext()); addResolver(ServerInvocation.PRINCIPAL_SCOPE, invocation.getContext()); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java 2007-03-20 01:52:19 UTC (rev 6764) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java 2007-03-20 02:05:40 UTC (rev 6765) @@ -83,6 +83,7 @@ this.requestContext = new WSRPRequestContext(); // + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.REQUEST_SCOPE, new RequestAttributeResolver(ServletAccess.getRequest())); addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttributeResolver());