Author: chris.laprun(a)jboss.com Date: 2008-06-25 17:50:02 -0400 (Wed, 25 Jun 2008) New Revision: 11150 Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml Log: - Added missing delegation to ContainerPortletDispatcher. Fixes Markup tests. All tests should now pass again. Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-06-25 21:33:53 UTC (rev 11149) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-06-25 21:50:02 UTC (rev 11150) @@ -30,8 +30,7 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Producer - </depends> + <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends> <depends optional-attribute-name="RegistrationManager" proxy-type="attribute"> portal.wsrp:service=RegistrationManager,type=Producer </depends> Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-25 21:33:53 UTC (rev 11149) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-25 21:50:02 UTC (rev 11150) @@ -67,6 +67,11 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> + <mbean code="org.jboss.portal.portlet.container.ContainerPortletDispatcher" + name="portal:service=Dispatcher,type=Portlet,name=ContainerPortlet" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> <mbean code="org.jboss.portal.server.impl.invocation.JBossPortletInterceptorStackFactory" name="portal:service=InterceptorStackFactory,type=Container" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> @@ -74,6 +79,7 @@ <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element> + <depends-list-element>portal:service=Dispatcher,type=Portlet,name=ContainerPortlet</depends-list-element> </depends-list> </mbean> @@ -118,8 +124,8 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>--> - + <!-- The portlet container invoker --> <mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker" name="portal:service=PortletInvoker,type=Container" xmbean-dd=""