Author: julien(a)jboss.com Date: 2007-06-26 15:43:40 -0400 (Tue, 26 Jun 2007) New Revision: 7564 Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml Log: improve display of tab when an error occurs Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-06-26 19:15:17 UTC (rev 7563) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-06-26 19:43:40 UTC (rev 7564) @@ -50,12 +50,15 @@ import org.jboss.portal.core.model.portal.command.view.ViewContextCommand; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; import org.jboss.portal.core.model.portal.command.view.ViewPortalCommand; +import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.theme.PageRendition; import org.jboss.portal.core.aspects.controller.node.Navigation; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.server.config.ServerConfig; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; @@ -120,9 +123,9 @@ PageRendition rendition = (PageRendition)resp; // - if (cmd instanceof RenderPageCommand) + if (cmd instanceof PageCommand) { - RenderPageCommand rpc = (RenderPageCommand)cmd; + PageCommand rpc = (PageCommand)cmd; // String tabbedNav = injectTabbedNav(rpc); @@ -294,7 +297,7 @@ return null; } - public String injectTabbedNav(RenderPageCommand rpc) + public String injectTabbedNav(PageCommand rpc) { ControllerContext controllerCtx = rpc.getControllerContext(); ControllerRequestDispatcher rd = controllerCtx.getRequestDispatcher(targetContextPath, tabsPath); @@ -302,7 +305,12 @@ // if (rd != null) { - rd.setAttribute("org.jboss.portal.api.PORTAL_NODE", Navigation.getCurrentNode()); + Page page = rpc.getPage(); + PortalAuthorizationManager pam = portalAuthorizationManagerFactory.getManager(); + PortalNodeImpl node = new PortalNodeImpl(pam, page); + + // + rd.setAttribute("org.jboss.portal.api.PORTAL_NODE", node); rd.setAttribute("org.jboss.portal.api.PORTAL_RUNTIME_CONTEXT", Navigation.getPortalRuntimeContext()); // Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-06-26 19:15:17 UTC (rev 7563) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-06-26 19:43:40 UTC (rev 7564) @@ -245,13 +245,13 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> - <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element> </depends-list> </mbean>