Author: mwringe Date: 2008-08-20 15:10:21 -0400 (Wed, 20 Aug 2008) New Revision: 11720 Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml modules/portlet/trunk/test/src/test/resources/config/ modules/portlet/trunk/test/src/test/resources/config/jetty/ modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties modules/portlet/trunk/test/src/test/resources/jboss-5.0/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml modules/portlet/trunk/test/src/test/resources/jetty-6.1/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-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/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-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/jboss-beans-portal.xml modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml Removed: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/test/build.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 modules/portlet/trunk/test/src/test/resources/test/servers.xml Log: Add JBoss 5.0.x support. Add preliminary Jetty support (not enabled by default). Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/build/pom.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -34,14 +34,14 @@ <version.jbossxb>2.0.0.CR8</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0</version.jboss.portal.common> - <version.jboss.portal.web>1.2.0</version.jboss.portal.web> - <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> + <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> + <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> <version.jboss.reflect>2.0.0.Beta12</version.jboss.reflect> - <version.cargo>0.9-portal</version.cargo> + <version.cargo>1.0-alpha-5</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> <version.sun-jaxb>2.1.4</version.sun-jaxb> @@ -257,6 +257,11 @@ <version>${version.jboss.microcontainer}</version> </dependency> <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <version>${version.jboss.microcontainer}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-reflect</artifactId> <version>${version.jboss.reflect}</version> @@ -293,9 +298,20 @@ <groupId>cargo</groupId> <artifactId>cargo-manager</artifactId> <type>war</type> + <version>0.9-portal</version> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <version>${version.cargo}</version> + </dependency> + <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>${version.portlet-api}</version> Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml (from rev 11719, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml) =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml (rev 0) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> 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-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -26,6 +26,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 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> + </context-param> <filter> <filter-name>ErrorHandlingFilter</filter-name> <filter-class>org.jboss.portal.portlet.portal.ErrorHandlingFilter</filter-class> @@ -48,6 +52,6 @@ <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> </web-app> Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/pom.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -53,10 +53,22 @@ <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> + <exclusions> + <exclusion> + <groupId>cargo</groupId> + <artifactId>core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-remote</artifactId> + <exclusions> + <exclusion> + <groupId>cargo</groupId> + <artifactId>core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.unit</groupId> @@ -120,6 +132,18 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jboss.portal.web</groupId> <artifactId>web-web</artifactId> <type>jar</type> @@ -189,12 +213,12 @@ <!-- stuff to run servers for tests --> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> <version>${version.cargo}</version> </dependency> <dependency> - <groupId>cargo</groupId> + <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> @@ -257,12 +281,13 @@ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> - <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> - <property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/> + <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/> + <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/> <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/> + <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> @@ -281,4 +306,4 @@ </build> -</project> \ No newline at end of file +</project> Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/build.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -12,7 +12,8 @@ <echo message="test classpath: ${test_classpath}"/> <echo message="plugin classpath: ${plugin_classpath}"/> - <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss or -D=tests=tomcat"/> +<!-- <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, -Dtests=tomcat, or -Dtests=jetty"/> --> + <echo message="You can run small subset of tests using -Dtests=local, -Dtests=jboss, or -Dtests=tomcat"/> <antcall target="package-tests"/> @@ -24,6 +25,7 @@ <target name="tests.call.all" unless="tests"> <antcall target="tests.jboss"/> <antcall target="tests.tomcat"/> +<!-- <antcall target="tests.jetty"/> --> </target> <target name="tests.call.single" if="tests"> @@ -114,6 +116,22 @@ <path location="${dependency.ccpp.jar}"/> </path> + <path id="jboss-5.0"> + <path refid="portal-common"/> + <path refid="portal-web"/> + <path refid="portal-portlet"/> + <path refid="jboss-microcontainer"/> + <path location="${dependency.jboss-common-core.jar}"/> + </path> + + <path id="jboss-5.0-shared"> + <path refid="portal-common-shared"/> + <path refid="portal-web-shared"/> + <path refid="portal-portlet-shared"/> + <path refid="jboss-unit-shared"/> + <path location="${dependency.ccpp.jar}"/> + </path> + <path id="tomcat-6.0"> <path refid="portal-common"/> <path refid="portal-web"/> @@ -141,6 +159,33 @@ <path location="${dependency.ccpp.jar}"/> </path> + <path id="jetty-6.1"> + <path refid="portal-common"/> + <path refid="portal-web"/> + <path refid="portal-portlet"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + <pathelement path="${dependency.javassist.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement path="${dependency.trove.jar}"/> + </path> + + <path id="jetty-6.1-shared"> + <path refid="portal-common-shared"/> + <path refid="portal-web-shared"/> + <path refid="portal-portlet-shared"/> + <path refid="jboss-unit-shared"/> + <path refid="jboss-logging"/> + <path location="${dependency.jboss-common-core.jar}"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.concurrent.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.jaxb.jar}"/> + <path location="${dependency.ccpp.jar}"/> + </path> + </target> <!--Lets make the check in one place so the build fail in the beggining instead of end--> @@ -173,6 +218,14 @@ </not> </and> </condition> + <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}"> + <and> + <isset property="env.JBOSS_5_0_HOME"/> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -181,6 +234,14 @@ </not> </and> </condition> +<!-- <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}"> + <and> + <isset property="env.JETTY_6_1_HOME"/> + <not> + <isset property="JETTY_6_1_HOME"/> + </not> + </and> + </condition> --> <fail message="Please set the environment variable JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME"> <condition> @@ -198,6 +259,16 @@ </condition> </fail> + <fail message="Please set the environment variable JBOSS_5_0_HOME"> + <condition> + <and> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> + </fail> + <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> <and> @@ -208,6 +279,16 @@ </condition> </fail> +<!-- <fail message="Please set the environment variable JETTY_6_1_HOME"> + <condition> + <and> + <not> + <isset property="JETTY_6_1_HOME"/> + </not> + </and> + </condition> + </fail> --> + </target> <macrodef name="package-misc-test"> @@ -412,6 +493,22 @@ <fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/> </jar> + <!-- JBoss 5.0 portlet-test.war --> + <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true"> + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <path refid="jboss-5.0"/> + </copy> + <mkdir dir="${test.temp.lib}/jboss-5.0"/> + <jar jarfile="${test.temp.lib}/jboss-5.0/portlet-test.war"> + <fileset dir="${test.temp.dir}/jboss-5.0/portlet-test-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + </jar> + <!-- Tomcat 6.0 portlet-test.war --> <copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war"> <fileset dir="${target}/test-classes/portlet-test-war"/> @@ -425,7 +522,21 @@ <jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war"> <fileset dir="${test.temp.dir}/tomcat-6.0/portlet-test-war"/> </jar> + <!-- Jetty 6.1 portlet-test.war --> + <copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/jetty-6.1/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war/WEB-INF/lib" flatten="true"> + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <path refid="jetty-6.1"/> + </copy> + <mkdir dir="${test.temp.lib}/jetty-6.1"/> + <jar jarfile="${test.temp.lib}/jetty-6.1/portlet-test.war"> + <fileset dir="${test.temp.dir}/jetty-6.1/portlet-test-war"/> + </jar> + <!-- Strip cargo manager war filename--> <copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/> @@ -465,6 +576,7 @@ <configuration home="${test.jboss-4.2.tempdir}"> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> + <property name="cargo.rmi.port" value="1099"/> <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>--> <deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/> </configuration> @@ -536,8 +648,94 @@ </antcall> </target> + <target name="cargo.jboss-5.0.start" depends="cargo.setup"> + <!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file + otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration + layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown + reason, the class initiating the loading of the RemoteTestDriver class is + org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) + --> + + <property name="jboss-5.0-shared-property" refid="jboss-5.0-shared"/> + <echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/> + + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + action="start" + wait="${cargo.wait}"> + <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>--> + <sharedClasspath> + + <path refid="jboss-5.0-shared"/> + + </sharedClasspath> + <configuration home="${test.jboss-5.0.tempdir}"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.rmi.port" value="1099"/> + <property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/> + <deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.jboss-5.0.stop" depends="cargo.setup"> + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" + action="stop"> + <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>--> + <configuration home="${test.jboss-5.0.tempdir}"> + <property name="cargo.rmi.port" value="1099"/> + </configuration> + </cargo> + </target> + + <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.deploy.name" value="jboss-5.0-container-servlet"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.deploy.name" value="jboss-5.0-generic"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0"> + <antcall target="tests.jboss-5.0.container-servlet"> + <param name="test.id" value="JBoss-5_0-container-servlet"/> + <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/> + <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/> + <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/> + <param name="test.jboss-5.0.tempdir" value="${target}/cargo-tmp/5_0"/> + </antcall> + </target> + <target name="tests.jboss"> <antcall target="tests.jboss-4.2"/> + <antcall target="tests.jboss-5.0"/> </target> <target name="cargo.tomcat-6.start" depends="cargo.setup"> @@ -549,7 +747,7 @@ </taskdef> <cargo - containerId="tomcat5x" + containerId="tomcat6x" home="${test.tomcat-6.home}" output="${cargo.log.dir}/cargo.${test.id}.server.log" log="${cargo.log.dir}/cargo.${test.id}.start.log" @@ -572,7 +770,7 @@ <target name="cargo.tomcat-6.stop" depends="cargo.setup"> <cargo - containerId="tomcat5x" + containerId="tomcat6x" home="${test.tomcat-6.home}" log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> @@ -604,6 +802,72 @@ <antcall target="tests.tomcat-6"/> </target> + <target name="cargo.jetty-6.start" depends="cargo.setup"> + + <taskdef resource="cargo.tasks"> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> + </taskdef> + + <cargo + containerId="jetty6x" + home="${test.jetty-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + wait="${cargo.wait}"> + <extraClasspath> + <path refid="jetty-6.1-shared"/> + </extraClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/> + <configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/> + <configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/> + <deployable type="war" file="${dependency.cargo.jetty-deployer}"> + <property name="context" value="cargo-jetty-deployer"/> + </deployable> + <deployable type="war" file="${test.temp.lib}/jetty-6.1/portlet-test.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.jetty-6.stop" depends="cargo.setup"> + <cargo + containerId="jetty6x" + home="${test.jetty-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration/> + </cargo> + </target> + + <target name="tests.jetty-6.container-servlet" if="${test.jetty-6.home.variable-name}"> + <echo message="Starting Jetty 6 container-servlet tests with ${test.jetty-6.home}"/> + <antcall target="cargo.jetty-6.start"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="RemoteJetty_6_1"/> + </antcall> + <antcall target="cargo.jetty-6.stop"/> + </target> + + <target name="tests.jetty-6"> + <antcall target="tests.jetty-6.container-servlet"> + <param name="test.id" value="Jetty-6_1-container-servlet"/> + <param name="test.jetty-6.name" value="RemoteJetty_6_1"/> + <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/> + <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/> + </antcall> + </target> + + <target name="tests.jetty"> + <antcall target="tests.jetty-6"/> + </target> + <target name="tests.remote"> <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> @@ -636,11 +900,15 @@ <property name="tck" value="${target}/tck"/> <property name="tck-jboss" value="${tck}/jboss42"/> + <property name="tck-jboss5" value="${tck}/jboss50"/> <property name="tck-tomcat" value="${tck}/tomcat6"/> + <property name="tck-jetty" value="${tck}/jetty6"/> <mkdir dir="${tck}"/> <mkdir dir="${tck-jboss}"/> + <mkdir dir="${tck-jboss5}"/> <mkdir dir="${tck-tomcat}"/> + <mkdir dir="${tck-jetty}"/> <jar jarfile="${target}/portlet-test-lib.jar"> <fileset dir="${target}/classes" excludes="org/jboss/portal/portlet/portal/samples/**"/> @@ -668,6 +936,31 @@ <path refid="jboss-4.2-shared"/> </copy> + <!-- JBOSS 5 --> + <copy todir="${tck-jboss5}/portlet-tck-war"> + <fileset dir="${target}/test-classes/portlet-tck-war"/> + </copy> + <copy todir="${tck-jboss5}/portlet-tck-war"> + <fileset dir="${target}/test-classes/jboss-5.0/portlet-tck-war"/> + </copy> + + <copy todir="${tck-jboss5}/portlet-tck-war/WEB-INF/lib" flatten="true"> + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <path refid="jboss-5.0"/> + </copy> + + <mkdir dir="${tck-jboss5}/tck-portal"/> + + <jar jarfile="${tck-jboss5}/tck-portal/portlet-tck.war"> + <fileset dir="${tck-jboss5}/portlet-tck-war"> + <exclude name="**/jboss-kernel*.jar"/> + </fileset> + </jar> + + <copy todir="${tck-jboss5}/tck-portal" flatten="true"> + <path refid="jboss-5.0-shared"/> + </copy> + <!--TOMCAT--> <copy todir="${tck-tomcat}/portlet-tck-war"> @@ -692,8 +985,31 @@ <path refid="tomcat-6.0-shared"/> </copy> + <!--JETTY--> + <copy todir="${tck-jetty}/portlet-tck-war"> + <fileset dir="${target}/test-classes/portlet-tck-war"/> + </copy> + <copy todir="${tck-jetty}/portlet-tck-war"> + <fileset dir="${target}/test-classes/jetty-6.1/portlet-tck-war"/> + </copy> + + <copy todir="${tck-jetty}/portlet-tck-war/WEB-INF/lib" flatten="true"> + <fileset dir="${target}" includes="portlet-test-lib.jar"/> + <path refid="jetty-6.1"/> + </copy> + + <mkdir dir="${tck-jetty}/tck-portal"/> + + <jar jarfile="${tck-jetty}/tck-portal/portlet-tck.war"> + <fileset dir="${tck-jetty}/portlet-tck-war"/> + </jar> + + <copy todir="${tck-jetty}/tck-portal" flatten="true"> + <path refid="jetty-6.1-shared"/> + </copy> + <delete file="${target}/portlet-test-lib.jar"/> </target> -</project> \ No newline at end of file +</project> Added: modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/config/jetty/jetty.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,195 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Server Thread Pool --> + <!-- =========================================================== --> + <Set name="ThreadPool"> + <!-- Default bounded blocking threadpool + --> + <New class="org.mortbay.thread.BoundedThreadPool"> + <Set name="minThreads">10</Set> + <Set name="lowThreads">50</Set> + <Set name="maxThreads">250</Set> + </New> + + <!-- Optional Java 5 bounded threadpool with job queue + <New class="org.mortbay.thread.concurrent.ThreadPool"> + <Arg type="int">0</Arg> + <Set name="corePoolSize">10</Set> + <Set name="maximumPoolSize">250</Set> + </New> + --> + </Set> + + <!-- =========================================================== --> + <!-- Set connectors --> + <!-- =========================================================== --> + <!-- One of each type! --> + <!-- =========================================================== --> + + <!-- Use this connector for many frequently idle connections + and for threadless continuations. + --> + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.nio.SelectChannelConnector"> + <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> + <Set name="maxIdleTime">30000</Set> + <Set name="Acceptors">2</Set> + <Set name="confidentialPort">8443</Set> + </New> + </Arg> + </Call> + + <!-- Use this connector if NIO is not available. + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.bio.SocketConnector"> + <Set name="port">8081</Set> + <Set name="maxIdleTime">50000</Set> + <Set name="lowResourceMaxIdleTime">1500</Set> + </New> + </Arg> + </Call> + --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To add a HTTPS SSL listener --> + <!-- see jetty-ssl.xml to add an ssl connector. use --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- =========================================================== --> + <!-- Set up global session ID manager --> + <!-- =========================================================== --> + <!-- + <Set name="sessionIdManager"> + <New class="org.mortbay.jetty.servlet.HashSessionIdManager"> + <Set name="workerName">node1</Set> + </New> + </Set> + --> + + <!-- =========================================================== --> + <!-- Set handler Collection Structure --> + <!-- =========================================================== --> + <Set name="handler"> + <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection"> + <Set name="handlers"> + <Array type="org.mortbay.jetty.Handler"> + <Item> + <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item> + <Item> + <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item> + <Item> + <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item> + </Array> + </Set> + </New> + </Set> + + <!-- =========================================================== --> + <!-- Configure the context deployer --> + <!-- A context deployer will deploy contexts described in --> + <!-- configuration files discovered in a directory. --> + <!-- The configuration directory can be scanned for hot --> + <!-- deployments at the configured scanInterval. --> + <!-- --> + <!-- This deployer is configured to deploy contexts configured --> + <!-- in the $JETTY_HOME/contexts directory --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.ContextDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set> + <Set name="scanInterval">1</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- $JETTY_HOME/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure Authentication Realms --> + <!-- Realms may be configured for the entire server here, or --> + <!-- they can be configured for a specific web app in a context --> + <!-- configuration (see $(jetty.home)/contexts/test.xml for an --> + <!-- example). --> + <!-- =========================================================== --> + <Set name="UserRealms"> + <Array type="org.mortbay.jetty.security.UserRealm"> + <Item> + <New class="org.mortbay.jetty.security.HashUserRealm"> + <Set name="name">Test Realm</Set> + <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set> + </New> + </Item> + </Array> + </Set> + + <!-- =========================================================== --> + <!-- Configure Request Log --> + <!-- Request logs may be configured for the entire server here, --> + <!-- or they can be configured for a specific web app in a --> + <!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> + <!-- for an example). --> + <!-- =========================================================== --> + <Ref id="RequestLog"> + <Set name="requestLog"> + <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog"> + <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg> + <Set name="retainDays">90</Set> + <Set name="append">true</Set> + <Set name="extended">false</Set> + <Set name="LogTimeZone">GMT</Set> + </New> + </Set> + </Ref> + + <!-- =========================================================== --> + <!-- extra options --> + <!-- =========================================================== --> + <Set name="stopAtShutdown">true</Set> + <!-- ensure/prevent Server: header being sent to browsers --> + <Set name="sendServerVersion">true</Set> + +</Configure> Added: modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties =================================================================== --- modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties (rev 0) +++ modules/portlet/trunk/test/src/test/resources/config/jetty/realm.properties 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,23 @@ +# +# This file defines users passwords and roles for a HashUserRealm +# +# The format is +# <username>: <password>[,<rolename> ...] +# +# Passwords may be clear text, obfuscated or checksummed. The class +# org.mortbay.util.Password should be used to generate obfuscated +# passwords or password checksums +# +# If DIGEST Authentication is used, the password must be in a recoverable +# format, either plain text or OBF:. +# +jetty: MD5:164c88b302622e17050af52c89945d44,user +admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin +other: OBF:1xmk1w261u9r1w1c1xmq +plain: plain +user: password + +admin: admin,manager + +# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password +digest: MD5:6e120743ad67abfbc385bc2bb754e297 Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/jboss-web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,31 @@ +<?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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.portlet.test.tck.TCKServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,24 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<Context privileged="true"> +</Context> Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,24 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<Context privileged="true"> +</Context> Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/jboss-web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,31 @@ +<?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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> +<Configure class="org.mortbay.jetty.webapp.WebAppContext"> + + <Get id="serverObject" name="server"/> + + <New id="jettySetup" class="org.jboss.portal.web.impl.jetty.Jetty6Handler"> + <Arg><Ref id="serverObject"/></Arg> + </New> + +</Configure> + + Added: 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 (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.portlet.test.tck.TCKServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/META-INF/context.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/log4j.properties 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/classes/logging.properties 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = servlet-examples. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> +<Configure class="org.mortbay.jetty.webapp.WebAppContext"> + + <Get id="serverObject" name="server"/> + + <New id="jettySetup" class="org.jboss.portal.web.impl.jetty.Jetty6Handler"> + <Arg><Ref id="serverObject"/></Arg> + </New> + +</Configure> + + Added: 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 (rev 0) +++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: 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 (rev 0) +++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> Deleted: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> 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-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -26,13 +26,17 @@ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> <listener> <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> <servlet> <servlet-name>PortalServlet</servlet-name> Copied: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml (from rev 11719, modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml) =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> Deleted: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -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> 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-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -26,13 +26,17 @@ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-beans-portal.xml</param-value> + </context-param> <listener> <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> <servlet> <servlet-name>PortalServlet</servlet-name> Modified: modules/portlet/trunk/test/src/test/resources/test/servers.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-08-20 15:04:41 UTC (rev 11719) +++ modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-08-20 19:10:21 UTC (rev 11720) @@ -10,7 +10,7 @@ </service> <deployer> <remote> - <name>tomcat5x</name> + <name>tomcat6x</name> <host>localhost</host> <port>8080</port> </remote> @@ -22,6 +22,28 @@ </node> </server> <server> + <server-name>RemoteJetty_6_1</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jetty6x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> + <server> <server-name>RemoteJBoss_4_2_0</server-name> <node> <node-id>default</node-id> @@ -75,4 +97,23 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_5_0</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss5x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> + </servers>