[portal-commits] JBoss Portal SVN: r11836 - in modules/portlet/trunk: test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Sep 9 00:26:14 EDT 2008
Author: mwringe
Date: 2008-09-09 00:26:13 -0400 (Tue, 09 Sep 2008)
New Revision: 11836
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
Removed:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
Log:
Change jboss-beans-portal.xml files to jboss-portal-beans.xml.
Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <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">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <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">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
version="2.5">
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<filter>
<filter-name>ErrorHandlingFilter</filter-name>
Modified: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Modified: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <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">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <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">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <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">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <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">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
More information about the portal-commits
mailing list