3:59 p.m.
Author: mwringe
Date: 2008-08-27 16:59:49 -0400 (Wed, 27 Aug 2008)
New Revision: 11753
Added:
modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml
Removed:
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/WEB-INF/web.xml
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/WEB-INF/web.xml
Modified:
modules/portlet/trunk/.classpath
modules/portlet/trunk/portal/pom.xml
modules/portlet/trunk/portal/src/build.xml
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java
modules/portlet/trunk/test/src/test/build.xml
Log:
Update JBoss AS5 support to not require changes to StandardHost.startChildren.
Update support for simple portal and JBoss AS 5.
Modified: modules/portlet/trunk/.classpath
===================================================================
--- modules/portlet/trunk/.classpath 2008-08-27 20:26:54 UTC (rev 11752)
+++ modules/portlet/trunk/.classpath 2008-08-27 20:59:49 UTC (rev 11753)
@@ -9,7 +9,7 @@
<classpathentry kind="src" path="samples/src/main/java"/>
<classpathentry kind="src" path="portlet/src/test/java"/>
<classpathentry kind="src" path="mc/src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-08-27 20:26:54 UTC (rev 11752)
+++ modules/portlet/trunk/portal/pom.xml 2008-08-27 20:59:49 UTC (rev 11753)
@@ -104,6 +104,7 @@
<descriptors>
<descriptor>src/assemble/simple-portal-jboss42.xml</descriptor>
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
+
<descriptor>src/assemble/simple-portal-jboss50.xml</descriptor>
</descriptors>
</configuration>
<executions>
@@ -120,4 +121,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Added: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml
(rev 0)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml 2008-08-27
20:59:49 UTC (rev 11753)
@@ -0,0 +1,45 @@
+<assembly>
+ <id>jboss50</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.jboss.portal.common:common-common</include>
+ <include>org.jboss.portal.common:common-portal</include>
+ <include>org.jboss.portal.web:web-web</include>
+ <include>org.jboss.portal.portlet:portlet-portlet</include>
+
+ <include>javax.ccpp:ccpp</include>
+ <include>javax.portlet:portlet-api</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.jboss.portal.common:common-mc</include>
+ <include>org.jboss.portal.portlet:portlet-controller</include>
+ <include>org.jboss.portal.portlet:portlet-mc</include>
+
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: modules/portlet/trunk/portal/src/build.xml
===================================================================
--- modules/portlet/trunk/portal/src/build.xml 2008-08-27 20:26:54 UTC (rev 11752)
+++ modules/portlet/trunk/portal/src/build.xml 2008-08-27 20:59:49 UTC (rev 11753)
@@ -172,6 +172,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"/>
@@ -197,6 +205,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>
@@ -430,6 +448,43 @@
<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="mc.portal-common"/>
+
+ <path refid="mc.portal-portlet-controller"/>
+ <path refid="mc.portal-portlet-mc"/>
+
+ <!-- Remote plugin -->
+ <path refid="mc.jboss-remoting"/>
+ <path refid="mc.portal-test-generic"/>
+
+
+ <!-- MC 2.0.0.Beta4 -->
+ <path refid="mc.trove"/>
+ <path refid="mc.javassist"/>
+ <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"/>
+
+ </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"/>
+ </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"/>
@@ -586,8 +641,101 @@
</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)
+ -->
+
+
+ <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 location="${dependency.portal-common.jar}"/>
+ <path location="${dependency.portal-common-portal.jar}"/>
+ <path location="${dependency.portal-portlet.jar}"/>
+ <path location="${dependency.portal-web.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+
+ <path location="${dependency.jboss-unit.jar}"/>
+ <path location="${dependency.jboss-unit-remote.jar}"/>
+ <path location="${dependency.portal-test.jar}"/>
+
+ </sharedClasspath>
+ <configuration home="${test.jboss-5.0.tempdir}">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <!--<property name="cargo.jvmargs"
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
+ <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">
@@ -726,6 +874,7 @@
<property name="tck" value="${target}/tck"/>
<property name="tck-jboss" value="${tck}/jboss42"/>
+ <property name="tck-jboss5" value="${tck}/jboss5"/>
<property name="tck-tomcat" value="${tck}/tomcat6"/>
@@ -875,14 +1024,14 @@
<property name="portal.dir" value="${target}/portal"/>
<property name="simple.tomcat.dir"
value="${portal.dir}/tomcat"/>
<property name="simple.as42.dir"
value="${portal.dir}/as42"/>
- <!--<property name="simple.as5.dir"
value="${portal.dir}/as5"/>-->
+ <property name="simple.as5.dir"
value="${portal.dir}/as5"/>
<delete dir="${portal.dir}"/>
<mkdir dir="${portal.dir}"/>
<mkdir dir="${simple.tomcat.dir}"/>
<mkdir dir="${simple.as42.dir}"/>
- <!--<mkdir dir="${simple.as5.dir}"/>-->
+ <mkdir dir="${simple.as5.dir}"/>
<jar jarfile="${target}/portlet-test-lib.jar">
@@ -919,6 +1068,9 @@
<!-- AS 4.2 -->
<generic-package-simple-portal server="${simple.as42.dir}"/>
+ <!-- AS 5 -->
+ <generic-package-simple-portal server="${simple.as5.dir}"/>
+
<!-- Tomcat -->
<generic-package-simple-portal server="${simple.tomcat.dir}"/>
<copy todir="${simple.tomcat.dir}/simple-portal"
flatten="true">
@@ -940,9 +1092,6 @@
<fileset dir="${simple.tomcat.dir}/simple-portal/"/>
</move>
- <!-- AS 5 -->
- <!--<generic-package-simple-portal
server="${simple.as5.dir}"/>-->
-
<delete file="${target}/portlet-test-lib.jar"/>
<antcall target="__package-demo-portlets"/>
@@ -1012,4 +1161,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java
===================================================================
---
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java 2008-08-27
20:26:54 UTC (rev 11752)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java 2008-08-27
20:59:49 UTC (rev 11753)
@@ -65,6 +65,8 @@
/** . */
private ClassLoader loader;
+
+ protected boolean testDriverSetup = false;
/**
* Finds all methods matching pattern in current instance and invokes them. Methods
add Sequence into
@@ -72,88 +74,98 @@
*/
public void attributeAdded(ServletContextAttributeEvent event)
{
- if (event.getName().equals("TestDriverServer"))
- {
- RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue();
+ if (event.getName().equals("TestDriverServer") && event.getValue()
instanceof RemoteTestDriverServer)
+ {
+ RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue();
+ ServletContext servletContext = event.getServletContext();
+ setupRemoteDriver(servletContext, remoteDriver);
+ }
+ }
+
+ /**
+ */
+ public void setupRemoteDriver(ServletContext servletContext, RemoteTestDriverServer
remoteDriver)
+ {
- // It is only in servlet 2.5, for now we use reflection
- String name = null;
- try
- {
- Method m = ServletContext.class.getMethod("getContextPath");
- ServletContext servletContext = event.getServletContext();
- name = (String)m.invoke(servletContext);
- name = name.substring(1); // We remove the leading '/'
- }
- catch (Exception e)
- {
- log.error("Cannot get application context path", e);
- }
+ testDriverSetup = true;
- //
- if (name != null)
- {
- driver = new PortletTestDriver(name, remoteDriver);
+ // It is only in servlet 2.5, for now we use reflection
+ String name = null;
+ try
+ {
+ Method m = ServletContext.class.getMethod("getContextPath");
+ name = (String)m.invoke(servletContext);
+ name = name.substring(1); // We remove the leading '/'
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot get application context path", e);
+ }
- //
- try
- {
- for (Class clazz : getClasses(event.getServletContext()))
- {
- TestCase testCaseAnnotation =
((AnnotatedElement)clazz).getAnnotation(TestCase.class);
+ //
+ if (name != null)
+ {
+ driver = new PortletTestDriver(name, remoteDriver);
- //
- if (testCaseAnnotation != null)
- {
- boolean active = true;
+ //
+ try
+ {
+ for (Class clazz : getClasses(servletContext))
+ {
+ TestCase testCaseAnnotation =
((AnnotatedElement)clazz).getAnnotation(TestCase.class);
- //
- for (Assertion assertion : testCaseAnnotation.value())
- {
- if (assertion.getStatus() instanceof Assertion.Inactive)
- {
- active = false;
- log.debug("Skip test case " + clazz.getName() +
" because the assertion " + assertion.getRef() + " is not enabled");
- }
- }
+ //
+ if (testCaseAnnotation != null)
+ {
+ boolean active = true;
- //
- if (active)
- {
- try
- {
- Constructor ctor =
clazz.getConstructor(PortletTestCase.class);
- PortletTestCase portletTestCase = new PortletTestCase();
- ctor.newInstance(portletTestCase);
- String testCaseName = clazz.getSimpleName();
- driver.addTestCase(testCaseName, portletTestCase);
- }
- catch (Exception e)
- {
- log.error("Cannot obtain test case constructor " +
clazz, e);
- }
- }
- }
- else
- {
- log.error("Skip test case " + clazz.getName() + "
because it is not annotated as a test case");
- }
- }
- }
- catch (IOException e)
- {
- log.error("Cannot get load test cases", e);
- }
+ //
+ for (Assertion assertion : testCaseAnnotation.value())
+ {
+ if (assertion.getStatus() instanceof Assertion.Inactive)
+ {
+ active = false;
+ log.debug("Skip test case " + clazz.getName() + " because the
assertion " + assertion.getRef() + " is not enabled");
+ }
+ }
- //
- driver.start();
+ //
+ if (active)
+ {
+ try
+ {
+ Constructor ctor = clazz.getConstructor(PortletTestCase.class);
+ PortletTestCase portletTestCase = new PortletTestCase();
+ ctor.newInstance(portletTestCase);
+ String testCaseName = clazz.getSimpleName();
+ driver.addTestCase(testCaseName, portletTestCase);
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot obtain test case constructor " + clazz, e);
+ }
+ }
+ }
+ else
+ {
+ log.error("Skip test case " + clazz.getName() + " because it is
not annotated as a test case");
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ log.error("Cannot get load test cases", e);
+ }
- //
- event.getServletContext().setAttribute("SequenceRegistry",
driver);
- }
- }
+ //
+ driver.start();
+
+ //
+ servletContext.setAttribute("SequenceRegistry", driver);
+ }
}
-
+
+
protected List<Class> getClasses(ServletContext ctx) throws IOException
{
TestCaseScanner collector = new TestCaseScanner(loader, ctx);
@@ -256,12 +268,23 @@
public void attributeReplaced(ServletContextAttributeEvent event)
{
-
+
}
public void contextInitialized(ServletContextEvent sce)
{
loader = Thread.currentThread().getContextClassLoader();
+
+ // need to check if the testDriver has been already setup or not.
+ // Issues exist with JBoss AS 5 in which the listeners are not started before the
attribute is added
+ // and thus the attributeAdded method never gets called (like it does for JBoss
4.2.x and Tomcat).
+ Object testDriverServer =
sce.getServletContext().getAttribute("TestDriverServer");
+ if (testDriverSetup == false && testDriverServer != null &&
testDriverServer instanceof RemoteTestDriverServer )
+ {
+ RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)testDriverServer;
+ ServletContext servletContext = sce.getServletContext();
+ setupRemoteDriver(servletContext, remoteDriver);
+ }
}
public void contextDestroyed(ServletContextEvent sce)
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-08-27 20:26:54 UTC (rev 11752)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-08-27 20:59:49 UTC (rev 11753)
@@ -496,10 +496,6 @@
<!-- 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"/>
- </copy>
- <!-- Note: must have this separate copy statement and have overwrite=true
- in order for the files to get properly overwritten every time -->
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war"
overwrite="true">
<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">
Deleted:
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 2008-08-27
20:26:54 UTC (rev 11752)
+++
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml 2008-08-27
20:59:49 UTC (rev 11753)
@@ -1,49 +0,0 @@
-<?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>
Deleted:
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 2008-08-27
20:26:54 UTC (rev 11752)
+++
modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml 2008-08-27
20:59:49 UTC (rev 11753)
@@ -1,49 +0,0 @@
-<?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>