Author: chris.laprun(a)jboss.com Date: 2008-01-29 19:10:07 -0500 (Tue, 29 Jan 2008) New Revision: 9640 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java modules/portlet/trunk/test/src/test/resources/simple-portal-war/ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/log4j.properties modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/logging.properties modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml Modified: modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/test/build.xml Log: - Beginning of effort to create a simple portal based on the portlet container. Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-01-30 00:08:24 UTC (rev 9639) +++ modules/portlet/trunk/test/pom.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -178,14 +178,14 @@ <artifactId>web-web</artifactId> <type>jar</type> </dependency> -<!-- + <!-- + <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-jsr168api</artifactId> + <version>${project.version}</version> + </dependency> + --> <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-jsr168api</artifactId> - <version>${project.version}</version> - </dependency> ---> - <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> </dependency> @@ -257,62 +257,110 @@ <property name="project.version" value="${project.version}"/> - <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> + <property name="dependency.concurrent.jar" + value="${maven.dependency.concurrent.concurrent.jar.path}"/> <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> - <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> - <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> - <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> - <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> - <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> - <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> - <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> - <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> - <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> - <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> - <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> - <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> - <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> - <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> - <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> - <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> + <property name="dependency.jboss-logging-spi.jar" + value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> + <property name="dependency.jboss-logging-jdk.jar" + value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> + <property name="dependency.jboss-logging-log4j.jar" + value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> + <property name="dependency.jboss-vfs.jar" + value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> + <property name="dependency.jboss-aop-mc-int.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> + <property name="dependency.jboss-classloader.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> + <property name="dependency.jboss-container.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> + <property name="dependency.jboss-dependency.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> + <property name="dependency.jboss-deployers-client-spi.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> + <property name="dependency.jboss-deployers-client.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> + <property name="dependency.jboss-deployers-core-spi.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> + <property name="dependency.jboss-deployers-core.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> + <property name="dependency.jboss-deployers-impl.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> + <property name="dependency.jboss-deployers-spi.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> + <property name="dependency.jboss-deployers-structure-spi.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> + <property name="dependency.jboss-deployers-vfs-spi.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> + <property name="dependency.jboss-deployers-vfs.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> + <property name="dependency.jboss-kernel.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> + <property name="dependency.jboss-managed.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> + <property name="dependency.jboss-metatype.jar" + value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> + <property name="dependency.jboss-aop.jar" + value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> + <property name="dependency.pluggable-instrumentor.jar" + value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> + <property name="dependency.javassist.jar" + value="${maven.dependency.org.jboss.javassist.jar.path}"/> + <property name="dependency.jboss-common-core.jar" + value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> + <property name="dependency.resolver.jar" + value="${maven.dependency.apache-xerces.resolver.jar.path}"/> + <property name="dependency.xercesImpl.jar" + value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> + <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.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> - <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> - <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> - <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> - <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> + <property name="dependency.jboss-remoting.jar" + value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> + <property name="dependency.portal-common.jar" + value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-portal.jar" + value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> + <property name="dependency.portal-common-mc.jar" + value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + <property name="dependency.jboss-unit.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> + <property name="dependency.jboss-unit-mc.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> + <property name="dependency.jboss-unit-remote.jar" + value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> + <property name="dependency.portal-test.jar" + value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> + <property name="dependency.portal-test-generic.jar" + value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/> - <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> - <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> + <property name="dependency.commons-logging.jar" + value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> + <property name="dependency.commons-httpclient.jar" + value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> + <property name="dependency.activation.jar" + value="${maven.dependency.javax.activation.activation.jar.path}"/> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> - <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> - <property name="dependency.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> + <property name="dependency.cargo-manager.war" + value="${maven.dependency.cargo.cargo-manager.war.path}"/> + <property name="dependency.portal-web.jar" + value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> <!--<property name="dependency.jsr168api.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-jsr168api.jar.path}"/>--> - <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/> - <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> - <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/> - <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> + <property name="dependency.jsr168api.jar" + value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/> + <property name="dependency.portal-portlet.jar" + value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> + <property name="dependency.portal-portlet-tests.test-jar" + value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-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.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.jaxb-api.jar" + value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> + <target name="package-simple-portal"/> </ant> </tasks> Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java (from rev 9512, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimplePortalServlet.java 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,75 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.simple; + +import org.jboss.portal.portlet.test.PortletController; +import org.jboss.portal.portlet.test.PortletControllerContextImpl; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class SimplePortalServlet extends HttpServlet +{ + + protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + try + { + _service(req, resp); + } + catch (Exception e) + { + if (e instanceof ServletException) + { + throw (ServletException)e; + } + if (e instanceof IOException) + { + throw (IOException)e; + } + if (e instanceof RuntimeException) + { + throw (RuntimeException)e; + } + throw new ServletException(e); + } + } + + protected void _service(HttpServletRequest req, HttpServletResponse resp) throws Exception + { + PortletControllerContextImpl context = new PortletControllerContextImpl(req, resp, getServletContext()); + + // + PortletController controller = new PortletController(); + + // + controller.process(context.getRequest()); + } +} \ No newline at end of file Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-01-30 00:08:24 UTC (rev 9639) +++ modules/portlet/trunk/test/src/test/build.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -41,6 +41,99 @@ <mkdir dir="${test.temp.lib}"/> <mkdir dir="${test.temp.portlet}"/> <mkdir dir="${target}/jboss-unit"/> + + <echo message="Preparing environment"/> + + <!--Paths--> + <path id="mc.concurrent"> + <pathelement path="${dependency.concurrent.jar}"/> + </path> + <path id="mc.trove"> + <pathelement path="${dependency.trove.jar}"/> + </path> + <path id="mc.xerces"> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + </path> + <path id="mc.javassist"> + <pathelement path="${dependency.javassist.jar}"/> + </path> + <path id="mc.jboss_common_logging_spi"> + <pathelement path="${dependency.jboss-logging-spi.jar}"/> + </path> + <path id="mc.jboss_common_logging_jdk"> + <pathelement path="${dependency.jboss-logging-jdk.jar}"/> + </path> + <path id="mc.jboss_common_logging_log4j"> + <pathelement path="${dependency.jboss-logging-log4j.jar}"/> + </path> + <path id="mc.jboss_common_core"> + <pathelement path="${dependency.jboss-common-core.jar}"/> + </path> + <path id="mc.jboss_vfs"> + <pathelement path="${dependency.jboss-vfs.jar}"/> + </path> + <path id="mc.jboss_xb"> + <pathelement path="${dependency.jbossxb.jar}"/> + </path> + <path id="mc.jboss_aop"> + <!--<pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/>--> + <!--<pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/>--> + <!--<pathelement path="${dependency.pluggable-instrumentor.jar}"/>--> + <pathelement path="${dependency.jboss-aop.jar}"/> + + </path> + <path id="mc.jboss_microcontainer"> + <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> + <pathelement path="${dependency.jboss-classloader.jar}"/> + <pathelement path="${dependency.jboss-container.jar}"/> + <pathelement path="${dependency.jboss-dependency.jar}"/> + <pathelement path="${dependency.jboss-container-metadata.jar}"/> + <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/> + <pathelement path="${dependency.jboss-deployers-core.jar}"/> + <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/> + <pathelement path="${dependency.jboss-deployers-client.jar}"/> + <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/> + <pathelement path="${dependency.jboss-deployers-impl.jar}"/> + <pathelement path="${dependency.jboss-deployers-spi.jar}"/> + <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/> + <pathelement path="${dependency.jboss-deployers-vfs.jar}"/> + <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/> + <pathelement path="${dependency.jboss-managed.jar}"/> + <pathelement path="${dependency.jboss-metatype.jar}"/> + <pathelement path="${dependency.jboss-kernel.jar}"/> + </path> + <path id="mc.portal-common"> + <!--<pathelement path="${dependency.portal-common.jar}"/>--> + <pathelement path="${dependency.portal-common-mc.jar}"/> + </path> + <path id="mc.jboss-unit"> + <pathelement path="${dependency.jboss-unit.jar}"/> + <pathelement path="${dependency.jboss-unit-mc.jar}"/> + <pathelement path="${dependency.jboss-unit-remote.jar}"/> + <pathelement path="${dependency.portal-test-generic.jar}"/> + <pathelement path="${dependency.portal-test.jar}"/> + </path> + <path id="mc.portal-test-generic"> + <pathelement path="${dependency.portal-test-generic.jar}"/> + </path> + <path id="mc.jboss-remoting"> + <pathelement path="${dependency.jboss-remoting.jar}"/> + </path> + <path id="mc.log4j"> + <pathelement path="${dependency.log4j.jar}"/> + </path> + <path id="mc.portal-portlet"> + <pathelement path="${dependency.portal-portlet.jar}"/> + </path> + <path id="mc.jaxb-api"> + <pathelement path="${dependency.jaxb-api.jar}"/> + </path> </target> <!--Lets make the check in one place so the build fail in the beggining instead of end--> @@ -57,6 +150,14 @@ </not> </and> </condition> + <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}"> + <and> + <isset property="env.JBOSS_4_2_2_HOME"/> + <not> + <isset property="JBOSS_4_2_2_HOME"/> + </not> + </and> + </condition> <condition property="JBOSS_4_2_0_HOME" value="${env.JBOSS_4_2_0_HOME}"> <and> <isset property="env.JBOSS_4_2_0_HOME"/> @@ -74,7 +175,7 @@ </and> </condition> - <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> + <fail message="Please set the environment variable JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME"> <condition> <and> <not> @@ -83,6 +184,9 @@ <not> <isset property="JBOSS_4_2_1_HOME"/> </not> + <not> + <isset property="JBOSS_4_2_2_HOME"/> + </not> </and> </condition> </fail> @@ -155,8 +259,10 @@ <sequential> <mkdir dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/> <copy todir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"> - <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/> - <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/> + <fileset dir="${test.temp.portlet}" + includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/> + <fileset dir="${test.temp.portlet}" + includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/> <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/framework/**"/> </copy> <mkdir dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib"/> @@ -173,7 +279,7 @@ <unjar src="${dependency.portal-portlet-tests.test-jar}" dest="${test.temp.portlet}"/> - <!--Portlet test framework lib jar--> + <!--Portlet test framework lib jar--> <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar"> <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/unit/**"/> @@ -185,17 +291,17 @@ </jar> <!--<jar jarfile="${test.temp.lib}/test-info.jar">--> - <!--<fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/info/**"/>--> + <!--<fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/info/**"/>--> <!--</jar>--> <!--<jar jarfile="${test.temp.lib}/test-info.war">--> - <!--<fileset dir="${target}/test-classes/info/test-info-war"/>--> + <!--<fileset dir="${target}/test-classes/info/test-info-war"/>--> <!--</jar>--> <!--<jar jarfile="${test.temp.lib}/test-ha-session.war">--> - <!--<fileset dir="${target}/test-classes/ha/test-session-war"/>--> - <!--<fileset dir="${target}/test-classes" includes="org/jboss/portal/test/portlet/ha/session/**"/>--> - <!--<fileset dir="${target}/test-classes" includes="org/jboss/portal/test/portlet/framework/**"/>--> + <!--<fileset dir="${target}/test-classes/ha/test-session-war"/>--> + <!--<fileset dir="${target}/test-classes" includes="org/jboss/portal/test/portlet/ha/session/**"/>--> + <!--<fileset dir="${target}/test-classes" includes="org/jboss/portal/test/portlet/framework/**"/>--> <!--</jar>--> <package-tck-test test="portletinterface"/> @@ -257,92 +363,7 @@ <fileset dir="${target}/classes"/> </jar> - <path id="mc.concurrent"> - <pathelement path="${dependency.concurrent.jar}"/> - </path> - <path id="mc.trove"> - <pathelement path="${dependency.trove.jar}"/> - </path> - <path id="mc.xerces"> - <pathelement path="${dependency.xercesImpl.jar}"/> - <pathelement path="${dependency.resolver.jar}"/> - <pathelement path="${dependency.xml-apis.jar}"/> - </path> - <path id="mc.javassist"> - <pathelement path="${dependency.javassist.jar}"/> - </path> - <path id="mc.jboss_common_logging_spi"> - <pathelement path="${dependency.jboss-logging-spi.jar}"/> - </path> - <path id="mc.jboss_common_logging_jdk"> - <pathelement path="${dependency.jboss-logging-jdk.jar}"/> - </path> - <path id="mc.jboss_common_logging_log4j"> - <pathelement path="${dependency.jboss-logging-log4j.jar}"/> - </path> - <path id="mc.jboss_common_core"> - <pathelement path="${dependency.jboss-common-core.jar}"/> - </path> - <path id="mc.jboss_vfs"> - <pathelement path="${dependency.jboss-vfs.jar}"/> - </path> - <path id="mc.jboss_xb"> - <pathelement path="${dependency.jbossxb.jar}"/> - </path> - <path id="mc.jboss_aop"> - <!--<pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/>--> - <!--<pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/>--> - <!--<pathelement path="${dependency.jboss-aop-jdk50.jar}"/>--> - <!--<pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/>--> - <!--<pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/>--> - <!--<pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/>--> - <!--<pathelement path="${dependency.pluggable-instrumentor.jar}"/>--> - <pathelement path="${dependency.jboss-aop.jar}"/> - </path> - <path id="mc.jboss_microcontainer"> - <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> - <pathelement path="${dependency.jboss-classloader.jar}"/> - <pathelement path="${dependency.jboss-container.jar}"/> - <pathelement path="${dependency.jboss-dependency.jar}"/> - <pathelement path="${dependency.jboss-container-metadata.jar}"/> - <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-core.jar}"/> - <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-client.jar}"/> - <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-impl.jar}"/> - <pathelement path="${dependency.jboss-deployers-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/> - <pathelement path="${dependency.jboss-managed.jar}"/> - <pathelement path="${dependency.jboss-metatype.jar}"/> - <pathelement path="${dependency.jboss-kernel.jar}"/> - </path> - <path id="mc.portal-common"> - <pathelement path="${dependency.portal-common-mc.jar}"/> - </path> - <path id="mc.jboss-unit"> - <pathelement path="${dependency.jboss-unit.jar}"/> - <pathelement path="${dependency.jboss-unit-mc.jar}"/> - <pathelement path="${dependency.jboss-unit-remote.jar}"/> - <pathelement path="${dependency.portal-test-generic.jar}"/> - <pathelement path="${dependency.portal-test.jar}"/> - </path> - <path id="mc.portal-test-generic"> - <pathelement path="${dependency.portal-test-generic.jar}"/> - </path> - <path id="mc.jboss-remoting"> - <pathelement path="${dependency.jboss-remoting.jar}"/> - </path> - <path id="mc.log4j"> - <pathelement path="${dependency.log4j.jar}"/> - </path> - <path id="mc.jaxb-api"> - <pathelement path="${dependency.jaxb-api.jar}"/> - </path> - <!-- JBoss 4.2 portlet-test.war --> <copy todir="${target}/test-classes/jboss-4.2/portlet-test-war/WEB-INF/lib" flatten="true"> @@ -350,7 +371,7 @@ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> <path refid="mc.portal-common"/> - <!--<path location="${dependency.portal-portlet.jar}"/>--> + <path refid="mc.portal-portlet"/> <!-- Remote plugin --> <path refid="mc.jboss-remoting"/> @@ -383,6 +404,7 @@ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> <path refid="mc.portal-common"/> + <path refid="mc.portal-portlet"/> <!-- Remote plugin --> <path refid="mc.jboss-remoting"/> @@ -516,11 +538,17 @@ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/> <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_1"/> </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_2-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/> + <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/> + <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/> + <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_2"/> + </antcall> </target> <target name="tests.jboss"> - <antcall target="tests.jboss-4.2"> - </antcall> + <antcall target="tests.jboss-4.2"/> </target> <target name="cargo.tomcat-6.start" depends="cargo.setup"> @@ -626,8 +654,61 @@ <pathelement path="${test_classpath}"/> </classpath> - </jboss-unit > + </jboss-unit> </target> + <target name="package-simple-portal" depends="prepare_env"> + + <jar jarfile="${target}/portlet-test-lib.jar"> + <!--<fileset dir="${target}/test-classes"/>--> + <fileset dir="${target}/classes"/> + </jar> + + <!-- simple-portal.war --> + <copy todir="${target}/test-classes/simple-portal-war/WEB-INF/lib" flatten="true"> + + <!-- --> + <fileset dir="${target}" includes="portlet-test-lib.jar"/> + + <path refid="mc.portal-common"/> + <path refid="mc.portal-portlet"/> + + <!-- MC 2.0.0.Beta4 --> + <path refid="mc.trove"/> + <path refid="mc.javassist"/> + <path refid="mc.jboss_common_logging_spi"/> + <path refid="mc.jboss_common_logging_jdk"/> + <path refid="mc.jboss_common_logging_log4j"/> + <path refid="mc.jboss_common_core"/> + <path refid="mc.jboss_vfs"/> + <path refid="mc.jboss_xb"/> + <path refid="mc.jboss_aop"/> + <path refid="mc.jboss_microcontainer"/> + <path refid="mc.jaxb-api"/> + + <!-- Portal dependencies --> + <path> + <pathelement path="${dependency.portal-common-portal.jar}"/> + <pathelement path="${dependency.portal-portlet.jar}"/> + </path> + + + <!-- For Tomcat --> + <path> + <pathelement path="${dependency.log4j.jar}"/> + <pathelement path="${dependency.activation.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + </path> + + </copy> + + <jar jarfile="${target}/simple-portal.war"> + <fileset dir="${target}/test-classes/simple-portal-war"/> + </jar> + + <delete file="${target}/portlet-test-lib.jar"/> + + </target> + </project> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context path="/simple" privileged="true"/> \ No newline at end of file Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/log4j.properties (from rev 9584, modules/portlet/trunk/test/src/test/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties) =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/log4j.properties 2008-01-30 00:10:07 UTC (rev 9640) @@ -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 Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/logging.properties (from rev 9584, modules/portlet/trunk/test/src/test/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties) =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/classes/logging.properties 2008-01-30 00:10:07 UTC (rev 9640) @@ -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/simple-portal-war/WEB-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context path="/simple" privileged="true"/> \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,115 @@ +<?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"> + + <!-- An application registry mainly for listeners --> + <bean name="PortletApplicationRegistry" + class="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"/> + + <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.PortletApplicationDeployer"> + <property name="registry"><inject bean="PortletApplicationRegistry"/></property> + <property name="servletContainer"><inject bean="ServletContainer"/></property> + </bean> + + <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/> + + <!-- 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> + + <!-- Consumer stack --> + <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor"> + </bean> + <bean name="ConsumerStackFactory" class="org.jboss.portal.portlet.test.InterceptorStackFactoryImpl"> + <property name="interceptors"> + <array> + <inject bean="ConsumerCacheInterceptor"/> + </array> + </property> + </bean> + + <!-- The consumer portlet invoker --> + <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.test.TestPortletInvoker"> + <property name="producer"><inject bean="ProducerPortletInvoker"/></property> + <property name="stackFactory"><inject bean="ConsumerStackFactory"/></property> + </bean> + + <!-- Container stack --> + <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"/> + <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"/> + <bean name="ContextDispatcherInterceptor" + class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"> + <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> + </bean> + <bean name="WindowStatesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"/> + <bean name="ModesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"/> + <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"/> + <bean name="ContainerStackFactory" class="org.jboss.portal.portlet.test.InterceptorStackFactoryImpl"> + <property name="interceptors"> + <array> + <inject bean="ValveInterceptor"/> + <inject bean="SecureTransportInterceptor"/> + <inject bean="ContextDispatcherInterceptor"/> + <inject bean="WindowStatesInterceptor"/> + <inject bean="ModesInterceptor"/> + <inject bean="ProducerCacheInterceptor"/> + </array> + </property> + </bean> + + <!-- The portlet container invoker --> + <bean name="PortletContainerInvoker" class="org.jboss.portal.portlet.container.PortletContainerInvoker"> + <property name="stackFactory"><inject bean="ContainerStackFactory"/></property> + <property name="registry"><inject bean="PortletApplicationRegistry"/></property> + </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 producer portlet invoker --> + <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker"> + <property name="portletInvoker"><inject bean="PortletContainerInvoker"/></property> + <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property> + <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property> + <property name="stateConverter"><inject bean="ProducerStateConverter"/></property> + </bean> + +</deployment> Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,26 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <context-root>/simple</context-root> +</jboss-web> Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-01-30 00:10:07 UTC (rev 9640) @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!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> + <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> + </servlet> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.simple.SimplePortalServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app>