[gatein-commits] gatein SVN: r5687 - in components/pc/trunk: test/core/src/main/java/org/gatein/pc/test and 13 other directories.

Author: julien_viet Date: 2011-01-06 11:49:21 -0500 (Thu, 06 Jan 2011) New Revision: 5687 Added: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java Removed: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml Log: GTNPC-45 : Remove JBoss MC usage from pc test suite execution Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -47,7 +47,7 @@ <url-pattern>*.jsp</url-pattern> </filter-mapping> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Added: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java =================================================================== --- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java (rev 0) +++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java 2011-01-06 16:49:21 UTC (rev 5687) @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * 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.gatein.pc.test.bootstrap; + +import org.gatein.pc.portlet.PortletInvokerInterceptor; +import org.gatein.pc.portlet.aspects.CCPPInterceptor; +import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor; +import org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor; +import org.gatein.pc.portlet.aspects.EventPayloadInterceptor; +import org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor; +import org.gatein.pc.portlet.aspects.ProducerCacheInterceptor; +import org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor; +import org.gatein.pc.portlet.aspects.SecureTransportInterceptor; +import org.gatein.pc.portlet.aspects.ValveInterceptor; +import org.gatein.pc.portlet.container.ContainerPortletDispatcher; +import org.gatein.pc.portlet.container.ContainerPortletInvoker; +import org.gatein.pc.portlet.impl.state.StateConverterV0; +import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; +import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService; +import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker; +import org.gatein.pc.test.TestPortletApplicationDeployer; +import org.gatein.wci.ServletContainer; +import org.gatein.wci.ServletContainerFactory; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter; +import org.jboss.unit.remote.driver.RemoteTestDriverServer; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ServletContextBootstrap implements ServletContextListener +{ + + /** . */ + private TestPortletApplicationDeployer portletApplicationDeployer; + + /** . */ + private GenericServiceExporter testDriverServerExporter; + + /** . */ + private PortletInvokerInterceptor consumerPortletInvoker; + + public void contextInitialized(ServletContextEvent sce) + { + try + { + boostrap(); + + // + sce.getServletContext().setAttribute("ConsumerPortletInvoker", consumerPortletInvoker); + } + catch (Exception e) + { + System.err.println("Could not boostrap test server"); + e.printStackTrace(System.err); + throw new RuntimeException(e); + } + } + + public void boostrap() throws Exception + { + + // ************** + // * WIRE PHASE * + // ************** + + // The producer persistence manager + PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService(); + + // The producer state management policy + StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); + producerStateManagementPolicy.setPersistLocally(true); + + // The producer state converter + StateConverterV0 producerStateConverter = new StateConverterV0(); + + // The servlet container factory + ServletContainerFactory servletContainerFactory = DefaultServletContainerFactory.getInstance(); + + // Container stack + ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher(); + EventPayloadInterceptor eventPayloadInterceptor = new EventPayloadInterceptor(); + eventPayloadInterceptor.setNext(portletContainerDispatcher); + RequestAttributeConversationInterceptor requestAttributeConversationInterceptor = new RequestAttributeConversationInterceptor(); + requestAttributeConversationInterceptor.setNext(eventPayloadInterceptor); + CCPPInterceptor ccppInterceptor = new CCPPInterceptor(); + ccppInterceptor.setNext(requestAttributeConversationInterceptor); + ProducerCacheInterceptor producerCacheInterceptor = new ProducerCacheInterceptor(); + producerCacheInterceptor.setNext(ccppInterceptor); + ContextDispatcherInterceptor contextDispatcherInterceptor = new ContextDispatcherInterceptor(); + contextDispatcherInterceptor.setServletContainerFactory(servletContainerFactory); + contextDispatcherInterceptor.setNext(producerCacheInterceptor); + SecureTransportInterceptor secureTransportInterceptor = new SecureTransportInterceptor(); + secureTransportInterceptor.setNext(contextDispatcherInterceptor); + ValveInterceptor valveInterceptor = new ValveInterceptor(); + valveInterceptor.setNext(secureTransportInterceptor); + + // The portlet container invoker + ContainerPortletInvoker containerPortletInvoker = new ContainerPortletInvoker(); + containerPortletInvoker.setNext(valveInterceptor); + + // The producer portlet invoker + ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); + producerPortletInvoker.setNext(containerPortletInvoker); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); + producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); + producerPortletInvoker.setStateConverter(producerStateConverter); + + // The consumer portlet invoker + PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); + portletCustomizationInterceptor.setNext(producerPortletInvoker); + ConsumerCacheInterceptor consumerCacheInterceptor = new ConsumerCacheInterceptor(); + consumerCacheInterceptor.setNext(portletCustomizationInterceptor); + PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor(); + consumerPortletInvoker.setNext(consumerCacheInterceptor); + + // The servlet container obtained from the servlet container factory + ServletContainer servletContainer = servletContainerFactory.getServletContainer(); + + // Remote test driver server + RemoteTestDriverServer testDriverServer = new RemoteTestDriverServer(); + + // Generic service exporter + GenericServiceExporter testDriverServerExporter = new GenericServiceExporter( + "socket://localhost:5400", + testDriverServer, + "org.jboss.unit.remote.driver.RemoteTestDriver"); + + // + TestPortletApplicationDeployer portletApplicationDeployer = new TestPortletApplicationDeployer(); + portletApplicationDeployer.setServletContainerFactory(servletContainerFactory); + portletApplicationDeployer.setDriver(testDriverServer); + portletApplicationDeployer.setContainerPortletInvoker(containerPortletInvoker); + + // Instantiated + valveInterceptor.setPortletApplicationRegistry(portletApplicationDeployer); + + // + this.consumerPortletInvoker = consumerPortletInvoker; + + // *************** + // * START PHASE * + // *************** + + // + portletApplicationDeployer.start(); + this.portletApplicationDeployer = portletApplicationDeployer; + + // + testDriverServerExporter.start(); + this.testDriverServerExporter = testDriverServerExporter; + } + + public void contextDestroyed(ServletContextEvent sce) + { + sce.getServletContext().setAttribute("ConsumerPortletInvoker", null); + + // + if (testDriverServerExporter != null) + { + testDriverServerExporter.stop(); + } + + // + if (portletApplicationDeployer != null) + { + portletApplicationDeployer.stop(); + } + } +} Modified: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java =================================================================== --- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2011-01-06 16:49:21 UTC (rev 5687) @@ -38,7 +38,6 @@ import org.gatein.pc.api.invocation.response.PortletInvocationResponse; import org.gatein.wci.IllegalRequestException; import org.gatein.common.io.Serialization; -import org.gatein.common.mc.bootstrap.WebBootstrap; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -71,7 +70,7 @@ super(req, resp); // - this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); + this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.stateControllerContext = new StateControllerContextImpl(this); this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext); Modified: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java =================================================================== --- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2011-01-06 16:49:21 UTC (rev 5687) @@ -36,7 +36,6 @@ import org.gatein.pc.api.invocation.PortletInvocation; import org.gatein.wci.IllegalRequestException; import org.gatein.common.io.Serialization; -import org.gatein.common.mc.bootstrap.WebBootstrap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -71,7 +70,7 @@ super(req, resp); // - this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); + this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this)); this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext); Deleted: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>PortalServlet</servlet-name> Deleted: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>PortalServlet</servlet-name> Deleted: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> Deleted: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -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.gatein.pc.test.TestPortletApplicationDeployer"> - <alias>PortletApplicationRegistry</alias> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="driver"><inject bean="TestDriverServer"/></property> - <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> - </bean> - - <!-- The ServletContainerFactory --> - <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> - <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> - </bean> - - <!-- The servlet container obtained from the ServletContainerFactory --> - <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> - <constructor factoryMethod="getServletContainer"> - <factory bean="ServletContainerFactory"/> - </constructor> - </bean> - - <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> - - <!-- The producer state management policy --> - <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService"> - <property name="persistLocally"><value>true</value></property> - </bean> - - <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/> - - <!-- The consumer portlet invoker --> - <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor"> - <property name="next"><inject bean="ConsumerCacheInterceptor"/></property> - </bean> - <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor"> - <property name="next"><inject bean="PortletCustomizationInterceptor"/></property> - </bean> - <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor"> - <property name="next"><inject bean="ProducerPortletInvoker"/></property> - </bean> - - <!-- The producer portlet invoker --> - <bean name="ProducerPortletInvoker" class="org.gatein.pc.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.gatein.pc.portlet.container.ContainerPortletInvoker"> - <property name="next"><inject bean="ValveInterceptor"/></property> - </bean> - - <!-- Container stack --> - <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor"> - <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property> - <property name="next"><inject bean="SecureTransportInterceptor"/></property> - </bean> - <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor"> - <property name="next"><inject bean="ContextDispatcherInterceptor"/></property> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor"> - <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> - <property name="next"><inject bean="ProducerCacheInterceptor"/></property> - </bean> - <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor"> - <property name="next"><inject bean="CCPPInterceptor"/></property> - </bean> - <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor"> - <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property> - </bean> - <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor"> - <property name="next"><inject bean="EventPayloadInterceptor"/></property> - </bean> - <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor"> - <property name="next"><inject bean="PortletContainerDispatcher"/></property> - </bean> - <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher"> - </bean> - -</deployment> Modified: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686) +++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687) @@ -31,7 +31,7 @@ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> </context-param> <listener> - <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name>